diff options
| author | myd7349 <myd7349@gmail.com> | 2019-06-23 08:16:07 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-06-23 08:16:07 +0800 |
| commit | 644851da5fbe46aadd0a8fa54e1d7d213f469fb0 (patch) | |
| tree | 3f5d20aca85fcf02375cf553e893c105758a5d39 | |
| parent | f1870ae02bedbaa5a501ddf3a7ba5d0a743a1053 (diff) | |
| parent | f3db66b403840b24ea2612d09cca30a5285f5ea3 (diff) | |
| download | vcpkg-644851da5fbe46aadd0a8fa54e1d7d213f469fb0.tar.gz vcpkg-644851da5fbe46aadd0a8fa54e1d7d213f469fb0.zip | |
Merge branch 'master' into sx-init
1944 files changed, 21347 insertions, 13146 deletions
diff --git a/.gitignore b/.gitignore index d0e202f1d..f38bc90a9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ *.userosscache *.sln.docstates +toolsrc/out +toolsrc/CMakeSettings.json + # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs @@ -37,7 +37,7 @@ The best way to use installed libraries with CMake is via the toolchain file `sc In Visual Studio, you can create a New Project (or open an existing one). All installed libraries are immediately ready to be `#include`'d and used in your project without additional configuration. -For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics. +For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics. If your library is not present in vcpkg catalog, you can open an [issue on the GitHub repo](https://github.com/microsoft/vcpkg/issues) where the dev team and the community can see it and potentially create the port file for this library. Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/). diff --git a/docs/about/faq.md b/docs/about/faq.md index b83674d05..504738479 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -1,7 +1,7 @@ # Frequently Asked Questions ## Can I contribute a new library? -Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md). +Yes! Start out by reading our [contribution guidelines](https://github.com/Microsoft/vcpkg/blob/master/CONTRIBUTING.md). If you want to contribute but don't have a particular library in mind then take a look at the list of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3A%22new+port+request+-+consider+making+a+PR%21%22). ## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg? Yes! See [the `export` command](../users/integration.md#export). diff --git a/docs/index.md b/docs/index.md index cde241e92..5d83b5804 100644 --- a/docs/index.md +++ b/docs/index.md @@ -19,6 +19,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Control files](maintainers/control-files.md) - [Portfile functions](maintainers/portfile-functions.md) +- [Maintainer Guidelines](maintainers/maintainer-guide.md) ### Specifications diff --git a/docs/maintainers/control-files.md b/docs/maintainers/control-files.md index eb03f1d94..03bfa113a 100644 --- a/docs/maintainers/control-files.md +++ b/docs/maintainers/control-files.md @@ -1,81 +1,149 @@ # CONTROL files -Each port has some static metadata in the form of a `CONTROL` file. This file uses the same syntax and a subset of the fields from [the Debian `control` format][debian]. +The `CONTROL` file contains metadata about the port. The syntax is based on [the Debian `control` format][debian] although we only support the subset of fields documented here. -Field names are case-sensitive. +Field names are case-sensitive and start the line without leading whitespace. Paragraphs are separated by one or more empty lines. [debian]: https://www.debian.org/doc/debian-policy/ch-controlfields.html ## Source Paragraph -The first paragraph appearing in a `CONTROL` file is the Source paragraph, which defines the core attributes of the package (name, version, and so on). +The first paragraph in a `CONTROL` file is the Source paragraph. It must have a `Source`, `Version`, and `Description` field. It can optionally have a `Build-Depends` and `Default-Features` field. + +### Examples: +```no-highlight +Source: ace +Version: 6.5.5-1 +Description: The ADAPTIVE Communication Environment +``` -### Example: ```no-highlight Source: vtk -Version: 8.1.0-1 +Version: 8.2.0-2 Description: Software system for 3D computer graphics, image processing, and visualization -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c ``` + ### Recognized fields #### Source The name of the port. +When adding new ports be aware that the name may conflict with other projects that are not a part of vcpkg. For example `json` conflicts with too many other projects so you should add a scope to the name such as `taocpp-json` to make it unique. Verify there are no conflicts on a search engine as well as on other package collections. + +Package collections to check for conflicts: + ++ [Repology](https://repology.org/projects/) ++ [Debian packages](https://www.debian.org/distrib/packages) ++ [Packages search](https://pkgs.org/) + #### Version The port version. -This field should be an alphanumeric string which may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bitstrings and are only evaluated for equality. +This field is an alphanumeric string that may also contain `.`, `_`, or `-`. No attempt at ordering versions is made; all versions are treated as bit strings and are only evaluated for equality. + +For tagged-release ports, we follow the following convention: -By convention, if a portfile is modified without incrementing the "upstream" version, a `-#` is appended to create a unique version string. +1. If the port follows a scheme like `va.b.c`, we remove the leading `v`. In this case, it becomes `a.b.c`. +2. If the port includes its own name in the version like `curl-7_65_1`, we remove the leading name: `7_65_1` +3. If the port has been modified, we append a `-N` to distinguish the versions: `1.2.1-4` + +For rolling-release ports, we use the date that the _commit was accessed by you_, formatted as `YYYY-MM-DD`. Stated another way: if someone had a time machine and went to that date, they would see this commit as the latest master. + +For example, given: +1. The latest commit was made on 2019-04-19 +2. The current version string is `2019-02-14-1` +3. Today's date is 2019-06-01. + +Then if you update the source version today, you should give it version `2019-06-01`. If you need to make a change which doesn't adjust the source version, you should give it version `2019-02-14-2`. Example: ```no-highlight Version: 1.0.5-2 ``` +```no-highlight +Version: 2019-03-21 +``` #### Description -A description of the library +A description of the library. -The first sentence of the description should concisely describe the purpose and contents of the library. Then, a larger description including the library's "proper name" should follow. +By convention the first line of the description is a summary of the library. An optional detailed description follows. The detailed description can be multiple lines, all starting with whitespace. -#### Maintainer -Reserved for future use. +Example: +```no-highlight +Description: C++ header-only JSON library +``` +```no-highlight +Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. + MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine + to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino. +```` -#### Build-Depends -The list of dependencies required to build and use this library. +#### Homepage +The URL of the homepage for the library where a user is able to find additional documentation or the original source code. Example: ```no-highlight -Build-Depends: zlib, libpng, libjpeg-turbo, tiff +Homepage: https://github.com/Microsoft/vcpkg ``` -Unlike dpkg, Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified. +#### Build-Depends +Comma separated list of vcpkg ports the library has a dependency on. + +Vcpkg does not distinguish between build-only dependencies and runtime dependencies. The complete list of dependencies needed to successfully use the library should be specified. *For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies* -Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name. __This will change in a future version to not depend on the triplet name.__ +Example: +```no-highlight +Build-Depends: zlib, libpng, libjpeg-turbo, tiff +``` +If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax. + +Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name. There must be a space between the name of the port and the filter. __This will change in a future version to not depend on the triplet name.__ Example: ```no-highlight -Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows) +Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx) +``` + +#### Default-Feature +Comma separated list of optional port features to install by default. + +This field is optional. + +```no-highlight +Default-Features: dynamodb, s3, kinesis ``` ## Feature Paragraphs -After the Source Paragraph, `CONTROL` files can list zero or more Feature Paragraphs which declare features. +Multiple optional features can be specified in the `CONTROL` files. It must have a `Feature` and `Description` field. It can optionally have a `Build-Depends` field. It must be separated from other paragraphs by one or more empty lines. ### Example: ```no-highlight Source: vtk -Version: 8.1.0-1 +Version: 8.2.0-2 Description: Software system for 3D computer graphics, image processing, and visualization -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c + +Feature: openvr +Description: OpenVR functionality for VTK +Build-Depends: sdl2, openvr + +Feature: qt +Description: Qt functionality for VTK +Build-Depends: qt5 Feature: mpi Description: MPI functionality for VTK Build-Depends: msmpi, hdf5[parallel] + +Feature: python +Description: Python functionality for VTK +Build-Depends: python3 ``` ### Recognized fields @@ -84,9 +152,9 @@ Build-Depends: msmpi, hdf5[parallel] The name of the feature. #### Description -A description of the feature +A description of the feature using the same syntax as the port `Description` field. #### Build-Depends The list of dependencies required to build and use this feature. -All dependencies from selected features are unioned together to produce the final dependency set for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph. +On installation the dependencies from all selected features are combined to produce the full dependency list for the build. This field follows the same syntax as `Build-Depends` in the Source Paragraph. diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md new file mode 100644 index 000000000..0baa45a02 --- /dev/null +++ b/docs/maintainers/maintainer-guide.md @@ -0,0 +1,178 @@ +# Maintainer Guidelines and Policies
+
+This document lists a set of policies that you should apply when adding or updating a port recipe. It is intended to serve the role of [Debian's Policy Manual](https://www.debian.org/doc/debian-policy/), [Homebrew's Maintainer Guidelines](https://docs.brew.sh/Maintainer-Guidelines), and [Homebrew's Formula Cookbook](https://docs.brew.sh/Formula-Cookbook).
+
+## PR Structure
+
+### Make separate Pull Requests per port
+
+Whenever possible, separate changes into multiple PR's. This makes them significantly easier to review and prevents issues with one set of changes from holding up every other change.
+
+### Avoid trivial changes in untouched files
+
+For example, avoid reformatting or renaming variables in portfiles that otherwise have no reason to be modified for the issue at hand. However, if you need to modify the file for the primary purpose of the PR (updating the library), then obviously beneficial changes like fixing typos are appreciated!
+
+### Check names against other repositories
+
+A good service to check many at once is [Repology](https://repology.org/). If the library you are adding could be confused with another one, consider renaming to make it clear.
+
+### Use GitHub Draft PRs
+
+GitHub Draft PRs are a great way to get CI or human feedback on work that isn't yet ready to merge. Most new PRs should be opened as drafts and converted to normal PRs once the CI passes.
+
+More information about GitHub Draft PRs: https://github.blog/2019-02-14-introducing-draft-pull-requests/
+
+## Portfiles
+
+### Avoid deprecated helper functions
+
+At this time, the following helpers are deprecated:
+
+1. `vcpkg_extract_archive()` should be replaced by `vcpkg_extract_archive_ex()`
+2. `vcpkg_apply_patches()` should be replaced by the `PATCHES` arguments to the "extract" helpers (e.g. `vcpkg_from_github()`)
+3. `vcpkg_build_msbuild()` should be replaced by `vcpkg_install_msbuild()`
+
+### Avoid excessive comments in portfiles
+
+Ideally, portfiles should be short, simple, and as declarative as possible. Remove any helper comments introduced by the `create` command before submitting a PR.
+
+## Build Techniques
+
+### Do not use vendored dependencies
+
+Do not use embedded copies of libraries. All dependencies should be split out and packaged separately so they can be updated and maintained.
+
+### Prefer using CMake
+
+When multiple buildsystems are available, prefer using CMake. Additionally, when appropriate, it can be easier and more maintainable to rewrite alternative buildsystems into CMake using `file(GLOB)` directives.
+
+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`, 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(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DKEYSTONE_BUILD_STATIC=${KEYSTONE_BUILD_STATIC}
+ -DKEYSTONE_BUILD_SHARED=${KEYSTONE_BUILD_SHARED}
+)
+```
+
+### When defining features, explicitly control dependencies
+
+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. For example:
+
+```cmake
+set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB ON)
+if("zlib" IN_LIST FEATURES)
+ set(CMAKE_DISABLE_FIND_PACKAGE_ZLIB OFF)
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB}
+)
+```
+
+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.
+
+## Versioning
+
+### Follow common conventions for the `Version:` field
+
+See our [CONTROL files document](control-files.md#version) for a full explanation of our conventions.
+
+### Update the `Version:` field in the `CONTROL` file of any modified ports
+
+Vcpkg uses this field to determine whether a given port is out-of-date and should be changed whenever the port's behavior changes.
+
+Our convention for this field is to append a `-N` to the upstream version when changes need to be made.
+
+For Example:
+
+- Zlib's package version is currently `1.2.1`.
+- You've discovered that the wrong copyright file has been deployed, and fixed that in the portfile.
+- You should update the `Version:` field in the control file to `1.2.1-1`.
+
+See our [CONTROL files document](control-files.md#version) for a full explanation of our conventions.
+
+## Patching
+
+### Prefer options over patching
+
+It is preferable to set options in a call to `vcpkg_configure_xyz()` over patching the settings directly.
+
+Common options that allow avoiding patching:
+1. [MSBUILD] `<PropertyGroup>` settings inside the project file can be overridden via `/p:` parameters
+2. [CMAKE] Calls to `find_package(XYz)` in CMake scripts can be disabled via [`-DCMAKE_DISABLE_FIND_PACKAGE_XYz=ON`](https://cmake.org/cmake/help/v3.15/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html)
+3. [CMAKE] Cache variables (declared as `set(VAR "value" CACHE STRING "Documentation")` or `option(VAR "Documentation" "Default Value")`) can be overriden by just passing them in on the command line as `-DVAR:STRING=Foo`. One notable exception is if the `FORCE` parameter is passed to `set()`. See also the [CMake `set` documentation](https://cmake.org/cmake/help/v3.15/command/set.html)
+
+### Minimize patches
+
+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.
+
+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
+
+The purpose of patching in vcpkg is to enable compatibility with compilers, libraries, and platforms. It is not to implement new features in lieu of following proper Open Source procedure (submitting an Issue/PR/etc).
+
+## Do not build tests/docs/examples by default
+
+When submitting a new port, check for any options like `BUILD_TESTS` or `WITH_TESTS` or `POCO_ENABLE_SAMPLES` and ensure the additional binaries are disabled. This minimizes build times and dependencies for the average user.
+
+Optionally, you can add a `test` feature which enables building the tests, however this should not be in the `Default-Features` list.
+
+## Enable existing users of the library to switch to vcpkg
+
+### Do not add `CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS`
+
+Unless the author of the library is already using it, we should not use this CMake functionality because it interacts poorly with C++ templates and breaks certain compiler features. Libraries that don't provide a .def file and do not use __declspec() declarations simply do not support shared builds for Windows and should be marked as such with `vcpkg_check_linkage(ONLY_STATIC_LIBRARY)`.
+
+### Do not rename binaries outside the names given by upstream
+
+This means that if the upstream library has different names in release and debug (libx versus libxd), then the debug library should not be renamed to `libx`. Vice versa, if the upstream library has the same name in release and debug, we should not introduce a new name.
+
+Important caveat:
+- Static and shared variants often should be renamed to a common scheme. This enables consumers to use a common name and be ignorant of the downstream linkage. This is safe because we only make one at a time available.
+
+Note that if a library generates CMake integration files (`foo-config.cmake`), renaming must be done through patching the CMake build itself instead of simply calling `file(RENAME)` on the output archives/LIBs.
+
+Finally, DLL files on Windows should never be renamed post-build because it breaks the generated LIBs.
+
+## Useful implementation notes
+
+### Portfiles are run in Script Mode
+
+While `portfile.cmake`'s and `CMakeLists.txt`'s share a common syntax and core CMake language constructs, portfiles run in "Script Mode", whereas `CMakeLists.txt` files run in "Build Mode" (unofficial term). The most important difference between these two modes is that "Script Mode" does not have a concept of "Target" -- any behaviors that depend on the "target" machine (`CMAKE_CXX_COMPILER`, `CMAKE_EXECUTABLE_SUFFIX`, `CMAKE_SYSTEM_NAME`, etc) will not be correct.
+
+Portfiles have direct access to variables set in the triplet file, but `CMakeLists.txt`s do not (though there is often a translation that happens -- `VCPKG_LIBRARY_LINKAGE` versus `BUILD_SHARED_LIBS`).
+
+Finally, portfiles and CMake builds invoked by portfiles are run in different processes. Conceptually:
+
+```no-highlight
++----------------------------+ +------------------------------------+
+| CMake.exe | | CMake.exe |
++----------------------------+ +------------------------------------+
+| Triplet file | ====> | Toolchain file |
+| (x64-windows.cmake) | | (scripts/buildsystems/vcpkg.cmake) |
++----------------------------+ +------------------------------------+
+| Portfile | ====> | CMakeLists.txt |
+| (ports/foo/portfile.cmake) | | (buildtrees/../CMakeLists.txt) |
++----------------------------+ +------------------------------------+
+```
+
+To determine the host in a portfile, the standard CMake variables are fine (`CMAKE_HOST_WIN32`).
+
+To determine the target in a portfile, the vcpkg triplet variables should be used (`VCPKG_CMAKE_SYSTEM_NAME`).
+
+See also our [triplet documentation](../users/triplets.md) for a full enumeration of possible settings.
diff --git a/docs/specifications/ports-overlay.md b/docs/specifications/ports-overlay.md new file mode 100644 index 000000000..e877f5010 --- /dev/null +++ b/docs/specifications/ports-overlay.md @@ -0,0 +1,178 @@ +# Ports Overlay (Jun 19, 2019)
+
+
+## 1. Motivation
+
+### A. Allow users to override ports with alternate versions
+
+It's a common scenario for `vcpkg` users to keep specific versions of libraries to use in their own projects. The current recommendation for users is to fork `vcpkg`'s repository and create tags for commits containing the specific versions of the ports they want to use.
+
+This proposal adds an alternative to solve this problem. By allowing `vcpkg` users to specify additional locations in their file system containing ports for:
+
+ * older or newer versions of libraries,
+ * modified libraries, or
+ * libraries not available in `vcpkg`.
+
+These locations will be searched when resolving port names during package installation, and override ports in `<vcpkg-root>/ports`.
+
+### B. Allow users to keep unmodified upstream ports
+
+Users will be able to keep unmodified versions of the ports shipped with `vcpkg` and update them via `vcpkg update` and `vcpkg upgrade` without having to solve merge conflicts.
+
+
+## 2. Other design concerns
+
+* Allow a set of `vcpkg` commands to optionally accept additional paths to be used when searching for ports.
+* Additional paths must take precedence when resolving names of ports to install.
+* Allow users to specify multiple additional paths.
+* Provide a simple disambiguation mechanism to resolve ambiguous port names.
+* After resolving a port name, the installation process has to work the same as for ports shipped by `vcpkg`.
+* This **DOES NOT ENABLE MULTIPLE VERSIONS** of a same library to be **INSTALLED SIDE-BY-SIDE**.
+
+
+## 3. Proposed solution
+
+This document proposes allowing additional locations to search for ports during package installation that will override and complement the set of ports provided by `vcpkg` (ports under the `<vcpkg_root>/ports` directory).`
+
+A new option `--overlay-ports` will be added to the `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, `vcpkg export`, and `vcpkg depend-info` commands to specify additional paths containing ports.
+
+From a user experience perspective, a user expresses interest in adding additional lookup locations by passing the `--overlay-ports` option followed by a path to:
+
+* an individual port (directory containing a `CONTROL` file),
+ * `vcpkg install sqlite3 --overlay-ports="C:\custom-ports\sqlite3"`
+
+* a directory containing ports,
+ * `vcpkg install sqlite3 --overlay-ports=\\share\org\custom-ports`
+
+* a file listing paths to the former two.
+ * `vcpkg install sqlite3 --overlay-ports=..\port-repos.txt`
+
+ _port-repos.txt_
+
+ ```
+ .\experimental-ports\sqlite3
+ C:\custom-ports
+ \\share\team\custom-ports
+ \\share\org\custom-ports
+ ```
+ *Relative paths inside this file are resolved relatively to the file's location. In this case a `experimental-ports` directory should exist at the same level as the `port-repos.txt` file.*
+
+_NOTE: It is not the goal of this document to discuss library versioning or project dependency management solutions, which require the ability to install multiple versions of a same library side-by-side._
+
+### Multiple additional paths
+
+Users can provide multiple additional paths by repeating the `--overlay-ports` option.
+
+```
+vcpkg install sqlite3
+ --overlay-ports="..\experimental-ports\sqlite3"
+ --overlay-ports="C:\custom-ports"
+ --overlay-ports="\\share\team\custom-ports
+```
+
+### Overlaying ports
+
+Port name resolution follows the order in which additional paths are specified, with the first match being selected for installation, and falling back to `<vcpkg-root>/ports` if the port is not found in any of the additional paths.
+
+No effort is made to compare version numbers inside the `CONTROL` files, or to determine which port contains newer or older files.
+
+### Examples
+
+Given the following directory structure:
+
+ ```
+ team-ports/
+ |-- sqlite3/
+ |---- CONTROL
+ |-- rapidjson/
+ |---- CONTROL
+ |-- curl/
+ |---- CONTROL
+
+ my-ports/
+ |-- sqlite3/
+ |---- CONTROL
+ |-- rapidjson/
+ |---- CONTROL
+
+ vcpkg
+ |-- ports/
+ |---- <upstream ports>
+ |-- vcpkg.exe
+ |-- preferred-ports.txt
+ ```
+* #### Example #1:
+
+ Running:
+
+ ```
+ vcpkg/vcpkg.exe install sqlite3 --overlay-ports=my-ports --overlay-ports=team-ports
+ ```
+
+ Results in `my-ports/sqlite3` getting installed as that location appears first in the command line arguments.
+
+* #### Example #2:
+
+ A specific version of a port can be given priority by adding its path first in the list of arguments:
+
+ ```
+ vcpkg/vcpkg.exe install sqlite3 rapidjson curl
+ --overlay-ports=my-ports/rapidjson
+ --overlay-ports=vcpkg/ports/curl
+ --overlay-ports=team-ports
+ ```
+
+ Installs:
+ * `sqlite3` from `team-ports/sqlite3`
+ * `rapidjson` from `my-ports/rapidjson`
+ * `curl` from `vcpkg/ports/curl`
+
+* #### Example #3:
+
+ Given the content of `preferred-ports.txt` as:
+
+ ```
+ ./ports/curl
+ /my-ports/rapidjson
+ /team-ports
+ ```
+
+ A location can be appended or prepended to those included in `preferred-ports.txt` via the command line, like this:
+
+ ```
+ vcpkg/vcpkg.exe install sqlite3 curl --overlay-ports=my-ports --overlay-ports=vcpkg/preferred-ports.txt
+ ```
+
+ Which results in `my-ports/sqlite3` and `vcpkg/ports/curl` getting installed.
+
+
+## 4. Proposed User experience
+
+### i. User wants to preserve an older version of a port
+
+Developer Alice and her team use `vcpkg` to acquire **OpenCV** and some other packages. She has even contributed many patches to add features to the **OpenCV 3** port in `vcpkg`. But, one day, she notices that a PR to update **OpenCV** to the next major version has been merged.
+
+Alice wants to update some packages available in `vcpkg`. Unfortunately, updating her project to use the latest **OpenCV** is not immediately possible.
+
+Alice creates a private GitHub repository and checks in the set of ports that she wants to preserve. Then provides her teammates with the link to clone her private ports repository.
+
+```
+mkdir vcpkg-custom-ports
+cd vcpkg-custom-ports
+git init
+cp -r %VCPKG_ROOT%/ports/opencv .
+git add .
+git commit -m "[opencv] Add OpenCV 3 port"
+git remote add origin https://github.com/<Alice's GitHub username>/vcpkg-custom-ports.git
+git push -u origin master
+```
+
+Now her team is able to use:
+
+```
+git clone https://github.com/<Alice's GitHub username>/vcpkg-custom-ports.git
+vcpkg update --overlay-ports=./vcpkg-custom-ports
+vcpkg upgrade --no-dry-run --overlay-ports=./vcpkg-custom-ports
+```
+
+to upgrade their packages and preserve the old version of **OpenCV** they require.
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index 99581e89f..b611fe9e7 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,6 @@ Source: abseil
-Version: 2019-04-19-1
+Version: 2019-05-08
+Homepage: https://github.com/abseil/abseil-cpp
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.
In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 37f3ae22d..b14618229 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
- REF d902eb869bcfacc1bad14933ed9af4bed006d481 - SHA512 660a6cc6250460b6d76e0fd3a0193bf41e69bf6a95361d2f0562b00cf4cb4a36fe0b07e1172faba190743d1b3a3dc96b834a080cdaded3cbdea2fc0392094cde
+ REF aa468ad75539619b47979911297efbb629c52e44 + SHA512 4254d8599103d8f06b03f60a0386eba07f314184217d0bca404d41fc0bd0a8df287fe6d07158d10cde096af3097aff2ecc1a5e8f7c3046ecf956b5fde709ad1d
HEAD_REF master
PATCHES fix-usage-lnk-error.patch
)
diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 9d4d36cd5..4153cdc48 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,3 +1,14 @@ Source: ace Version: 6.5.5-1 +Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment + +Feature: wchar +Description: Enable extra wide char functions in ACE + +Feature: ssl +Description: Enable SSL/TLS features in ACE +Build-Depends: openssl + +Feature: xml +Description: Enable XML features in ACE diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index d33028c9a..264829dfb 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -2,6 +2,21 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "${PORT} does not currently support UWP") 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") +else() + list(APPEND ACE_FEATURE_LIST "zlib=0") +endif() +if("ssl" IN_LIST FEATURES) + list(APPEND ACE_FEATURE_LIST "ssl=1") +else() + list(APPEND ACE_FEATURE_LIST "ssl=0") +endif() +list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(DLL_DECORATOR s) @@ -58,7 +73,7 @@ endif() # Invoke mwc.pl to generate the necessary solution and project files vcpkg_execute_required_process( - COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ace ${MPC_STATIC_FLAG} + COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG} WORKING_DIRECTORY ${ACE_ROOT} LOGNAME mwc-${TARGET_TRIPLET} ) @@ -67,6 +82,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/ace.sln PLATFORM ${MSBUILD_PLATFORM} + USE_VCPKG_INTEGRATION ) endif() @@ -106,6 +122,9 @@ install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa") install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net") install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet") install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys") +if("ssl" IN_LIST FEATURES) + install_ace_headers_subdirectory(${SOURCE_PATH} "SSL") +endif() # Install the libraries function(install_ace_library SOURCE_PATH ACE_LIBRARY) @@ -143,6 +162,9 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) install_ace_library(${ACE_ROOT} "ACE_QoS") endif() install_ace_library(${ACE_ROOT} "ACE_RLECompression") +if("ssl" IN_LIST FEATURES) + install_ace_library(${ACE_ROOT} "ACE_SSL") +endif() # Handle copyright file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace) diff --git a/ports/alac-decoder/CONTROL b/ports/alac-decoder/CONTROL index e2b3da2b1..dcbf3922e 100644 --- a/ports/alac-decoder/CONTROL +++ b/ports/alac-decoder/CONTROL @@ -1,3 +1,4 @@ Source: alac-decoder
Version: 0.2-1
+Homepage: https://distfiles.macports.org/alac_decoder
Description: ALAC C implementation of a decoder, written from reverse engineering the file format
diff --git a/ports/alac/CONTROL b/ports/alac/CONTROL index 07ca2b5a2..1bea4dc14 100644 --- a/ports/alac/CONTROL +++ b/ports/alac/CONTROL @@ -1,3 +1,4 @@ Source: alac Version: 2017-11-03-c38887c5-1 +Homepage: https://github.com/macosforge/alac Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices. diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL index 5e3f2befb..a1a47a3ff 100644 --- a/ports/alembic/CONTROL +++ b/ports/alembic/CONTROL @@ -1,4 +1,5 @@ Source: alembic -Version: 1.7.10-1 +Version: 1.7.11-2 Build-Depends: ilmbase, hdf5 -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. http://alembic.io/ +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/ diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 57470172c..8b3e8568d 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "Alembic's buildsystem uses very long paths and may fail on your system.\n" + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() @@ -12,8 +12,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic - REF 1.7.10 - SHA512 e98ffaedb98dbc5c53fe9703d3063bb118d32c83c47e3af04c8fc96237034b02fe0fc2c628ca82bdd0e0ef17d9375f4f48e0022ce33380b9ad91970539611ced + REF 1.7.11 + SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70 HEAD_REF master PATCHES fix-hdf5link.patch @@ -30,7 +30,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Alembic") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Alembic) vcpkg_copy_pdbs() diff --git a/ports/aliyun-oss-c-sdk/CONTROL b/ports/aliyun-oss-c-sdk/CONTROL new file mode 100644 index 000000000..430541401 --- /dev/null +++ b/ports/aliyun-oss-c-sdk/CONTROL @@ -0,0 +1,4 @@ +Source: aliyun-oss-c-sdk +Version: 3.7.1-1 +Description: Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability. +Build-Depends: curl, apr-util diff --git a/ports/aliyun-oss-c-sdk/patch.patch b/ports/aliyun-oss-c-sdk/patch.patch new file mode 100644 index 000000000..31c18d897 --- /dev/null +++ b/ports/aliyun-oss-c-sdk/patch.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0abcb93..75195a9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,5 +150,5 @@ INSTALL(FILES
+ oss_c_sdk/oss_xml.h
+ DESTINATION include/oss_c_sdk)
+
+-add_subdirectory(oss_c_sdk_sample)
+-add_subdirectory(oss_c_sdk_test)
++#add_subdirectory(oss_c_sdk_sample)
++#add_subdirectory(oss_c_sdk_test)
diff --git a/ports/aliyun-oss-c-sdk/portfile.cmake b/ports/aliyun-oss-c-sdk/portfile.cmake new file mode 100644 index 000000000..2e3a2c73e --- /dev/null +++ b/ports/aliyun-oss-c-sdk/portfile.cmake @@ -0,0 +1,26 @@ +include(vcpkg_common_functions) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aliyun/aliyun-oss-c-sdk + REF 3.7.1 + SHA512 0c289832d87ea7fae60d0846617bc839a1529ab6d59c2bb520e2826b0374953e8078179c4043c5c85a56c38985189aa584036104a504da4cf1ea2d35a53c8fde + HEAD_REF master + PATCHES + patch.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/allegro5/CONTROL b/ports/allegro5/CONTROL index a1515adff..defd1b481 100644 --- a/ports/allegro5/CONTROL +++ b/ports/allegro5/CONTROL @@ -1,4 +1,5 @@ Source: allegro5 -Version: 5.2.4.0 +Version: 5.2.5.0 +Homepage: https://github.com/liballeg/allegro5 Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like. Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora, opus, opusfile diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index bb9673536..37eea0756 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -1,44 +1,29 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO liballeg/allegro5 - REF 5.2.4.0 - SHA512 46a7c7b65ffb49ae5c81e5a33d850b4ae94b59135fc9b15174ffe86133445ff328c623c2c48298d3f631cc6310d51f4f3f07b8b952ecbd360755001292cbda8b + REF 5.2.5.0 + SHA512 9b97a46f0fd146c3958a5f8333822665ae06b984b3dbedc1356afdac8fe3248203347cb08b30ebda049a7320948c7844e9d00dc055c317836c2557b5bfc2ab04 HEAD_REF master + PATCHES + fix-pdb-install.patch ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(ALLEGRO_USE_STATIC ON) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) else() - set(ALLEGRO_USE_STATIC OFF) + set(VCPKG_BUILD_SHARED_LIBS OFF) endif() -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-pdb-install.patch -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA OPTIONS -DWANT_DOCS=OFF -DALLEGRO_SDL=OFF -DWANT_DEMO=OFF - -DSHARED=${ALLEGRO_USE_STATIC} + -DSHARED=${VCPKG_BUILD_SHARED_LIBS} -DWANT_EXAMPLES=OFF -DWANT_CURL_EXAMPLE=OFF -DWANT_TESTS=OFF @@ -81,14 +66,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/allegro5) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/allegro5/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/allegro5/copyright) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(GLOB PDB_GLOB ${CURRENT_BUILDTREES_DIR}-dbg/lib/*.pdb) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug) file(COPY ${PDB_GLOB} DESTINATION ${CURRENT_BUILDTREES_DIR}-dbg/lib/Debug) vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/allegro5 RENAME copyright) diff --git a/ports/amqpcpp/CONTROL b/ports/amqpcpp/CONTROL index 3cf199118..d0642edb4 100644 --- a/ports/amqpcpp/CONTROL +++ b/ports/amqpcpp/CONTROL @@ -1,4 +1,4 @@ Source: amqpcpp -Version: 4.1.2 +Version: 4.1.4 Description: AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker Build-Depends: openssl (linux) diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake index 64b02f686..697b8f802 100644 --- a/ports/amqpcpp/portfile.cmake +++ b/ports/amqpcpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CopernicaMarketingSoftware/AMQP-CPP - REF v4.1.2 - SHA512 e2015d3958d434532591f9a304c625bdebb9bb075af1e2b684c9b8b061df8a2fd6a407200c802ad7b88ee954bcdad854f44a43512f76adf225addf145fc0fb44 + REF v4.1.4 + SHA512 d589756ad8e27ce6b6772128479083293c4dbb8c7aa79b7b08f0036ced9ab76ecb75e55458f04de8e2745c9732a6322f4e910f3f8611633c5cd5c35fb7dcaed1 HEAD_REF master PATCHES find-openssl.patch diff --git a/ports/anax/CONTROL b/ports/anax/CONTROL index a11803305..14b10c9af 100644 --- a/ports/anax/CONTROL +++ b/ports/anax/CONTROL @@ -1,3 +1,4 @@ Source: anax
Version: 2.1.0-5
-Description: An open source C++ entity system. <https://github.com/miguelmartin75/anax>
+Description: An open source C++ entity system.
+Homepage: https://github.com/miguelmartin75/anax
diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL new file mode 100644 index 000000000..7315b1a90 --- /dev/null +++ b/ports/angelscript/CONTROL @@ -0,0 +1,3 @@ +Source: angelscript
+Version: 2.33.0-1
+Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
diff --git a/ports/angelscript/LICENSE b/ports/angelscript/LICENSE new file mode 100644 index 000000000..27105b90d --- /dev/null +++ b/ports/angelscript/LICENSE @@ -0,0 +1,13 @@ +AngelCode Scripting Library
+
+Copyright © 2003-2018 Andreas Jönsson
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+ The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+ Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+ This notice may not be removed or altered from any source distribution.
diff --git a/ports/angelscript/mark-threads-private.patch b/ports/angelscript/mark-threads-private.patch new file mode 100644 index 000000000..567c19aa1 --- /dev/null +++ b/ports/angelscript/mark-threads-private.patch @@ -0,0 +1,13 @@ +diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
+index 7c800c5..982ad8b 100644
+--- a/angelscript/projects/cmake/CMakeLists.txt
++++ b/angelscript/projects/cmake/CMakeLists.txt
+@@ -145,7 +145,7 @@ endif()
+
+ # Don't override the default library output path to avoid conflicts when building for multiple target platforms
+ #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
+-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
++target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
+
+ set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+
diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake new file mode 100644 index 000000000..f6521df29 --- /dev/null +++ b/ports/angelscript/portfile.cmake @@ -0,0 +1,30 @@ +include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip"
+ FILENAME "angelscript_2.33.0.zip"
+ SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ PATCHES
+ mark-threads-private.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
+ PREFER_NINJA # Disable this option if project cannot be built with Ninja
+ # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+ # OPTIONS_RELEASE -DOPTIMIZE=1
+ # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
+
+# Handle copyright
+file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)
diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL index 8bc53822e..cac71fae2 100644 --- a/ports/angle/CONTROL +++ b/ports/angle/CONTROL @@ -1,5 +1,6 @@ Source: angle
Version: 2019-03-13-c2ee2cc-3
+Homepage: https://github.com/google/angle
Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
Build-Depends: egl-registry
diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL index 4af73fb8a..46852dbf5 100644 --- a/ports/antlr4/CONTROL +++ b/ports/antlr4/CONTROL @@ -1,4 +1,5 @@ Source: antlr4 Version: 4.7.1-3 +Homepage: https://www.antlr.org Description: ANother Tool for Language Recognition Build-Depends: libuuid (!uwp&!windows&!osx)
\ No newline at end of file diff --git a/ports/any-lite/CONTROL b/ports/any-lite/CONTROL new file mode 100644 index 000000000..6eaf3d167 --- /dev/null +++ b/ports/any-lite/CONTROL @@ -0,0 +1,3 @@ +Source: any-lite
+Version: 0.2.0
+Description: A C++17-like any, a type-safe container for single values of any type for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/any-lite/portfile.cmake b/ports/any-lite/portfile.cmake new file mode 100644 index 000000000..aba905134 --- /dev/null +++ b/ports/any-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/any-lite
+ REF v0.2.0
+ SHA512 703900d7bac96d41f903b6cabba4bce15ef3cf7ef0a6a66de76230498ededff110e43d68d4a3fd6996869b2edd001f69bd53039a214d06b774ce99518f384a68
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DANY_LITE_OPT_BUILD_TESTS=OFF
+ -DANY_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file( REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file( INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL index 1ff406efd..8dcd5af03 100644 --- a/ports/apr-util/CONTROL +++ b/ports/apr-util/CONTROL @@ -1,4 +1,5 @@ Source: apr-util -Version: 1.6.0-2 +Version: 1.6.0-3 +Homepage: https://apr.apache.org/ 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 Build-Depends: expat, apr, openssl diff --git a/ports/apr-util/apr.patch b/ports/apr-util/apr.patch new file mode 100644 index 000000000..5a61cb9f9 --- /dev/null +++ b/ports/apr-util/apr.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69e45541..19b86129 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,7 +35,7 @@ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h") + MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
+ ENDIF()
+ FOREACH(onelib ${APR_LIBRARIES})
+- IF(NOT EXISTS ${onelib})
++ IF(${onelib} MATCHES "NOTFOUND")
+ MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
+ ENDIF()
+ ENDFOREACH()
diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake index 6ac311d76..0b1c28351 100644 --- a/ports/apr-util/portfile.cmake +++ b/ports/apr-util/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-expat.patch" + PATCHES + use-vcpkg-expat.patch + apr.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL index 19be22b19..7a35c5b48 100644 --- a/ports/apr/CONTROL +++ b/ports/apr/CONTROL @@ -1,5 +1,6 @@ Source: apr Version: 1.6.5-1 +Homepage: https://apr.apache.org/ Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems. Feature: private-headers diff --git a/ports/arb/CMakeLists.txt b/ports/arb/CMakeLists.txt index 1ec8ac1d6..300c2003b 100644 --- a/ports/arb/CMakeLists.txt +++ b/ports/arb/CMakeLists.txt @@ -5,7 +5,7 @@ project(arb C) set (DEPS mpir mpfr pthreads flint2 gettimeofday) set (mpir_lib gmp mpir) set (mpfr_lib mpfr) -set (pthreads_lib pthreads pthread) +set (pthreads_lib pthreads pthread pthreadVC2 pthreadVC3) set (flint2_lib ${LIBRARY_TYPE}_flint flint) set (gettimeofday_lib gettimeofday) diff --git a/ports/arb/CONTROL b/ports/arb/CONTROL index 28b6d316c..02baf69b8 100644 --- a/ports/arb/CONTROL +++ b/ports/arb/CONTROL @@ -1,4 +1,5 @@ Source: arb
-Version: 2.11.1-1
+Version: 2.16.0
+Homepage: https://github.com/fredrik-johansson/arb
Description: a C library for arbitrary-precision interval arithmetic
Build-Depends: flint
diff --git a/ports/arb/fix-build-error.patch b/ports/arb/fix-build-error.patch new file mode 100644 index 000000000..7ed2428cf --- /dev/null +++ b/ports/arb/fix-build-error.patch @@ -0,0 +1,24 @@ +diff --git a/acb_dirichlet/stieltjes.c b/acb_dirichlet/stieltjes.c +index ad6937b..4ca9690 100644 +--- a/acb_dirichlet/stieltjes.c ++++ b/acb_dirichlet/stieltjes.c +@@ -340,16 +340,16 @@ stieltjes_mag(double n) + return t; + } + +-static double _hypot(double x, double y) { return sqrt(x * x + y * y); } ++static double __hypot(double x, double y) { return sqrt(x * x + y * y); } + + /* log2 magnitude of integrand at z = x+yi; alpha = a+bi */ + static double + integrand_mag(double n, double x, double y, double a, double b) + { + double t, u; +- t = log(_hypot(a - y, b + x)); ++ t = log(__hypot(a - y, b + x)); + u = atan2(b + x, a - y); +- t = log(_hypot(t,u)) * (n+1) - 2.0 * 3.1415926535897932 * x; ++ t = log(__hypot(t,u)) * (n+1) - 2.0 * 3.1415926535897932 * x; + return t * 1.44269504088896341; + } + diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake index 847120318..3c1196283 100644 --- a/ports/arb/portfile.cmake +++ b/ports/arb/portfile.cmake @@ -5,9 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fredrik-johansson/arb - REF 2.11.1 - SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353 + REF 2.16.0 + SHA512 171c965aeb03cd2830df8a53990403c6da480a94d44385dadfbb2d02697f7c03e8b9a217094b0ad93f796d889a1564f4b9ae9db35ef9de90f61bb2e3220911be HEAD_REF master + PATCHES fix-build-error.patch ) file(REMOVE ${SOURCE_PATH}/CMakeLists.txt) @@ -21,9 +22,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +# Remove duplicate headers +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/arb RENAME copyright) - -# Remove duplicate headers -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/argagg/CONTROL b/ports/argagg/CONTROL new file mode 100644 index 000000000..d4265021d --- /dev/null +++ b/ports/argagg/CONTROL @@ -0,0 +1,3 @@ +Source: argagg
+Version: 2019-01-25
+Description: A simple C++11 command line argument parser
diff --git a/ports/argagg/portfile.cmake b/ports/argagg/portfile.cmake new file mode 100644 index 000000000..1f7ed54de --- /dev/null +++ b/ports/argagg/portfile.cmake @@ -0,0 +1,27 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO vietjtnguyen/argagg
+ REF e678cebf90d8f132f5e54f19c6b95b75e655226c
+ SHA512 10085caaf9bfb507ae7117b61bfe6174dc2af91c347393c3cbb994fe5b824d4b439e1e0d2e2580dc34568d8046529acc211f76863be047d05d3845e9ff19ccbf
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DARGAGG_BUILD_EXAMPLES=OFF
+ -DARGAGG_BUILD_TESTS=OFF
+ -DARGAGG_BUILD_DOCS=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/argparse/CONTROL b/ports/argparse/CONTROL new file mode 100644 index 000000000..c7c33adac --- /dev/null +++ b/ports/argparse/CONTROL @@ -0,0 +1,4 @@ +Source: argparse
+Version: 2019-06-10
+Description: Argument parser for modern C++
+Homepage: https://github.com/p-ranav/argparse
diff --git a/ports/argparse/portfile.cmake b/ports/argparse/portfile.cmake new file mode 100644 index 000000000..0ad21e10a --- /dev/null +++ b/ports/argparse/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO p-ranav/argparse
+ REF 2c71311b5fa49b7d65e6628375f2748d58830856
+ SHA512 08a28a3fb424befe7df9a428fbad8e2687a1b331d7099bfaca2c3e04d8d4b4888e99d481226407bf90bfce282388545b09e4125128215cc95dc56fb313641bf6
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DARGPARSE_BUILD_TESTS=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/args/CONTROL b/ports/args/CONTROL index 0b5bd4e94..8d9d88a50 100644 --- a/ports/args/CONTROL +++ b/ports/args/CONTROL @@ -1,3 +1,4 @@ Source: args Version: 2019-05-01 +Homepage: https://github.com/Taywee/args Description: A simple header-only C++ argument parser library. diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL index d8edd620e..5baafdfdf 100644 --- a/ports/armadillo/CONTROL +++ b/ports/armadillo/CONTROL @@ -1,3 +1,4 @@ Source: armadillo -Version: 2019-04-16-f00d3225 +Version: 2019-04-16-2 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 +Build-Depends: openblas (!osx), clapack (!osx) diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 172984712..437f174dd 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -1,29 +1,35 @@ -include(vcpkg_common_functions)
-
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_gitlab(
- GITLAB_URL https://gitlab.com
- OUT_SOURCE_PATH SOURCE_PATH
- REPO conradsnicta/armadillo-code
- REF f00d3225b1c005775044369723f31cecc3cd6569
- SHA512 ca3574edf5de8c752867403c3856ed9569fbed2ce9729585cae59be5751493c2e71121319b0a812e2ea56baada6b6f62fbc84ce6f1efb362347e5fd4141ccf1b
- HEAD_REF 9.400.x
-)
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS
- -DDETECT_HDF5=false
-)
-
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake TARGET_PATH share/armadillo)
-
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/Armadillo RENAME copyright)
+include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO conradsnicta/armadillo-code + REF f00d3225b1c005775044369723f31cecc3cd6569 + SHA512 ca3574edf5de8c752867403c3856ed9569fbed2ce9729585cae59be5751493c2e71121319b0a812e2ea56baada6b6f62fbc84ce6f1efb362347e5fd4141ccf1b + HEAD_REF 9.400.x + PATCHES + remove_custom_modules.patch +) + +file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake) +file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake) +file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DDETECT_HDF5=false +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/armadillo/CMake) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo RENAME copyright) diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch new file mode 100644 index 000000000..0723dbeb5 --- /dev/null +++ b/ports/armadillo/remove_custom_modules.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0959127..9fea721 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -176,10 +176,9 @@ else() + include(ARMA_FindMKL) + include(ARMA_FindACMLMP) + include(ARMA_FindACML) +- include(ARMA_FindOpenBLAS) + include(ARMA_FindATLAS) +- include(ARMA_FindBLAS) +- include(ARMA_FindLAPACK) ++ find_package(BLAS) ++ find_package(LAPACK) + + message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) + message(STATUS " ACMLMP_FOUND = ${ACMLMP_FOUND}" ) diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index aaf6c0535..ada95e2d0 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,4 +1,5 @@ Source: arrow -Version: 0.13.0 -Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog +Version: 0.13.0-4 +Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser +Homepage: https://github.com/apache/arrow Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index 2e994af9b..3257dc437 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,7 +1,7 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 52081c4..e1e13b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt @@ -804,6 +804,9 @@ if(ARROW_USE_GLOG) list(APPEND ARROW_LINK_LIBS GLOG::glog) list(APPEND ARROW_STATIC_LINK_LIBS GLOG::glog) @@ -12,10 +12,10 @@ index 52081c4..e1e13b5 100644 add_definitions("-DARROW_USE_GLOG") endif() -diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake +diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake index e1429a2..6dee036 100644 ---- a/cmake_modules/FindBrotli.cmake -+++ b/cmake_modules/FindBrotli.cmake +--- a/cpp/cmake_modules/FindBrotli.cmake ++++ b/cpp/cmake_modules/FindBrotli.cmake @@ -18,6 +18,7 @@ # find_package(Brotli) @@ -110,10 +110,10 @@ index e1429a2..6dee036 100644 find_package_handle_standard_args(Brotli REQUIRED_VARS BROTLI_COMMON_LIBRARY -diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake +diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake index 3606f5c..1d18b7c 100644 ---- a/cmake_modules/FindLz4.cmake -+++ b/cmake_modules/FindLz4.cmake +--- a/cpp/cmake_modules/FindLz4.cmake ++++ b/cpp/cmake_modules/FindLz4.cmake @@ -19,24 +19,26 @@ if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX) set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static") endif() @@ -157,10 +157,10 @@ index 3606f5c..1d18b7c 100644 PATH_SUFFIXES "lib64" "lib" "bin") find_path(LZ4_INCLUDE_DIR NAMES lz4.h PATH_SUFFIXES "include") endif() -diff --git a/cmake_modules/FindThrift.cmake b/cmake_modules/FindThrift.cmake +diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake index a4decf7..78ec7c8 100644 ---- a/cmake_modules/FindThrift.cmake -+++ b/cmake_modules/FindThrift.cmake +--- a/cpp/cmake_modules/FindThrift.cmake ++++ b/cpp/cmake_modules/FindThrift.cmake @@ -65,6 +65,10 @@ if(MSVC AND NOT THRIFT_MSVC_STATIC_LIB_SUFFIX) set(THRIFT_MSVC_STATIC_LIB_SUFFIX md) endif() @@ -191,10 +191,10 @@ index a4decf7..78ec7c8 100644 HINTS ${Thrift_ROOT} PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib") find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h -diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake +diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake index 17b58a3..fa2ab05 100644 ---- a/cmake_modules/FindZSTD.cmake -+++ b/cmake_modules/FindZSTD.cmake +--- a/cpp/cmake_modules/FindZSTD.cmake ++++ b/cpp/cmake_modules/FindZSTD.cmake @@ -19,7 +19,11 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX) set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static") endif() @@ -242,10 +242,10 @@ index 17b58a3..fa2ab05 100644 find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include") endif() -diff --git a/cmake_modules/FindgflagsAlt.cmake b/cmake_modules/FindgflagsAlt.cmake +diff --git a/cpp/cmake_modules/FindgflagsAlt.cmake b/cpp/cmake_modules/FindgflagsAlt.cmake index a9b8684..fdb815a 100644 ---- a/cmake_modules/FindgflagsAlt.cmake -+++ b/cmake_modules/FindgflagsAlt.cmake +--- a/cpp/cmake_modules/FindgflagsAlt.cmake ++++ b/cpp/cmake_modules/FindgflagsAlt.cmake @@ -15,18 +15,13 @@ # specific language governing permissions and limitations # under the License. @@ -270,10 +270,10 @@ index a9b8684..fdb815a 100644 find_package_handle_standard_args(gflagsAlt REQUIRED_VARS gflags_LIB GFLAGS_INCLUDE_DIR) if(gflagsAlt_FOUND) -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index bdb122b..58c123e 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -923,10 +923,7 @@ if(ARROW_NEED_GFLAGS) elseif(gflags_SOURCE STREQUAL "SYSTEM") # gflagsConfig.cmake is not installed on Ubuntu/Debian diff --git a/ports/arrow/findzstd.patch b/ports/arrow/findzstd.patch new file mode 100644 index 000000000..ac77202f9 --- /dev/null +++ b/ports/arrow/findzstd.patch @@ -0,0 +1,79 @@ +diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake +index 21b4981ec..818e4b5e1 100644 +--- a/cpp/cmake_modules/FindZSTD.cmake ++++ b/cpp/cmake_modules/FindZSTD.cmake +@@ -19,44 +19,60 @@ if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX) + set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
+ endif()
+
+-if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+- set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
+-endif()
+-
++set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
+-set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") ++set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}")
+ set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
+
++set(ZSTD_LIB_NAMES_RELEASE zstd "${ZSTD_STATIC_LIB_NAME}"
++ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd")
++set(ZSTD_LIB_NAMES_DEBUG)
++foreach(_zstd_name ${ZSTD_LIB_NAMES_RELEASE})
++ list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${ZSTD_LIB_NAME_DEBUG_SUFFIX})
++ if(DEFINED CMAKE_DEBUG_POSTFIX)
++ list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${CMAKE_DEBUG_POSTFIX})
++ endif()
++endforeach()
++
+ pkg_check_modules(ZSTD_PC libzstd)
+ if(ZSTD_PC_FOUND)
+ set(ZSTD_INCLUDE_DIR "${ZSTD_PC_INCLUDEDIR}")
+
+ list(APPEND ZSTD_PC_LIBRARY_DIRS "${ZSTD_PC_LIBDIR}")
+- find_library(ZSTD_LIB zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}
++ find_library(ZSTD_LIBRARY_RELEASE ${ZSTD_LIB_NAMES_RELEASE}
+ PATHS ${ZSTD_PC_LIBRARY_DIRS}
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
++ find_library(ZSTD_LIBRARY_DEBUG ${ZSTD_LIB_NAMES_DEBUG}
++ PATHS ${ZSTD_PC_LIBRARY_DIRS}
++ NO_DEFAULT_PATH
++ PATH_SUFFIXES "${CMAKE_LIBRARY_ARCHITECTURE}")
++
+ elseif(ZSTD_ROOT)
+ message(STATUS "Using ZSTD_ROOT: ${ZSTD_ROOT}")
+- find_library(ZSTD_LIB
+- NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++ find_library(ZSTD_LIBRARY_RELEASE
++ NAMES ${ZSTD_LIB_NAMES_RELEASE})
++ find_library(ZSTD_LIBRARY_DEBUG
++ NAMES ${ZSTD_LIB_NAMES_DEBUG})
+ find_path(ZSTD_INCLUDE_DIR
+ NAMES zstd.h
+ PATHS ${ZSTD_ROOT} "${ZSTD_ROOT}/Library"
+ NO_DEFAULT_PATH
+ PATH_SUFFIXES "include")
+ else()
+- find_library(ZSTD_LIB
+- NAMES zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX} "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
+- "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++ find_library(ZSTD_LIBRARY_RELEASE
++ NAMES ${ZSTD_LIB_NAMES_RELEASE})
++ find_library(ZSTD_LIBRARY_DEBUG
++ NAMES ${ZSTD_LIB_NAMES_DEBUG})
+ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h PATH_SUFFIXES "include")
+ endif()
+- ++select_library_configurations(ZSTD)
++set(ZSTD_LIB ${ZSTD_LIBRARY})
+ find_package_handle_standard_args(ZSTD REQUIRED_VARS ZSTD_LIB ZSTD_INCLUDE_DIR)
+
+ if(ZSTD_FOUND)
+ add_library(ZSTD::zstd UNKNOWN IMPORTED)
+ set_target_properties(ZSTD::zstd
+- PROPERTIES IMPORTED_LOCATION "${ZSTD_LIB}"
++ PROPERTIES IMPORTED_LOCATION_RELEASE "${ZSTD_LIBRARY_RELEASE}"
++ IMPORTED_LOCATION_DEBUG "${ZSTD_LIBRARY_DEBUG}"
+ INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIR}")
+ endif()
diff --git a/ports/arrow/msvc-libname.patch b/ports/arrow/msvc-libname.patch new file mode 100644 index 000000000..a997822d0 --- /dev/null +++ b/ports/arrow/msvc-libname.patch @@ -0,0 +1,13 @@ +diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
+index 0f014ba..fd2e7b3 100644
+--- a/cpp/cmake_modules/BuildUtils.cmake
++++ b/cpp/cmake_modules/BuildUtils.cmake
+@@ -289,7 +289,7 @@ function(ADD_ARROW_LIB LIB_NAME)
+ target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES})
+ endif()
+
+- if(MSVC)
++ if(MSVC AND 0)
+ set(LIB_NAME_STATIC ${LIB_NAME}_static)
+ else()
+ set(LIB_NAME_STATIC ${LIB_NAME})
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 28b58e8bf..fd8fd52fc 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -10,70 +10,40 @@ vcpkg_from_github( REF apache-arrow-0.13.0 SHA512 bbb14d11abf267a6902c7c9e0215ba7c5284f07482be2de42707145265d2809c89c2d4d8f8b918fdb8c33a5ecbd650875b987a1a694cdf653e766822be67a47d HEAD_REF master -) - -set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp") - -vcpkg_apply_patches( - SOURCE_PATH ${CPP_SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/all.patch" + all.patch + msvc-libname.patch + findzstd.patch ) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" IS_STATIC) - -if (IS_STATIC) - set(PARQUET_ARROW_LINKAGE static) - set(BOOST_USE_SHARED off) - set(USE_STATIC_CRT on) -else() - set(PARQUET_ARROW_LINKAGE shared) - set(BOOST_USE_SHARED on) - set(USE_STATIC_CRT off) -endif() - vcpkg_configure_cmake( - SOURCE_PATH ${CPP_SOURCE_PATH} + SOURCE_PATH ${SOURCE_PATH}/cpp PREFER_NINJA OPTIONS - -DARROW_DEPENDENCY_SOURCE=SYSTEM - -DARROW_BUILD_TESTS=off - -DBOOST_ROOT=${CURRENT_INSTALLED_DIR} - -DARROW_PARQUET=ON - -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} - -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} - -DBUILD_STATIC=${ARROW_BUILD_STATIC} - -DBUILD_SHARED=${ARROW_BUILD_SHARED} - -DPARQUET_ARROW_LINKAGE=${PARQUET_ARROW_LINKAGE} - -DARROW_BOOST_USE_SHARED=${BOOST_USE_SHARED} - -DARROW_USE_STATIC_CRT=${USE_STATIC_CRT} - -DARROW_GFLAGS_USE_SHARED=off - -DARROW_JEMALLOC=off + -DARROW_DEPENDENCY_SOURCE=SYSTEM + -Duriparser_SOURCE=SYSTEM + -DARROW_BUILD_TESTS=off + -DARROW_PARQUET=ON + -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} + -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} + -DARROW_GFLAGS_USE_SHARED=off + -DARROW_JEMALLOC=off + -DARROW_BUILD_UTILITIES=OFF ) vcpkg_install_cmake() vcpkg_copy_pdbs() -if(WIN32) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/lib/arrow.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow.lib) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) - else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/arrow_static.lib) - endif() +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() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/arrow/cmake) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfig.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfig.cmake) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowConfigVersion.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowConfigVersion.cmake) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets-release.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-release.cmake) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/arrow/arrowTargets.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets.cmake) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/arrow/arrowTargets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/arrow/cmake/arrowTargets-debug.cmake) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) diff --git a/ports/asio/CMakeLists.txt b/ports/asio/CMakeLists.txt new file mode 100644 index 000000000..aa7354e76 --- /dev/null +++ b/ports/asio/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.8)
+project(asio)
+
+add_library(asio INTERFACE)
+
+# Always use "ASIO_STANDALONE" to avoid boost dependency
+file(READ "asio/include/asio/detail/config.hpp" _contents)
+string(REPLACE "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)" _contents "${_contents}")
+file(WRITE "asio/include/asio/detail/config.hpp" "${_contents}")
+
+# Export target
+install(TARGETS asio
+ EXPORT asio
+ INCLUDES DESTINATION include/
+)
+
+install(EXPORT asio
+ DESTINATION "share/asio"
+ FILE asio-targets.cmake
+)
+
+install(DIRECTORY
+ asio/include/asio
+ DESTINATION include/
+ FILES_MATCHING
+ PATTERN "*.hpp"
+ PATTERN "*.ipp"
+)
+
+install(FILES
+ asio/include/asio.hpp
+ DESTINATION include/
+)
diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL index 6ba9e4318..49a2be94c 100644 --- a/ports/asio/CONTROL +++ b/ports/asio/CONTROL @@ -1,3 +1,4 @@ Source: asio
-Version: 1.12.2
+Version: 1.12.2-1
+Homepage: https://github.com/chriskohlhoff/asio
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.
diff --git a/ports/asio/asio-config.cmake b/ports/asio/asio-config.cmake new file mode 100644 index 000000000..32e00095a --- /dev/null +++ b/ports/asio/asio-config.cmake @@ -0,0 +1,6 @@ +include ("${CMAKE_CURRENT_LIST_DIR}/asio-targets.cmake")
+add_library(asio::asio INTERFACE IMPORTED)
+target_link_libraries(asio::asio INTERFACE asio)
+
+get_target_property(_ASIO_INCLUDE_DIR asio INTERFACE_INCLUDE_DIRECTORIES)
+set(ASIO_INCLUDE_DIR "${_ASIO_INCLUDE_DIR}")
diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index bd5f5af2a..f9b3b739d 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -9,13 +9,21 @@ vcpkg_from_github( HEAD_REF master ) +# CMake install +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH "share/asio") +file(INSTALL + ${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake + DESTINATION ${CURRENT_PACKAGES_DIR}/share/asio/ +) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + # Handle copyright file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -# Copy the asio header files -file(INSTALL ${SOURCE_PATH}/asio/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp" PATTERN "*.ipp") - -# Always use "ASIO_STANDALONE" to avoid boost dependency -file(READ "${CURRENT_PACKAGES_DIR}/include/asio/detail/config.hpp" _contents) -string(REPLACE "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/include/asio/detail/config.hpp" "${_contents}") diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL index b4c5b6b5a..5387b8a1c 100644 --- a/ports/asmjit/CONTROL +++ b/ports/asmjit/CONTROL @@ -1,3 +1,4 @@ Source: asmjit Version: 2019-03-29 +Homepage: https://github.com/asmjit/asmjit Description: Complete x86/x64 JIT and Remote Assembler for C++ diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL index bea89f8ec..0b2d58a51 100644 --- a/ports/assimp/CONTROL +++ b/ports/assimp/CONTROL @@ -1,4 +1,5 @@ Source: assimp
-Version: 4.1.0-4
+Version: 4.1.0-8
+Homepage: https://github.com/assimp/assimp
Description: The Open Asset import library
Build-Depends: zlib, rapidjson
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 2945f51f9..b690b79d0 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES dont-overwrite-prefix-path.patch uninitialized-variable.patch + remove-useless-path.patch ) file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) @@ -17,28 +18,29 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${S set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) +else() + set(VCPKG_BUILD_SHARED_LIBS OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_ASSIMP_VIEW=OFF -DASSIMP_BUILD_ZLIB=OFF - -DASSIMP_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DASSIMP_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS} -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_INSTALL_PDB=OFF - -DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include - -DZLIB_FOUND=1 - OPTIONS_RELEASE - -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/zlib.lib - -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/zlib.lib - OPTIONS_DEBUG - -DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib - -DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib + #-DSYSTEM_IRRXML=ON # Wait for the built-in irrxml to synchronize with port irrlich, add dependencies and enable this macro ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/assimp-4.1") +FILE(GLOB lib_cmake_directories RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/assimp-*") +list(GET lib_cmake_directories 0 lib_cmake_directory) +vcpkg_fixup_cmake_targets(CONFIG_PATH "${lib_cmake_directory}") vcpkg_copy_pdbs() @@ -50,9 +52,14 @@ file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG string(REPLACE "get_filename_component(ASSIMP_ROOT_DIR \"\${_PREFIX}\" PATH)" "set(ASSIMP_ROOT_DIR \${_PREFIX})" ASSIMP_CONFIG ${ASSIMP_CONFIG}) -if(WIN32) - string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})" - "set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES}.lib debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/\${ASSIMP_LIBRARIES}d.lib)" ASSIMP_CONFIG ${ASSIMP_CONFIG}) +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})" + "set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES}.lib debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/\${ASSIMP_LIBRARIES}d.lib)" ASSIMP_CONFIG ${ASSIMP_CONFIG}) + else() + string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})" + "set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES}.lib \${ASSIMP_LIBRARY_DIRS}/IrrXML.lib debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/\${ASSIMP_LIBRARIES}d.lib \${ASSIMP_LIBRARY_DIRS}/../debug/lib/IrrXMLd.lib)" ASSIMP_CONFIG ${ASSIMP_CONFIG}) + endif() else() string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})" "set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/lib\${ASSIMP_LIBRARIES}.a \${ASSIMP_LIBRARY_DIRS}/libIrrXML.a \${ASSIMP_LIBRARY_DIRS}/libz.a debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/lib\${ASSIMP_LIBRARIES}d.a \${ASSIMP_LIBRARY_DIRS}/../debug/lib/libIrrXMLd.a \${ASSIMP_LIBRARY_DIRS}/../debug/lib/libz.a)" ASSIMP_CONFIG ${ASSIMP_CONFIG}) diff --git a/ports/assimp/remove-useless-path.patch b/ports/assimp/remove-useless-path.patch new file mode 100644 index 000000000..d16494f98 --- /dev/null +++ b/ports/assimp/remove-useless-path.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4a20cee..4fcb8dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,6 @@ if (WIN32) + endif() + + IF(MSVC) +- SET (CMAKE_PREFIX_PATH "D:\\libs\\devil") + OPTION( ASSIMP_INSTALL_PDB + "Install MSVC debug files." + ON diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index 824052721..66890b039 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -1,4 +1,5 @@ Source: atk
Version: 2.24.0-3
+Homepage: https://developer.gnome.org/atk/
Description: GNOME Accessibility Toolkit
Build-Depends: glib, gettext
diff --git a/ports/atkmm/CONTROL b/ports/atkmm/CONTROL index 329a329b8..3900e1698 100644 --- a/ports/atkmm/CONTROL +++ b/ports/atkmm/CONTROL @@ -1,4 +1,5 @@ Source: atkmm
Version: 2.24.2-1
+Homepage: https://www.gtkmm.org
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.
Build-Depends: glib, gettext, atk, glibmm
diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL index c853b5c5f..906fefe45 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -1,4 +1,5 @@ Source: aubio
-Version: 0.4.8-1
+Version: 0.4.9
+Homepage: https://github.com/aubio/aubio
Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma
diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index 99a60ba7c..177e890d5 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -6,8 +6,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd7 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aubio/aubio - REF 0.4.8 - SHA512 0422ec9ceb645dd5cdb1ca8b17f552edf9197dbf9c929ca75aacfb89f092c02db8b6d2b8aec567ddc1df5b310770de77cd941b45ed74700c3d3584924f39b576 + REF 0.4.9 + SHA512 a22c7c581ce1f428270021591649273396e6dc222b3c7b3d46f5c4abf94a98be1ab89320cdbf1b6b60d4330eef23976439e3fc9e0f8d3cdd867dac4542fa48c9 HEAD_REF master ) diff --git a/ports/aurora/CONTROL b/ports/aurora/CONTROL index 172c019cd..b99aed73e 100644 --- a/ports/aurora/CONTROL +++ b/ports/aurora/CONTROL @@ -1,3 +1,4 @@ Source: aurora Version: 2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933 +Homepage: https://github.com/Bromeon/Aurora Description: Aurora is an open-source C++ library providing various rather uncommon C++ utilities diff --git a/ports/autobahn/CONTROL b/ports/autobahn/CONTROL index 7a08d9f96..94152bb76 100644 --- a/ports/autobahn/CONTROL +++ b/ports/autobahn/CONTROL @@ -1,4 +1,5 @@ Source: autobahn Version: 18.4.1 Build-Depends: websocketpp, msgpack, boost-asio, boost-thread -Description: WAMP for C++ in Boost/Asio https://crossbar.io/autobahn +Description: WAMP for C++ in Boost/Asio +Homepage: https://crossbar.io/autobahn diff --git a/ports/avro-c/CONTROL b/ports/avro-c/CONTROL index 5bcf16fe5..4374814d5 100644 --- a/ports/avro-c/CONTROL +++ b/ports/avro-c/CONTROL @@ -1,4 +1,5 @@ Source: avro-c -Version: 1.8.2-1 +Version: 1.8.2-2 +Homepage: https://github.com/apache/avro Description: Apache Avro is a data serialization system Build-Depends: jansson, liblzma, zlib diff --git a/ports/avro-c/fix-build-error.patch b/ports/avro-c/fix-build-error.patch new file mode 100644 index 000000000..6e07310fa --- /dev/null +++ b/ports/avro-c/fix-build-error.patch @@ -0,0 +1,20 @@ +diff --git a/lang/c/src/CMakeLists.txt b/lang/c/src/CMakeLists.txt +index c21f1ce..accb0e3 100644 +--- a/lang/c/src/CMakeLists.txt ++++ b/lang/c/src/CMakeLists.txt +@@ -85,13 +85,13 @@ source_group(Avro FILES ${AVRO_SRC}) + string(REPLACE ":" "." LIBAVRO_DOT_VERSION ${LIBAVRO_VERSION}) + + add_library(avro-static STATIC ${AVRO_SRC}) +-target_link_libraries(avro-static ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) ++target_link_libraries(avro-static jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) + set_target_properties(avro-static PROPERTIES OUTPUT_NAME avro) + + if (NOT WIN32) + # TODO: Create Windows DLLs. See http://www.cmake.org/Wiki/BuildingWinDLL + add_library(avro-shared SHARED ${AVRO_SRC}) +-target_link_libraries(avro-shared ${JANSSON_LIBRARIES} ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) ++target_link_libraries(avro-shared jansson::jansson ${CODEC_LIBRARIES} ${THREADS_LIBRARIES}) + set_target_properties(avro-shared PROPERTIES + OUTPUT_NAME avro + SOVERSION ${LIBAVRO_DOT_VERSION}) diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake index d868738df..553e694d8 100644 --- a/ports/avro-c/portfile.cmake +++ b/ports/avro-c/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "Avro-c's buildsystem uses very long paths and may fail on your system.\n" + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() @@ -13,14 +13,12 @@ vcpkg_from_github( REF release-1.8.2 SHA512 a48cc353aadd45ad2c8593bf89ec3f1ddb0fcd364b79dd002a60a54d49cab714b46eee8bd6dc47b13588b9eead49c754dfe05f6aff735752fca8d2cd35ae8649 HEAD_REF master + PATCHES + avro.patch + avro-pr-217.patch + fix-build-error.patch # Since jansson updated, use jansson::jansson instead of the macro ${JANSSON_LIBRARIES} ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/avro.patch - ${CMAKE_CURRENT_LIST_DIR}/avro-pr-217.patch) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/lang/c PREFER_NINJA diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL index 702ff2aa3..f9e0fc9af 100644 --- a/ports/aws-c-common/CONTROL +++ b/ports/aws-c-common/CONTROL @@ -1,3 +1,3 @@ Source: aws-c-common
-Version: 0.3.0
-Description: AWS common library for C
\ No newline at end of file +Version: 0.3.11-1
+Description: AWS common library for C
diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch new file mode 100644 index 000000000..d82a00aaa --- /dev/null +++ b/ports/aws-c-common/disable-internal-crt-option.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake +index 5ceb11c..9d0aa12 100644 +--- a/cmake/AwsCFlags.cmake ++++ b/cmake/AwsCFlags.cmake +@@ -38,15 +38,6 @@ function(aws_set_common_properties target) + # Disable unknown pragma warnings + list(APPEND AWS_C_FLAGS /wd4068) + +- string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE) +- if(STATIC_CRT) +- string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") +- else() +- string(REPLACE "/MT" "/MD" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}") +- endif() +- string(REPLACE " " ";" _FLAGS "${_FLAGS}") +- list(APPEND AWS_C_FLAGS "${_FLAGS}") +- + else() + list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes) + diff --git a/ports/aws-c-common/fix-dependencey-build-error.patch b/ports/aws-c-common/fix-dependencey-build-error.patch new file mode 100644 index 000000000..cfbf2611c --- /dev/null +++ b/ports/aws-c-common/fix-dependencey-build-error.patch @@ -0,0 +1,13 @@ +diff --git a/include/aws/common/byte_buf.h b/include/aws/common/byte_buf.h +index 545b06d..c579c82 100644 +--- a/include/aws/common/byte_buf.h ++++ b/include/aws/common/byte_buf.h +@@ -21,6 +21,8 @@ + + #include <string.h> + ++#pragma warning(disable: 4068) ++ + /** + * Represents a length-delimited binary string or buffer. If byte buffer points + * to constant memory or memory that should otherwise not be freed by this diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 681964791..53d85abb0 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -3,9 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
- REF v0.3.0
- SHA512 604b4289f19be662f15dc5ba80c20b78856975332b485796f979580e45f8d778eb8ce0cc2c02dcbaf27bc1159f473e02676cd951b674b7c8478ed26438a04541
+ REF v0.3.11
+ SHA512 da845f748aecfff61209f542f4eac8d46738af52ce980d5c8315397f859429dfd9e4bf989ddf2fbe938d1efb33dce9c531c92cbe53388b1d1082d5caa97e8750
HEAD_REF master
+ PATCHES
+ fix-dependencey-build-error.patch # This patch fixes dependency port compilation failure
+ disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
)
vcpkg_configure_cmake(
@@ -16,7 +19,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
@@ -31,4 +34,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aw file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
-)
\ No newline at end of file +)
diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake index c5ee56933..8d1b0ec70 100644 --- a/ports/aws-c-event-stream/portfile.cmake +++ b/ports/aws-c-event-stream/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/cmake"
+ "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
)
vcpkg_install_cmake()
@@ -32,4 +32,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aw file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
-)
\ No newline at end of file +)
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL index db5f3a01f..81078404f 100644 --- a/ports/aws-sdk-cpp/CONTROL +++ b/ports/aws-sdk-cpp/CONTROL @@ -1,5 +1,6 @@ Source: aws-sdk-cpp -Version: 1.7.89 +Version: 1.7.116 +Homepage: https://github.com/aws/aws-sdk-cpp Description: AWS SDK for C++ Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream Default-Features: dynamodb, s3, kinesis diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 39d8b73b9..dc7bc19fc 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
- message(WARNING "Aws-sdk-cpp's buildsystem uses very long paths and may fail on your system.\n"
+ message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
)
endif()
@@ -10,8 +10,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
- REF 1.7.89 - SHA512 2f3702f193f7816615d08d55adfffaf93ec8119a0af32db4afbf6ba591500d24fdd334566cebae0586d8bd3bd27950e71fd257fc5cc3012f74ed58d464fd733d
+ REF 1.7.116
+ SHA512 2d10aebf1c10bb7e7a0efa1fd930b8743d9bce1d7d36f72c55fd13612be4fd30cf0a67ebe4f8d7c05146306084b10d8657ff26ac3bafaaa9efaa4c67707acb49
HEAD_REF master
)
diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 87ecfd32b..08223a62c 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,7 +1,7 @@ Source: azure-c-shared-utility -Version: 2019-03-18 +Version: 2019-05-16.1 Description: Azure C SDKs common code -Build-Depends: curl (linux), openssl (linux) +Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c Feature: public-preview Description: Azure C SDKs common code (public preview) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index de7f3e61a..c43bf4451 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF bc83cba1230e98988ae5cd2328f4dcf8c49d5866 - SHA512 48947709f9c07c8a910d40066a52b746f9ab15543837f44207b787674efd2b11e7a7eb849c88e20984f0e2141e5611f6d6edea39c8b82687f371c08ab274bd7b + REF f0642196af85aeb4f2717d9cc11176290f321fb8 + SHA512 fd8ee6e2be11c13f7388e57eb9c98397b6cb026ca370131db55b6118908701cdff2a1eaabb89bfe84591d6ee17163d06b7b86ad615216203bcbf0c8595d45452 HEAD_REF master PATCHES no-double-expand-cmake.patch ) @@ -15,8 +15,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF bc83cba1230e98988ae5cd2328f4dcf8c49d5866 - SHA512 48947709f9c07c8a910d40066a52b746f9ab15543837f44207b787674efd2b11e7a7eb849c88e20984f0e2141e5611f6d6edea39c8b82687f371c08ab274bd7b + REF f0642196af85aeb4f2717d9cc11176290f321fb8 + SHA512 fd8ee6e2be11c13f7388e57eb9c98397b6cb026ca370131db55b6118908701cdff2a1eaabb89bfe84591d6ee17163d06b7b86ad615216203bcbf0c8595d45452 HEAD_REF master PATCHES no-double-expand-cmake.patch ) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index a5725ed22..676184078 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,8 +1,8 @@ Source: azure-iot-sdk-c -Version: 2019-03-18 -Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c +Version: 2019-05-16.1 +Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c Description: A C99 SDK for connecting devices to Microsoft Azure IoT services Feature: public-preview Description: A version of the azure-iot-sdk-c containing public-preview features. -Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview] +Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c, umock-c diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 42630117b..3f3ca4f0c 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 68d9964daa3e6754f6f8d98bbbd637b0967d4d29 - SHA512 5492ab06ae3686c7a167d63620d6ca00024dd52d46627d7958569f1ec0cfca1b56151d54b8c7975f127f655018c10e830747ef84a0cdc66a44e903e25b2dc985 + REF f3f9538960d9b29033e52522dd63e985ba970504 + SHA512 f8ce98d62425da4bec1c9e99b7b662a615d90a9407e03f7ce31a56fb8848f6bda1a39156bbabf351383e490dc3438d842136220dcf08efb1560e21d9ac76a0ba HEAD_REF public-preview PATCHES improve-external-deps.patch ) @@ -15,14 +15,15 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 8c331e8552f754bb6e0502486ceee698625eb468 - SHA512 cc6f34e04f237bb5e8e5445e033eefab00373d53a4847ab6089c9b8eb400ab87ced6905f1c78ea7d0da3e9a56145e86a58d2f226fcf38f08659330a33d68f82e + REF 11d5150aeb26635862cf50484af9c7e8badd52a0 + SHA512 d2cf40bca9db2c66d78f889763af3a1d06abc0e9fce19542599daec56b092e03f01f892ff420a7b107a96e0eb533579ee7eccf249b56cf6600896c77ca619fc3 HEAD_REF master PATCHES improve-external-deps.patch ) endif() 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} diff --git a/ports/azure-macro-utils-c/CONTROL b/ports/azure-macro-utils-c/CONTROL new file mode 100644 index 000000000..40aaa75fe --- /dev/null +++ b/ports/azure-macro-utils-c/CONTROL @@ -0,0 +1,5 @@ +Source: azure-macro-utils-c +Version: 2019-05-16.1 +Description: A library of macros for the Azure IoT SDK Suite +Build-Depends: + diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake new file mode 100644 index 000000000..d516e59e9 --- /dev/null +++ b/ports/azure-macro-utils-c/portfile.cmake @@ -0,0 +1,32 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-macro-utils-c + REF 38729b4b7ac3ea8b7d71e394782b861ecb25193e + SHA512 c9c820e74aee403d45f257359318d3435e5d6534afe821da5679bc462e26ad256dd01ed253a80ba1c58343f850ef1026280533a152c4b0465527f6537b3092d3 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Drun_int_tests=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c) + +file(COPY ${SOURCE_PATH}/inc/azure_macro_utils/macro_utils.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure_macro_utils_c/include/azure_macro_utils) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug) + +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-macro-utils-c/copyright COPYONLY) + +vcpkg_copy_pdbs() + + diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL index 31628d64c..720f07efb 100644 --- a/ports/azure-storage-cpp/CONTROL +++ b/ports/azure-storage-cpp/CONTROL @@ -1,5 +1,6 @@ Source: azure-storage-cpp -Version: 6.0.0-3 +Version: 6.1.0 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext Description: 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. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/ + 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. +Homepage: https://blogs.msdn.com/b/windowsazurestorage/ diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index 58c8a4fc4..0a9662af3 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-storage-cpp - REF v6.0.0 - SHA512 e568c3c3fd10a688b4d2491987998b1e133e54853fbf94a238a0cc3955dfd4d68bedf79a0e30bb5f30e8dd3c2bf41999d7c8658571b7dca9a4058140258ca314 + REF v6.1.0 + SHA512 bc6a1da6287301b5bb5c31694d508c46447b71043d5b94a90ffe79b6dc045bc111ed0bcf3a7840e096ddc3ef6badbeef7fb905242e272a9f82f483d849a43e61 HEAD_REF master PATCHES # on osx use the uuid.h that is part of the osx sdk diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index 06db79ec4..db9200f4c 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,8 +1,8 @@ Source: azure-uamqp-c -Version: 2019-03-18 -Build-Depends: azure-c-shared-utility +Version: 2019-05-16.1 +Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c Description: AMQP library for C Feature: public-preview Description: AMQP library for C (public preview) -Build-Depends: azure-c-shared-utility[public-preview] +Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index e5b4b3d96..517eca19a 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 13f009ddd50a2837f651b0237de17db5f24c3af9 - SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984 + REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af + SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75 HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 13f009ddd50a2837f651b0237de17db5f24c3af9 - SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984 + REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af + SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75 HEAD_REF master ) endif() diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index 4f41f6931..f282a27f2 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,8 +1,8 @@ Source: azure-uhttp-c -Version: 2019-03-18 -Build-Depends: azure-c-shared-utility +Version: 2019-05-16.1 +Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c Description: Azure HTTP Library written in C Feature: public-preview Description: Azure HTTP Library written in C (public preview) -Build-Depends: azure-c-shared-utility[public-preview] +Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index e99276af7..af5afc875 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 43dce924b32818f8ab851f972cffebc204edc5c4 - SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70 + REF b8976adff02e543fc00e7db59eae9ce78dd014fe + SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 43dce924b32818f8ab851f972cffebc204edc5c4 - SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70 + REF b8976adff02e543fc00e7db59eae9ce78dd014fe + SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec HEAD_REF master ) endif() diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index eec4acb1b..2138a45b1 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,8 +1,8 @@ Source: azure-umqtt-c -Version: 2019-03-18 -Build-Depends: azure-c-shared-utility +Version: 2019-05-16.1 +Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c Description: General purpose library for communication over the mqtt protocol Feature: public-preview Description: General purpose library for communication over the mqtt protocol (public preview) -Build-Depends: azure-c-shared-utility[public-preview] +Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 9f7002f32..d64dd01d4 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF ea9f6112d002bdff55c94df327bc7effc8393c78 - SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f + REF c37883fbb05218fd940b87899a116af240f90c40 + SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3 HEAD_REF master ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF ea9f6112d002bdff55c94df327bc7effc8393c78 - SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f + REF c37883fbb05218fd940b87899a116af240f90c40 + SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3 HEAD_REF master ) endif() diff --git a/ports/bdwgc/001-install-libraries.patch b/ports/bdwgc/001-install-libraries.patch new file mode 100644 index 000000000..2cc87f5be --- /dev/null +++ b/ports/bdwgc/001-install-libraries.patch @@ -0,0 +1,257 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d386ca5..b94d6358 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,6 +27,10 @@ include(CTest) + + cmake_minimum_required(VERSION 3.1) + ++# Customize CMake options by passing "-D<OPTION_NAME>=ON|OFF" in your command line ++option(build_cord "Install cord" ON) ++option(build_tests "Install library tests" ON) ++option(install_headers "Install header files" ON) + option(enable_threads "TODO" OFF) #TODO Support it + option(enable_parallel_mark "Parallelize marking and free list construction" ON) + option(enable_thread_local_alloc "Turn on thread-local allocation optimization" ON) +@@ -52,22 +56,13 @@ add_definitions("-DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION") + + if (APPLE) + if ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "") +- set(CMAKE_OSX_ARCHITECTURES "ppc;i386;x86_64" ++ set(CMAKE_OSX_ARCHITECTURES "x86_64;i386" + CACHE STRING "Build architectures for Mac OS X" FORCE) + endif() +-elseif (WIN32) ++elseif (MSVC) + add_definitions("-D_CRT_SECURE_NO_DEPRECATE") + endif() + +-#LIBATOMIC #TODO +-#ADD_LIBRARY(atomic_ops STATIC ) +-#SET_TARGET_PROPERTIES(atomic_ops PROPERTIES COMPILE_FLAGS -DNO_DEBUGGING) +- +- +-#LIBGC +- +-include_directories(include) +-include_directories(libatomic_ops/src) + + set(SRC alloc.c reclaim.c allchblk.c misc.c mach_dep.c os_dep.c + mark_rts.c headers.c mark.c obj_map.c blacklst.c finalize.c +@@ -82,12 +77,6 @@ if (enable_threads) + set(LIBS ${LIBS} ${Threads_LIBRARIES}) + endif() + +-#IF(Threads_FOUND) +-# ADD_DEFINITIONS("") +-#ELSE +-# MESSAGE("Parallel mark requires enable_threads ON" ) +-#ENDIF(Threads_FOUND) +- + if (enable_cplusplus) + set(SRC ${SRC} gc_cpp.cc) + endif() +@@ -141,7 +130,7 @@ if (CMAKE_USE_PTHREADS_INIT) + if (enable_parallel_mark) + add_definitions("-DHANDLE_FORK") + endif() +- endif(enable_handle_fork) ++ endif() + set(SRC ${SRC} darwin_stop_world.c) + #TODO darwin_threads=true + endif() +@@ -158,10 +147,10 @@ if (CMAKE_USE_WIN32_THREADS_INIT) + add_definitions("-DTHREAD_LOCAL_ALLOC") + set(SRC ${SRC} thread_local_alloc.c) + endif() +- endif(enable_parallel_mark) ++ endif() + add_definitions("-DEMPTY_GETENV_RESULTS") + set(SRC ${SRC} win32_threads.c) +-endif(CMAKE_USE_WIN32_THREADS_INIT) ++endif() + + if (enable_gcj_support) + add_definitions("-DGC_GCJ_SUPPORT") +@@ -169,7 +158,7 @@ if (enable_gcj_support) + add_definitions("-DGC_ENABLE_SUSPEND_THREAD") + endif() + set(SRC ${SRC} gcj_mlc.c) +-endif(enable_gcj_support) ++endif() + + if (enable_disclaim) + add_definitions("-DENABLE_DISCLAIM") +@@ -195,7 +184,7 @@ if (enable_gc_debug) + add_definitions("-DMAKE_BACK_GRAPH") + set(SRC ${SRC} backgraph.c) + endif() +-endif(enable_gc_debug) ++endif() + + if (enable_redirect_malloc) + if (enable_gc_debug) +@@ -206,7 +195,7 @@ if (enable_redirect_malloc) + add_definitions("-DREDIRECT_MALLOC=GC_malloc") + endif() + add_definitions("-DGC_USE_DLOPEN_WRAP") +-endif(enable_redirect_malloc) ++endif() + + if (enable_munmap) + add_definitions("-DUSE_MMAP -DUSE_MUNMAP") +@@ -240,19 +229,44 @@ if (enable_checksums) + endif() + add_definitions("-DCHECKSUMS") + set(SRC ${SRC} checksums.c) +-endif(enable_checksums) +- +-add_library(gc-lib STATIC ${SRC}) +-set_target_properties(gc-lib PROPERTIES +- COMPILE_DEFINITIONS GC_NOT_DLL) +-#TODO TARGET_LINK_LIBRARIES(... ... ${LIBS}) ++endif() + +-add_library(gcmt-lib STATIC ${SRC}) +-set_target_properties(gcmt-lib PROPERTIES +- COMPILE_DEFINITIONS GC_NOT_DLL) ++# Create target ++add_library(gc ${SRC}) ++target_include_directories(gc ++ PUBLIC ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ++ $<INSTALL_INTERFACE:include> ++) ++if (NOT BUILD_SHARED_LIBS) ++ target_compile_definitions(gc PRIVATE GC_NOT_DLL) ++else() ++ target_compile_definitions(gc PRIVATE GC_DLL) ++endif() + +-add_library(gcmt-dll SHARED ${SRC}) ++# Install library ++install( ++ TARGETS gc ++ EXPORT gcExports ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION bin ++ INCLUDES DESTINATION include ++) ++ ++# Install headers ++if (install_headers) ++ file(GLOB BDWGC_HEADERS "include/*.h") ++ install(FILES ${BDWGC_HEADERS} DESTINATION include/gc) ++ ++ file(GLOB BDWGC_EXTRA_HEADERS "include/extra/*.h") ++ install(FILES ${BDWGC_EXTRA_HEADERS} DESTINATION include) ++endif() + +-add_subdirectory(cord) ++if (build_cord) ++ add_subdirectory(cord) ++endif() + +-add_subdirectory(tests) ++if (build_tests) ++ add_subdirectory(tests) ++endif() +diff --git a/cord/CMakeLists.txt b/cord/CMakeLists.txt +index 17077370..21818d4e 100644 +--- a/cord/CMakeLists.txt ++++ b/cord/CMakeLists.txt +@@ -11,11 +11,11 @@ + # modified is included with the above copyright notice. + ## + ++add_executable(cord cordbscs.c cordxtra.c tests/de.c tests/de_win.c) ++set_target_properties(cord PROPERTIES COMPILE_DEFINITIONS GC_NOT_DLL) ++target_link_libraries(cord PRIVATE gc) ++ + if (WIN32) +- add_executable(cord cordbscs.c cordxtra.c +- tests/de.c tests/de_win.c) + set_target_properties(cord PROPERTIES WIN32_EXECUTABLE TRUE) +- set_target_properties(cord PROPERTIES COMPILE_DEFINITIONS GC_NOT_DLL) +- target_link_libraries(cord gc-lib) +- target_link_libraries(cord gdi32) ++ target_link_libraries(cord PRIVATE gdi32) + endif() +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index c6bcc7d7..32a021e7 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -14,8 +14,6 @@ + # modified is included with the above copyright notice. + ## + +-add_definitions("-DGC_NOT_DLL") +- + # Compile some tests as C++ to test extern "C" in header files. + if (enable_cplusplus) + set_source_files_properties(leak_test.c test.c +@@ -23,51 +21,51 @@ if (enable_cplusplus) + endif() + + add_executable(gctest WIN32 test.c) +-target_link_libraries(gctest gc-lib) ++target_link_libraries(gctest PRIVATE gc) + add_test(NAME gctest COMMAND gctest) + + add_executable(hugetest huge_test.c) +-target_link_libraries(hugetest gc-lib) ++target_link_libraries(hugetest PRIVATE gc) + add_test(NAME hugetest COMMAND hugetest) + + add_executable(leaktest leak_test.c) +-target_link_libraries(leaktest gc-lib) ++target_link_libraries(leaktest PRIVATE gc) + add_test(NAME leaktest COMMAND leaktest) + + add_executable(middletest middle.c) +-target_link_libraries(middletest gc-lib) ++target_link_libraries(middletest PRIVATE gc) + add_test(NAME middletest COMMAND middletest) + + add_executable(realloc_test realloc_test.c) +-target_link_libraries(realloc_test gc-lib) ++target_link_libraries(realloc_test PRIVATE gc) + add_test(NAME realloc_test COMMAND realloc_test) + + add_executable(smashtest smash_test.c) +-target_link_libraries(smashtest gc-lib) ++target_link_libraries(smashtest PRIVATE gc) + add_test(NAME smashtest COMMAND smashtest) + + if (enable_gc_debug) + add_executable(tracetest trace_test.c) +- target_link_libraries(tracetest gc-lib) ++ target_link_libraries(tracetest PRIVATE gc) + add_test(NAME tracetest COMMAND tracetest) + endif() + + if (enable_cplusplus) + # TODO add_executable(test_cpp test_cpp.cc) +- # target_link_libraries(test_cpp gc-lib) ++ # target_link_libraries(test_cpp PRIVATE gc) + # add_test(NAME test_cpp COMMAND test_cpp) + endif() + + if (enable_disclaim) + add_executable(disclaim_bench disclaim_bench.c) +- target_link_libraries(disclaim_bench gc-lib) ++ target_link_libraries(disclaim_bench PRIVATE gc) + add_test(NAME disclaim_bench COMMAND disclaim_bench) + + add_executable(disclaim_test disclaim_test.c) +- target_link_libraries(disclaim_test gc-lib) ++ target_link_libraries(disclaim_test PRIVATE gc) + add_test(NAME disclaim_test COMMAND disclaim_test) + + add_executable(disclaim_weakmap_test disclaim_weakmap_test.c) +- target_link_libraries(disclaim_weakmap_test gc-lib) ++ target_link_libraries(disclaim_weakmap_test PRIVATE gc) + add_test(NAME disclaim_weakmap_test COMMAND disclaim_weakmap_test) + endif() +
\ No newline at end of file diff --git a/ports/bdwgc/CONTROL b/ports/bdwgc/CONTROL new file mode 100644 index 000000000..973076004 --- /dev/null +++ b/ports/bdwgc/CONTROL @@ -0,0 +1,3 @@ +Source: bdwgc +Version: 8.0.4-1 +Description: The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc) diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake new file mode 100644 index 000000000..8fdbbf72a --- /dev/null +++ b/ports/bdwgc/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ivmai/bdwgc + # REF v8.0.4 + # SHA512 f3c178c9cab9d9df9ecdad5ac5661c916518d29b0eaca24efe569cb757c386c118ad4389851107597d99ff1bbe99b46383cce73dfd01be983196aa57c9626a4a + REF 0c8905e84d16bd5e14ed91e21904fd7ab9d197e2 + SHA512 b38fe86d0dfaacd502971e39ea7df83a3dbf5542711f6b0462b7a6d48dbcf43da07a41a60ee96bca6403a2d2adaac0815a64667f3c80549ca57c5ebbe0e9672d + HEAD_REF master + PATCHES + 001-install-libraries.patch +) + + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Dbuild_tests=OFF + -Dbuild_cord=OFF + OPTIONS_DEBUG + -Dinstall_headers=OFF +) + +vcpkg_install_cmake() + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/README.QUICK DESTINATION ${CURRENT_PACKAGES_DIR}/share/bdwgc RENAME copyright) diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL index 13f42ca0b..27c4c8256 100644 --- a/ports/benchmark/CONTROL +++ b/ports/benchmark/CONTROL @@ -1,3 +1,4 @@ Source: benchmark -Version: 1.4.1-1 +Version: 1.5 +Homepage: https://github.com/google/benchmark Description: A library to support the benchmarking of functions, similar to unit-tests. diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index b27149966..76cdfb437 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF v1.4.1 - SHA512 e9d71b4679cb4e4d755f7bb4101e131b37e209b6aebd0853e0c63eb11c42b75faa5da4ff8c265149808a475f3a1cfb140c5b49f877acfda908a4bb7add983aae + REF v1.5.0 + SHA512 a0df9aa3d03f676e302c76d83b436de36eea0a8517ab50a8f5a11c74ccc68a1f5128fa02474901002d8e6b5a4d290ef0272a798ff4670eab3e2d78dc86bb6cd3 HEAD_REF master ) diff --git a/ports/berkeleydb/CONTROL b/ports/berkeleydb/CONTROL index e77e5793a..c1416e07b 100644 --- a/ports/berkeleydb/CONTROL +++ b/ports/berkeleydb/CONTROL @@ -1,3 +1,4 @@ Source: berkeleydb
Version: 4.8.30-2
-Description: A high-performance embedded database for key/value data.
+Homepage: https://download.oracle.com/
+Description: BDB - A high-performance embedded database for key/value data.
diff --git a/ports/bigint/CONTROL b/ports/bigint/CONTROL index 9f508306c..d862b4b51 100644 --- a/ports/bigint/CONTROL +++ b/ports/bigint/CONTROL @@ -1,3 +1,4 @@ Source: bigint
Version: 2010.04.30-3
+Homepage: https://mattmccutchen.net/bigint
Description: C++ Big Integer Library
diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL index 89af7e7d3..8e91f8df6 100644 --- a/ports/blaze/CONTROL +++ b/ports/blaze/CONTROL @@ -1,4 +1,5 @@ Source: blaze Version: 3.5 -Build-Depends: clapack, boost-exception +Build-Depends: clapack (!osx), boost-exception +Homepage: https://bitbucket.org/blaze-lib/blaze Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic. diff --git a/ports/blend2d/CONTROL b/ports/blend2d/CONTROL new file mode 100644 index 000000000..ef22b5264 --- /dev/null +++ b/ports/blend2d/CONTROL @@ -0,0 +1,10 @@ +Source: blend2d +Version: beta_2019-04-30 +Description: Beta 2D Vector Graphics Powered by a JIT Compiler +Default-Features: jit, logging + +Feature: jit +Description: asmjit is used to jit compile pipelines + +Feature: logging +Description: enables logging diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake new file mode 100644 index 000000000..c23c90afd --- /dev/null +++ b/ports/blend2d/portfile.cmake @@ -0,0 +1,60 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO blend2d/blend2d + REF 69141350b5a654f328c8529ae301aa1e6bad5342 + SHA512 d9bdd234f443c0ef8793dba1a76cc567bab3f9cf32d835d9e285f7ad946a56e0bc03eab30f61bbce51318e18a74ecfcfc965ac94e1ff6cef21e9b3ccc6a42120 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_BUILD_STATIC) + +if(NOT ("jit" IN_LIST FEATURES)) + set(BLEND2D_BUILD_NO_JIT TRUE) +endif() +if(NOT ("logging" IN_LIST FEATURES)) + set(BLEND2D_BUILD_NO_LOGGING TRUE) +endif() + + +if(NOT BLEND2D_BUILD_NO_JIT) + vcpkg_from_github( + OUT_SOURCE_PATH ASMJIT_SOURCE_PATH + REPO asmjit/asmjit + REF f4e685cef003c40ad0d348d0c9eb2a1fe63d8521 + SHA512 77981fc32e746fc88f5707b4a8e8557283261b2657248f0d4900f47bd500de4efe47619a53f32413ea3c6f116e084cac6fdb48b6b92d75e824585d94c785d2b1 + HEAD_REF next-wip + ) + + file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/asmjit) + + get_filename_component(ASMJIT_SOURCE_DIR_NAME ${ASMJIT_SOURCE_PATH} NAME) + file(COPY ${ASMJIT_SOURCE_PATH} DESTINATION ${SOURCE_PATH}/3rdparty) + file(RENAME ${SOURCE_PATH}/3rdparty/${ASMJIT_SOURCE_DIR_NAME} ${SOURCE_PATH}/3rdparty/asmjit) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBLEND2D_BUILD_STATIC=${BLEND2D_BUILD_STATIC} + -DBLEND2D_BUILD_NO_JIT=${BLEND2D_BUILD_NO_JIT} + -DBLEND2D_BUILD_NO_LOGGING=${BLEND2D_BUILD_NO_LOGGING} +) + + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + + +if(BLEND2D_BUILD_STATIC) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + + + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/blend2d RENAME copyright) diff --git a/ports/blosc/CONTROL b/ports/blosc/CONTROL index 1a2378aed..4dc7bf81f 100644 --- a/ports/blosc/CONTROL +++ b/ports/blosc/CONTROL @@ -1,4 +1,5 @@ Source: blosc -Version: 1.13.5-1 +Version: 1.16.3-1 Build-Depends: lz4, snappy, zlib, zstd +Homepage: https://github.com/Blosc/c-blosc Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()` diff --git a/ports/blosc/portfile.cmake b/ports/blosc/portfile.cmake index 33d6f729a..367c59194 100644 --- a/ports/blosc/portfile.cmake +++ b/ports/blosc/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Blosc/c-blosc - REF v1.13.5 - SHA512 3ddc83c16c91d87959179f58bd23fe8e4bbd07c17312cdfdd0bc238a743e695f2914baf0b69efd923e8e54e8455699c8e528d3966d9126e15a8897d3c529db25 + REF v1.16.3 + SHA512 2ff67a6e955a641c3a2330140e5887d0ce3fdcbf6b205507798a4e848a35ba2e22bf8fd91133291bc73c4e48fb01c02139e47ab8e4774d0e2288872e625c9ffd HEAD_REF master ) @@ -32,14 +32,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_copy_pdbs() - if (BLOSC_SHARED) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/blosc.dll ${CURRENT_PACKAGES_DIR}/debug/bin/blosc.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/blosc.dll ${CURRENT_PACKAGES_DIR}/bin/blosc.dll) +vcpkg_copy_pdbs() + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/blosc.dll") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/blosc.dll ${CURRENT_PACKAGES_DIR}/bin/blosc.dll) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/blosc.dll") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/blosc.dll ${CURRENT_PACKAGES_DIR}/debug/bin/blosc.dll) + endif() endif() # cleanup diff --git a/ports/bond/0002_omit_rapidjson.patch b/ports/bond/0002_omit_rapidjson.patch deleted file mode 100644 index 7d502353d..000000000 --- a/ports/bond/0002_omit_rapidjson.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe0f629e..54b6d8ec 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,6 @@ install (DIRECTORY - cpp/inc/bond - cpp/generated/bond - python/inc/bond -- thirdparty/rapidjson/include/rapidjson - DESTINATION include - PATTERN *.cpp EXCLUDE) - diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL index 62f48bd8a..0d1b82bc3 100644 --- a/ports/bond/CONTROL +++ b/ports/bond/CONTROL @@ -1,5 +1,6 @@ Source: bond
Maintainer: bond@microsoft.com
-Version: 7.0.2-2
-Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. <https://github.com/Microsoft/bond>
+Version: 8.1.0
+Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
+Homepage: https://github.com/Microsoft/bond
Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
diff --git a/ports/bond/fix-install-path.patch b/ports/bond/fix-install-path.patch new file mode 100644 index 000000000..e5fa270c1 --- /dev/null +++ b/ports/bond/fix-install-path.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2f8eaa..1b0c01c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ set (BOND_FIND_RAPIDJSON + # settings so that we don't apply our settings to third-party code. + add_subdirectory (thirdparty) + +-enable_testing() ++#enable_testing() + + set (BOND_IDL ${CMAKE_CURRENT_SOURCE_DIR}/idl) + set (BOND_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inc) +@@ -80,6 +80,6 @@ if (BOND_GBC_PATH) + + install ( + FILES ${BOND_GBC_PATH} +- DESTINATION bin ++ DESTINATION tools + RENAME ${INSTALLED_GBC_NAME}) + endif() +diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt +index 1dff9d0..9a11575 100644 +--- a/compiler/CMakeLists.txt ++++ b/compiler/CMakeLists.txt +@@ -108,7 +108,7 @@ set (test_sources + tests/TestMain.hs + ${tests}) + +-set (completion_dir etc/bash_completion.d) ++set (completion_dir tools/bond) + set (completion ${CMAKE_CURRENT_BINARY_DIR}/gbc.comp) + set (output ${CMAKE_CURRENT_BINARY_DIR}/build/gbc/gbc${CMAKE_EXECUTABLE_SUFFIX}) + set (GBC_EXECUTABLE ${output} PARENT_SCOPE) +@@ -130,7 +130,7 @@ endif() + + install (FILES ${output} + PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE +- DESTINATION bin) ++ DESTINATION ${completion_dir}) + + install (FILES ${completion} + RENAME gbc +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index b45078e..1eebe9c 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -110,7 +110,7 @@ target_include_directories (bond_apply BEFORE PRIVATE + + install (TARGETS bond bond_apply + EXPORT bond +- ARCHIVE DESTINATION lib/bond ++ ARCHIVE DESTINATION lib + INCLUDES DESTINATION include) + + install (DIRECTORY ${BOND_IDL}/bond/core DESTINATION include/bond) diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index a508e6a35..42755dbf9 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -4,77 +4,72 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-7.0.2) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/Microsoft/bond/archive/7.0.2.zip" - FILENAME "bond-7.0.2.zip" - SHA512 4ae3b88fafbede6c1433d171713bdbfcbed61a3d2a983d7df4e33af893a50f233be0e95c1ea8e5f30dafb017b2a8100a23721292b04184159e5fd796b1a43398 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/bond + REF 8.1.0 + SHA512 287a2d299036b57e0576903b1f5372bf8071243ada57153c4bf231cdc660faab1e70c60ddde57ac759d941b74af4ba25d81a5d58e8dbf391032b7b226c4cd18c + HEAD_REF master + PATCHES fix-install-path.patch ) -vcpkg_download_distfile(GBC_ARCHIVE - URLS "https://github.com/Microsoft/bond/releases/download/7.0.2/gbc-7.0.2-amd64.exe.zip" - FILENAME "gbc-7.0.2-amd64.exe.zip" - SHA512 069eafd7641ebd719425037cb8249d2d214eb09c6ce38fbf1d1811c01d1839b0a0987c55217075b6ae9f477f750d582250134387a530edb2aee407b21d973915 -) - -vcpkg_extract_source_archive(${ARCHIVE}) -# Extract the precompiled gbc -vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/) -set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-7.0.2-amd64.exe) +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_download_distfile(GBC_ARCHIVE + URLS "https://github.com/microsoft/bond/releases/download/8.1.0/gbc-8.1.0-amd64.zip" + FILENAME "gbc-8.1.0-amd64.zip" + SHA512 896c9a78fc714e0ea44c37ed36400ec8e5f52d495a8d81aa80834ff6cd6303c7c94e06129f7b2269416a9e0ffb61423e87406db798fb5be7ff00f14981530089 + ) + + # Extract the precompiled gbc + vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/) + set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc.exe) -if (NOT EXISTS "${FETCHED_GBC_PATH}") - message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.") + if (NOT EXISTS "${FETCHED_GBC_PATH}") + message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.") + endif() + +else() + message(STATUS "Installing stack...") + vcpkg_download_distfile( + ARCHIVE + URLS "https://get.haskellstack.org/" + FILENAME "stack-install.sh" + SHA512 6db2008297416ad856aa498908bf695737cf3cc466440397720a458358e9661d07abdba762662080ee8bbd8171cdcb05eec6d3696382575c099adfb8427e05fd + ) + + set(BASH /bin/bash) + + vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc "${ARCHIVE}" -f + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} + LOGNAME install-stack + ) + endif() -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - # Don't install rapidjson from the (empty) submodule. With vcpkg, we get - # rapidjson from vcpkg - ${CMAKE_CURRENT_LIST_DIR}/0002_omit_rapidjson.patch -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DBOND_LIBRARIES_ONLY=TRUE -DBOND_GBC_PATH=${FETCHED_GBC_PATH} + -DBOND_SKIP_GBC_TESTS=TRUE -DBOND_ENABLE_COMM=FALSE -DBOND_ENABLE_GRPC=FALSE + -DBOND_FIND_RAPIDJSON=TRUE ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/bond TARGET_PATH share/bond) + # Put the license file where vcpkg expects it file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bond) file(RENAME ${CURRENT_PACKAGES_DIR}/share/bond/LICENSE ${CURRENT_PACKAGES_DIR}/share/bond/copyright) -# Drop a copy of gbc in tools/ so that it can be used -file(COPY ${CURRENT_PACKAGES_DIR}/bin/gbc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/) - -# vcpkg doesn't--as of version 0.0.30--like executables such as gbc.exe in -# the output. Just delete the bin/ directories for now. -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin/ - ${CURRENT_PACKAGES_DIR}/debug/bin/) - # There's no way to supress installation of the headers in the debug build, # so we just delete them. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Bond's install target installs to lib/bond, but vcpkg expects the lib -# files to end up in lib/, so move them up a directory. -file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/bond/bond.lib - ${CURRENT_PACKAGES_DIR}/lib/bond.lib) -file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/bond/bond_apply.lib - ${CURRENT_PACKAGES_DIR}/lib/bond_apply.lib) -file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/bond/bond.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/bond.lib) -file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/bond/bond_apply.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/bond_apply.lib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() diff --git a/ports/boost-accumulators/CONTROL b/ports/boost-accumulators/CONTROL index d25e19fc6..0d0be2efd 100644 --- a/ports/boost-accumulators/CONTROL +++ b/ports/boost-accumulators/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-accumulators
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/accumulators
Description: Boost accumulators module
diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index 7b27e076f..dc0cd61b1 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/accumulators
- REF boost-1.69.0
- SHA512 82bb844f96ba5bc3ef97171830e2c7acd35eb500af211e2946aa51d1de1350acc2965200906d0656b8fd28eaf7d4781cc4e60b70fcbdad6c272ce8f6b47c608b
+ REF boost-1.70.0
+ SHA512 5f4b80082b033f1b5a8d2fa7f69410e334632d535011fefc6792331b2d77e27904b1cc7cef5a77891cec09cd329b08589552529c8feabb6b2da9676da3fc0dff
HEAD_REF master
)
diff --git a/ports/boost-algorithm/CONTROL b/ports/boost-algorithm/CONTROL index fc11fcd75..bda5627cb 100644 --- a/ports/boost-algorithm/CONTROL +++ b/ports/boost-algorithm/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-algorithm
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/algorithm
Description: Boost algorithm module
diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index ae1ce12a0..f0184ebba 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/algorithm
- REF boost-1.69.0
- SHA512 1f3711ce69db9c8d0e7f2703fe03f2743c0e3d8d8a5342122fa3603cd89733764c23b8758e3cfeb4a92e9ec9f4d33f115e79c84de5b53e816ae467233080bab7
+ REF boost-1.70.0
+ SHA512 3510cb1d837f04b26a009324ed123af756c2f47ec825e0148e11af4cf5a280e7df732552415015e18ccfb63e8077acebb5860c89af7dd3bb0fef878d67373aa2
HEAD_REF master
)
diff --git a/ports/boost-align/CONTROL b/ports/boost-align/CONTROL index a977e771e..31d92ab53 100644 --- a/ports/boost-align/CONTROL +++ b/ports/boost-align/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-align
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/align
Description: Boost align module
diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index 5a96db899..bcb356a7f 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/align
- REF boost-1.69.0
- SHA512 7a2a05bed07c589c72ed87dce4f03b2e803a860e5696c958b6a393297ac95001d3cf521e121710b105a6e742d8160c9e52934d8ace9bdd91b524a69e64fd95bf
+ REF boost-1.70.0
+ SHA512 862c7e440e9fef88430a18bc3916f236578dca16dbcbc007f23fdbbf114933342d1c4f2c763d189fec510210aa011f3ff9f6f326a0a46ab549857f8afe4f64a1
HEAD_REF master
)
diff --git a/ports/boost-any/CONTROL b/ports/boost-any/CONTROL index 6efa9ab4e..b7f37834e 100644 --- a/ports/boost-any/CONTROL +++ b/ports/boost-any/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-any
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/any
Description: Boost any module
diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 9c40ed38a..05e18ee94 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/any
- REF boost-1.69.0
- SHA512 e6ca491c071992e542a480512d2b79add63c57428a527d4cffa5bf85448d9e7b7d2e7356e62d0346704cf881d62b2ca1c9cb3dcb68671b32623660d5cdd2ee96
+ REF boost-1.70.0
+ SHA512 ee0f9badba0d90807a8462fffc1c6880e06dd1cf43333a8f77c8b490007f4ebbdd30fae9046c18b2b8a48c2be8d0a28b3b4f3e8021a3b6491a319716aaa9bca3
HEAD_REF master
)
diff --git a/ports/boost-array/CONTROL b/ports/boost-array/CONTROL index 2cb22727c..442caaf0f 100644 --- a/ports/boost-array/CONTROL +++ b/ports/boost-array/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-array
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/array
Description: Boost array module
diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 90a6ec6aa..25f50d3f8 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/array
- REF boost-1.69.0
- SHA512 7d9eaea992faf31af6c0cf793d543e53dee6a5d827c232e3cc86b639cd4e5dc0d3b6daec46144fc1953083aa7d60e87d6292fa518be1d1b499bc58804c28a443
+ REF boost-1.70.0
+ SHA512 d741425add056b019c27b1bfc5f174d31945950f57a23be59dfa7f262902191142486112c1fa0002d58a4771e69c76435196d222aaddee148cc78796c5f3f05b
HEAD_REF master
)
diff --git a/ports/boost-asio/CONTROL b/ports/boost-asio/CONTROL index e1a35aeff..3d93e7c07 100644 --- a/ports/boost-asio/CONTROL +++ b/ports/boost-asio/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-asio
-Version: 1.69.0-1
+Version: 1.70.0-1
Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
+Homepage: https://github.com/boostorg/asio
Description: Boost asio module
diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 9dd127495..dbb2b239c 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/asio
- REF boost-1.69.0
- SHA512 46597ccac219ceb484c638be06ba51a812f8b0e9559fe059542a2dbe5ed397f179f3430a3f24a3225e273de2bf351b44354c4f550c48ce491dff62d99618a64b
+ REF boost-1.70.0
+ SHA512 394c7e557d97bbb8b98453846a098c8ab7f4eb92d752bd4089d2020e0d5060cff1e53f5e50b2f8910e64b66c934b2bde4a7137bd1a6050e8b1279c2e4576b2e5
HEAD_REF master
)
diff --git a/ports/boost-assert/CONTROL b/ports/boost-assert/CONTROL index 7ab47b739..9b2b6f1e5 100644 --- a/ports/boost-assert/CONTROL +++ b/ports/boost-assert/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-assert
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/assert
Description: Boost assert module
diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 2a7ad1e15..a4e951999 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/assert
- REF boost-1.69.0
- SHA512 d96dfd50ab45f71f67f0bb87624b71dff8bb74bfbba8d014896dd1f68ec3163b877394732567ff0fe4e4feb837ff248291b0fcc0743a907df11397b4cd94a275
+ REF boost-1.70.0
+ SHA512 8bd823a51b5cdad0b016f4b319c64c0965112b163fd0f721830e26195bc2de4a7767308ae6fdc044c621dc0fb14f60f890a994c36de2942095453854288497eb
HEAD_REF master
)
diff --git a/ports/boost-assign/CONTROL b/ports/boost-assign/CONTROL index 9c4e469d5..60d906bb8 100644 --- a/ports/boost-assign/CONTROL +++ b/ports/boost-assign/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-assign
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-config, boost-detail, boost-move, boost-mpl, boost-preprocessor, boost-ptr-container, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/assign
Description: Boost assign module
diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 6ac289794..2a92e2513 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/assign
- REF boost-1.69.0
- SHA512 c83961ff2281421001a041a77ab785f81fba1b3538fc96a2b8a5ea6ca950e9088ed820d46758cf4d076c0f31b6b92d948a39384f7e2f796659a76434e7b089b9
+ REF boost-1.70.0
+ SHA512 bae75fe87fe6de3c9b20e89ee818b2927cc1e6de90776163376113ff0ca103a338850b915b143e8d6047f733c0fa9c7517ca73688e830485bb66062898d3142f
HEAD_REF master
)
diff --git a/ports/boost-atomic/CONTROL b/ports/boost-atomic/CONTROL index 384cae7fc..ffa7c49a3 100644 --- a/ports/boost-atomic/CONTROL +++ b/ports/boost-atomic/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-atomic
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/atomic
Description: Boost atomic module
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 634ad1bb4..e311b24f4 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/atomic
- REF boost-1.69.0
- SHA512 17fe0249f1ceb8d9f6d1f2426a1ea1987bed2a33301cc03debc584f2557e48252a4b1c399f5f71764ef07bdfe48acd9a36a692c59710b64e5656a54a0703427f
+ REF boost-1.70.0
+ SHA512 00a1fd7731705a3298a19c4a40795d8ab2147a4940e55257ad33e8b7181f9d9a90ebdc0c2bb4f95c1a06ace0a2a5d39762674c2cd6598205151890df3859b251
HEAD_REF master
)
diff --git a/ports/boost-beast/CONTROL b/ports/boost-beast/CONTROL index 1f7e1942f..7355df55b 100644 --- a/ports/boost-beast/CONTROL +++ b/ports/boost-beast/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-beast
-Version: 1.69.0
-Build-Depends: boost-align, boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Version: 1.70.0
+Build-Depends: boost-align, boost-asio, boost-assert, boost-bind, boost-config, boost-container, boost-core, boost-endian, boost-intrusive, boost-logic, boost-mp11, boost-optional, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/beast
Description: Boost beast module
diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index c5ce1a1c3..d65e4318e 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/beast
- REF boost-1.69.0
- SHA512 bb6e3763f610abc1fa621f03e8f3e82b4c8e8643bf41eba5353c65d8bf3e84b10161a108148459f1dd8786204d7a3783e0c00caf88233f977b3e3ce93d7f0495
+ REF boost-1.70.0
+ SHA512 7f0c36d80f26b47b902bf78e066dfa3b1fd5ef5e5088c00d2aabef16805531b993efa94a25d84e8d1321c41fc021d46da25cb3ffe49fa42ae67813af333f453d
HEAD_REF master
)
diff --git a/ports/boost-bimap/CONTROL b/ports/boost-bimap/CONTROL index 7f6bd2f0e..681ea87f2 100644 --- a/ports/boost-bimap/CONTROL +++ b/ports/boost-bimap/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-bimap
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-concept-check, boost-config, boost-container-hash, boost-functional, boost-iterator, boost-lambda, boost-mpl, boost-multi-index, boost-preprocessor, boost-property-map, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/bimap
Description: Boost bimap module
diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index a9dcaa467..40f618a8f 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/bimap
- REF boost-1.69.0
- SHA512 f6241910a5e94d10f9bc9b5c8dd2bd21c298145ff4eeff30e673e1bd421b962f07fd9c79b99952f896d11fa6874f5ecd64a8d060cf53ab1183735ae361879f40
+ REF boost-1.70.0
+ SHA512 9f6938bdbbd32a262cfd4c25b90930df6e0610aacff80a26b7a2caa38fdcaa309bdd7da0405e4529dfaf07314f887eb2b928db89aef1088fdbd7bd1da7bf5c0b
HEAD_REF master
)
diff --git a/ports/boost-bind/CONTROL b/ports/boost-bind/CONTROL index a80dc4c38..93418102f 100644 --- a/ports/boost-bind/CONTROL +++ b/ports/boost-bind/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-bind
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/bind
Description: Boost bind module
diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 4b4a6771a..5af3961be 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/bind
- REF boost-1.69.0
- SHA512 8445e5359d52cf71f0a818c507cfe4746e7966694691e6acaf7284855532245228bbfc3b26fb89d631e1a4d8de72d1a28e50ee60255c8955bef6a28a04b92105
+ REF boost-1.70.0
+ SHA512 951381fca83fe12382bb1388c9c9b4b8a6116300c55f46864550c5985c3f7b540f246601ddb57ed5b836075d942a999456d5f4557b28aa7fad83f82c0dc5573e
HEAD_REF master
)
diff --git a/ports/boost-build/CONTROL b/ports/boost-build/CONTROL index 5ecb3d9fe..ce5473df5 100644 --- a/ports/boost-build/CONTROL +++ b/ports/boost-build/CONTROL @@ -1,3 +1,4 @@ Source: boost-build
-Version: 1.69.0-1
+Version: 1.70.0-1
+Homepage: https://github.com/boostorg/build
Description: Boost.Build
diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 07822fd3f..77da81057 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -8,11 +8,13 @@ elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_N return()
endif()
+set(BOOST_VERSION 1.70.0)
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/build
- REF boost-1.69.0
- SHA512 e8d89e75c83a08bab29f52b5100fccf1d2ddf492a532ae4cb8121a5f49819aebb8157d1a1fd7d514bd8a0fe444e5ebb1103b10c8579d5c234ab81110d9c334a8
+ REF boost-${BOOST_VERSION}
+ SHA512 be4e410a9656313519e089977a24da8f633db2182985f5d60e07e489f9eac8c887e8cab7e3cbd13f2b747bc3d9dab2899f174be1eaac73cfd7895015fb6b9b58
HEAD_REF master
PATCHES
# Add the support of arm64-windows
@@ -20,15 +22,15 @@ vcpkg_from_github( )
vcpkg_download_distfile(ARCHIVE
- URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.69.0/LICENSE_1_0.txt"
+ URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt"
FILENAME "boost_LICENSE_1_0.txt"
SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
)
vcpkg_download_distfile(BOOSTCPP_ARCHIVE
- URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.69.0/boostcpp.jam"
- FILENAME "boost-1.69.0-boostcpp.jam"
- SHA512 1d05142f33b86a342674513cd5890b78601b0b3824540588f2c9e4c1fea43fadaa94f4a99495614445d3930861470fbfb8ad8c94b8bddf6a24ee65661a9bddc9
+ URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/boostcpp.jam"
+ FILENAME "boost-${BOOST_VERSION}-boostcpp.jam"
+ SHA512 7fac16c1f082821dd52cae39601f60bbdbd5ce043fbd19699da54c74fc5df1ed2ad6d3cefd3ae9a0a7697a2c34737f0c9e2b4bd3590c1f45364254875289cd17
)
file(INSTALL ${ARCHIVE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build RENAME copyright)
diff --git a/ports/boost-callable-traits/CONTROL b/ports/boost-callable-traits/CONTROL index 60083adf5..af030d66f 100644 --- a/ports/boost-callable-traits/CONTROL +++ b/ports/boost-callable-traits/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-callable-traits
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/callable_traits
Description: Boost callable_traits module
diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 985c900cf..8bc97f738 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/callable_traits
- REF boost-1.69.0
- SHA512 0bdff6650b996b640b5853c540dab0a22cb6da13182512bfc34608d9bbb8f99ecd01b018106f91b827e5c9c2a9a7c7373128c85f4b533f472c81efab4eef45eb
+ REF boost-1.70.0
+ SHA512 73742aa4094cef8f4b24833036f99449343dd6c572919db8fb464f76dc527d99a5a57e52bbfe6b20089041aa43ecb7a87ec528a7aea2fef5a8b15f6ced553769
HEAD_REF master
)
diff --git a/ports/boost-chrono/CONTROL b/ports/boost-chrono/CONTROL index 7c154c473..f2a630bb3 100644 --- a/ports/boost-chrono/CONTROL +++ b/ports/boost-chrono/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-chrono
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-move, boost-mpl, boost-predef, boost-ratio, boost-static-assert, boost-system, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/chrono
Description: Boost chrono module
diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 562f3ea1e..e2eb7a4ab 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/chrono
- REF boost-1.69.0
- SHA512 7de2282c65b4c25086f99602fcb4dc21b0470f327d1d8db530387754cd5710588ea196e0382b64df8c2160274d7d229ebf307d37cd7d0052b1beb182ac9dc641
+ REF boost-1.70.0
+ SHA512 a0498e5db8d3178479e08eb9b2b980447c5dc1b620ab45331fb42b1cdd94572feeb099498ac436f082fb850994e2f090123b8caffdec69e67cae23c94e8e6de9
HEAD_REF master
)
diff --git a/ports/boost-circular-buffer/CONTROL b/ports/boost-circular-buffer/CONTROL index e56de0eb5..aa6d71217 100644 --- a/ports/boost-circular-buffer/CONTROL +++ b/ports/boost-circular-buffer/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-circular-buffer
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-move, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/circular_buffer
Description: Boost circular_buffer module
diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index f8f815b2b..f42f7d115 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/circular_buffer
- REF boost-1.69.0
- SHA512 2340ef5d04dff2be8dc6aadd697dd11992c86fcf84da4ea48cac17992b85ebd8f11b26e3772d77110db1ea7b81076c5c29647e8c13a17bbe47063ea1b511f809
+ REF boost-1.70.0
+ SHA512 c4aef9b30ed93000c663acb7536df6d7269be4e3a0c431daa2f5a0397505bc487c90259b0a24bb0145bf9c07fdecd8fbaa53ceca589f39a3b29f087d07f98113
HEAD_REF master
)
diff --git a/ports/boost-compatibility/CONTROL b/ports/boost-compatibility/CONTROL index f59e7b652..12d325b06 100644 --- a/ports/boost-compatibility/CONTROL +++ b/ports/boost-compatibility/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-compatibility
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/compatibility
Description: Boost compatibility module
diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index f2c362ed4..41e268699 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/compatibility
- REF boost-1.69.0
- SHA512 2bac082f818b9138c529089751aea29d3848b90ee213ca58639667b3ffb8fa93235d4d5b3bc248f36dfa8fe79a30fc1f4628adc2637f09df1e0fac7b45e0a893
+ REF boost-1.70.0
+ SHA512 17f6b96eb29f95110f180209c27418a38be1fabe99dd0b50d206e4a628c42e87ffae343a8761a689145be15ae973721e7916a7326db8f45a5d0c8a0fb5639f6b
HEAD_REF master
)
diff --git a/ports/boost-compute/CONTROL b/ports/boost-compute/CONTROL index 858e9b4e3..04534face 100644 --- a/ports/boost-compute/CONTROL +++ b/ports/boost-compute/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-compute
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-algorithm, boost-array, boost-assert, boost-chrono, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-function-types, boost-fusion, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-preprocessor, boost-property-tree, boost-proto, boost-range, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-uuid, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/compute
Description: Boost compute module
diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index 43449f136..2b756df41 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/compute
- REF boost-1.69.0
- SHA512 885c91598fc5687e6b6054c49777713dc43843b755898700b6de519e115e1431cd9d11a533d30ad782412da0c2912995bea1a86bb6df7f45ee246cfabe86d452
+ REF boost-1.70.0
+ SHA512 d21c722340abd0f16c007060cac18b98be3d3056fb784c359203012f20d8ec1edf62bbe41e30b0129a1c478050d78fb34c1750c14ac7610f2bb63911006fd197
HEAD_REF master
)
diff --git a/ports/boost-concept-check/CONTROL b/ports/boost-concept-check/CONTROL index e50fd5877..ca012575d 100644 --- a/ports/boost-concept-check/CONTROL +++ b/ports/boost-concept-check/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-concept-check
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/concept_check
Description: Boost concept_check module
diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index a656e9806..f08d06864 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/concept_check
- REF boost-1.69.0
- SHA512 4a3c9833f8269d20486b1fb7e99a9203116f71ed8c6a4339abfe02982fbc3443e2d447e97a7a3915b3fa77db6ba66dc196dc249d3769b741421bb7377b58a061
+ REF boost-1.70.0
+ SHA512 5b495c9c6c76eac54a72e5f5cde41ac3957470b21d47abde4df8f74207b175dcaf104adf37603de9ef0cca7fba1ac702429af995371714eea0b9cdcc361f2f8e
HEAD_REF master
)
diff --git a/ports/boost-config/CONTROL b/ports/boost-config/CONTROL index db6e4af38..1d680a096 100644 --- a/ports/boost-config/CONTROL +++ b/ports/boost-config/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-config
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-compatibility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/config
Description: Boost config module
diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 362560350..5759efd79 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/config
- REF boost-1.69.0
- SHA512 c5c6fabbe17f42bbfd0efcb42697eaaf688ceeb6d3a5e16c15e9e60353d99c593eb9b9587c3514642fccab23a869f7235e2531f57ab4e06840e8013f808cf8d8
+ REF boost-1.70.0
+ SHA512 c9132011f506b3803f736bc0f7498eb297bb2af7a9643f235055aa5d133c6cbbe04f11c88296a956acb9864ea8a5ea58df329df3dce1e0763ff0451f9e487fb4
HEAD_REF master
)
diff --git a/ports/boost-container-hash/CONTROL b/ports/boost-container-hash/CONTROL index 4660d76cb..b2eb4a95d 100644 --- a/ports/boost-container-hash/CONTROL +++ b/ports/boost-container-hash/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-container-hash
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
Description: Boost container_hash module
diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index caf24b39a..16ae75279 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/container_hash
- REF boost-1.69.0
- SHA512 120a1b6d15344507ab3f81454e9c6059fd2fa3a16fc81b6b2a02c93ed5e4b8d1b180343726a38b44d60c25fcfd6427a2c3741c9e9cf18a26c878d4ad2b806b40
+ REF boost-1.70.0
+ SHA512 e08a01a0c4ede6b8e7be77c78e9a9c66680e7fc31ce64e3f43d2f535dfdcf6cce1d35cf7f0d120242bd749a7fd082d4b938c30e02438970be25613ee69b5baf1
HEAD_REF master
)
diff --git a/ports/boost-container/CONTROL b/ports/boost-container/CONTROL index 2e6613b0d..b96609d6a 100644 --- a/ports/boost-container/CONTROL +++ b/ports/boost-container/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-container
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-config, boost-container-hash, boost-core, boost-integer, boost-intrusive, boost-modular-build-helper, boost-move, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/container
Description: Boost container module
diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index dcf82dd8b..8e4d473e2 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/container
- REF boost-1.69.0
- SHA512 8acfa595a188870f1cfb30bf1600997300260d81f56b8a28de8ab12065e0206b91c27d1203aa2541261ea734a09084d205d197097dbacd4858a736db56c9280a
+ REF boost-1.70.0
+ SHA512 fd0fdf2c26c0dc6ac977c069584282ac1dc1a8b4dae3609766af1cd1f1587126e5ff7ad2feffeb6c20d0679c245679e6c963e202d4ab2f6a6c74721f2e52e0cf
HEAD_REF master
)
diff --git a/ports/boost-context/CONTROL b/ports/boost-context/CONTROL index fa0348e55..8e476df79 100644 --- a/ports/boost-context/CONTROL +++ b/ports/boost-context/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-context
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-integer, boost-modular-build-helper, boost-pool, boost-predef, boost-smart-ptr, boost-thread (!arm), boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/context
Description: Boost context module
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 78d5efa24..7c79f3bb4 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/context
- REF boost-1.69.0
- SHA512 9764013a43d0c5d73b52a6da625c24ffa36b164eddce52157593e75b9d810a1bff5364a73735e848804be82fc356ef13dd5d796f80e6491fb4c9c57797f0a89d
+ REF boost-1.70.0
+ SHA512 b180cc8e6fceb457495a9e4e8c6118bd9d32d11e8aa30c477efa6c58474d03573744348146c542c4436a80b7cbf1f4ffa73034f31aaa045f8a9fc020f299342e
HEAD_REF master
)
diff --git a/ports/boost-contract/CONTROL b/ports/boost-contract/CONTROL index 1667b1d72..7b03d05e2 100644 --- a/ports/boost-contract/CONTROL +++ b/ports/boost-contract/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-contract
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-any, boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-function-types, boost-modular-build-helper, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
Description: Boost contract module
diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 7a81ef146..8e034b901 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/contract
- REF boost-1.69.0
- SHA512 d1d0e8c2bb12a5176933e1848d7abdffee5ce58cb15ff73dbf24723cd436a632629023a28ce25fb4fd2d650b5fffd38cac700d5587f239a654a87b6a0c791755
+ REF boost-1.70.0
+ SHA512 867717f13da8df87330849eef5068538c5ea650f58ab9df581081480f8cf5ffe255b7503ac59a0b14d2063ddb9239bcfc72e02e0a66f86e77d7a2f32099afc34
HEAD_REF master
)
diff --git a/ports/boost-conversion/CONTROL b/ports/boost-conversion/CONTROL index b3a43bcba..194ae5347 100644 --- a/ports/boost-conversion/CONTROL +++ b/ports/boost-conversion/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-conversion
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-throw-exception, boost-typeof, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/conversion
Description: Boost conversion module
diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index e89c3a0e9..cda3c164b 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/conversion
- REF boost-1.69.0
- SHA512 19e8c50e317166595d0b11927e040994c13bda8cab91b2fbc33de5875ac8270fbc4cef43d11149906f4fdd081a46d5e6635793a825c1e4984ec186a03c5f4121
+ REF boost-1.70.0
+ SHA512 2d061273c85b9769e433184ff2b2a3ceaf3ff39e66fac62e34097f1a6288aa72d5801e34c93c8e80a3200bbd3129d70d73f656fc958b78694dea39799b42b287
HEAD_REF master
)
diff --git a/ports/boost-convert/CONTROL b/ports/boost-convert/CONTROL index 5bfa01743..a21fc8f53 100644 --- a/ports/boost-convert/CONTROL +++ b/ports/boost-convert/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-convert
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-function-types, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-parameter, boost-range, boost-spirit, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/convert
Description: Boost convert module
diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index b42f37b33..702206fc1 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/convert
- REF boost-1.69.0
- SHA512 2461fd507ddefbae59f2357cc5627d52826555913660a4c58910f8562815d0d0e41e7ad169075404ed72fe215d93850775c30f4a0335dc282868dd51f7e0b9be
+ REF boost-1.70.0
+ SHA512 0edc789070a74d7abf57170fddfc70f4b79b62720d771a650d148cefbf70b78e1a0a43a2fd85d5be94f4cb8452ec0ed33dfcbf0621a7980161de451576ab083e
HEAD_REF master
)
diff --git a/ports/boost-core/CONTROL b/ports/boost-core/CONTROL index 200efff69..af70d8a14 100644 --- a/ports/boost-core/CONTROL +++ b/ports/boost-core/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-core
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/core
Description: Boost core module
diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index be16b6b2a..df3b3e7f3 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/core
- REF boost-1.69.0
- SHA512 43851113e0202e8b0d1fc479fb6e87a75152577f4309796335e9d23b26b00631beaf7780fb7404f421e1239a7e1c449c3d1c3634f697c562927c1b623fbd0d76
+ REF boost-1.70.0
+ SHA512 955f788c7ec2a1988df261606da42915e42e321f200c9729f7b1aa503224b8fce4fb784c8693374d7a31a6a45f4082fe3b489853bee85a6ee06184f7fb898626
HEAD_REF master
)
diff --git a/ports/boost-coroutine/CONTROL b/ports/boost-coroutine/CONTROL index 7fad1876a..5b5db2bdc 100644 --- a/ports/boost-coroutine/CONTROL +++ b/ports/boost-coroutine/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-coroutine
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-config, boost-context (!uwp), boost-detail, boost-exception, boost-integer, boost-modular-build-helper, boost-move, boost-range, boost-system, boost-thread (!arm), boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/coroutine
Description: Boost coroutine module
diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 4ae5275a9..88326a6db 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/coroutine
- REF boost-1.69.0
- SHA512 12e8abb698d7b71fc39659e43386a7b33227065cb0ccc1f7c4ff972e0d75dca02e26306214a8aea613f4bd2f3741ca930bf412666312465d0b504cee68b27582
+ REF boost-1.70.0
+ SHA512 e63e92c1e6013ab79df4312ace30d5e9989ec30f10c4e97fe366b0f60b50675fa91cc323508e81065400a66d4931c1f5cba51287e6c2fca5567495ade1b94d46
HEAD_REF master
)
diff --git a/ports/boost-coroutine2/CONTROL b/ports/boost-coroutine2/CONTROL index 13eb90846..96706e78a 100644 --- a/ports/boost-coroutine2/CONTROL +++ b/ports/boost-coroutine2/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-coroutine2
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-context (!uwp), boost-detail, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/coroutine2
Description: Boost coroutine2 module
diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index 7fe2063d9..42e7601e4 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/coroutine2
- REF boost-1.69.0
- SHA512 278fdeedb5624d17a07ee4b9c1ea8864eb695042c19d59cd4cf519d89a9f33774bc2ee38b5e5c2eea18074abd23711d123549c0df414f65ecdb562256be5b3c3
+ REF boost-1.70.0
+ SHA512 8f087e33be6eeb1bea523abf871a6bb5252bcb0c40de3489d2713c8b242de97697e86fc2628fe0b0eefefef65307cdd0e0737ae7471fde083a2b09d7139f487c
HEAD_REF master
)
diff --git a/ports/boost-crc/CONTROL b/ports/boost-crc/CONTROL index 06b2b72c8..33536aafa 100644 --- a/ports/boost-crc/CONTROL +++ b/ports/boost-crc/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-crc
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-compatibility, boost-config, boost-integer, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/crc
Description: Boost crc module
diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 3ac1963a4..6528e2d59 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/crc
- REF boost-1.69.0
- SHA512 10cebe78edc8201bed71dd21fe3cab5e1cc7fe1bcb5a52be253f1ec33fabd7f9bb7e7c553785dd1752548c4b8ddd7262de83b84f476cafe8da8a71ac5a0e9e85
+ REF boost-1.70.0
+ SHA512 7318072d20d80b747991194477d78177345ce67b618d9dd8bbb6a5432673244c04717d5f41f3bf50daf18ff33d612225cd9109578c07019922609a6db4cccb3e
HEAD_REF master
)
diff --git a/ports/boost-date-time/CONTROL b/ports/boost-date-time/CONTROL index 8e8d74c82..2c9a8392f 100644 --- a/ports/boost-date-time/CONTROL +++ b/ports/boost-date-time/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-date-time
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-algorithm, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-integer, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-range, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/date_time
Description: Boost date_time module
diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 114d9255e..9a128b701 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/date_time
- REF boost-1.69.0
- SHA512 5e95ba32467b1431cd0d353f4bebdbf031d6ad6f18c3f462de5931a272b4448b628a68682ced538b11f28c1be0817378800d5e62764feb23736f7b5e96f33d1d
+ REF boost-1.70.0
+ SHA512 2ff8c459b3ec04fa6f57b8d94d052fbdc2b0c0774b064cbf681817a7dcc0239e1a6856e25674c9797668dcc2fab3b6f576a633286fcc8e5fe796d74c6f1a52a8
HEAD_REF master
)
diff --git a/ports/boost-detail/CONTROL b/ports/boost-detail/CONTROL index da02cc028..0f3166293 100644 --- a/ports/boost-detail/CONTROL +++ b/ports/boost-detail/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-detail
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-compatibility, boost-config, boost-preprocessor, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/detail
Description: Boost detail module
diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index f4cb94553..48c0a04d4 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/detail
- REF boost-1.69.0
- SHA512 f787d14e9d980b5f568320982952bdb122402d3a017d26e90a7552f3dfe4f4a8ffff12f6f7a83ba9434ae1affa6946016a549ae27df829fd323a7543e5f7a7ec
+ REF boost-1.70.0
+ SHA512 8cedb220dce3a4f6aaee13eacdd5c8246e707b724bd260d025b7ece9336dffaa645a3cf59f90ea02136a23126e9a93116485ad5d76e8b04d46e08f043c394018
HEAD_REF master
)
diff --git a/ports/boost-di/CONTROL b/ports/boost-di/CONTROL index 6243b1446..d7c9aea41 100644 --- a/ports/boost-di/CONTROL +++ b/ports/boost-di/CONTROL @@ -1,3 +1,4 @@ Source: boost-di Version: 1.1.0 -Description: C++14 Dependency Injection Library. +Homepage: https://github.com/boost-experimental/di +Description: C++14 Dependency Injection Library.
\ No newline at end of file diff --git a/ports/boost-disjoint-sets/CONTROL b/ports/boost-disjoint-sets/CONTROL index 800b96123..56df8c910 100644 --- a/ports/boost-disjoint-sets/CONTROL +++ b/ports/boost-disjoint-sets/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-disjoint-sets
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-graph, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/disjoint_sets
Description: Boost disjoint_sets module
diff --git a/ports/boost-disjoint-sets/portfile.cmake b/ports/boost-disjoint-sets/portfile.cmake index 5821422f1..68215afc8 100644 --- a/ports/boost-disjoint-sets/portfile.cmake +++ b/ports/boost-disjoint-sets/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/disjoint_sets
- REF boost-1.69.0
- SHA512 2d43ec3020249c232b35ce6ab6be541e4dbdddc4dbe9f0e2f92796e3200670df03c40651c0d7fe3f91f89b2524b0f023a4152e80d8b3ee7738ea5fa6880801e3
+ REF boost-1.70.0
+ SHA512 3d85e4f33491529dbc1082ab45d91b93e96d74253108c05f2d6542340c2cf9e4c817c6b9996d7de0e733f09e2e60eee038056db764e3e829662142f9dbe611ca
HEAD_REF master
)
diff --git a/ports/boost-dll/CONTROL b/ports/boost-dll/CONTROL index 6a06ccf7e..ae2ee519d 100644 --- a/ports/boost-dll/CONTROL +++ b/ports/boost-dll/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-dll
-Version: 1.69.0
-Build-Depends: boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-mpl, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.70.0
+Build-Depends: boost-assert, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-move, boost-mpl, boost-predef, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-throw-exception, boost-type-index, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/dll
Description: Boost dll module
diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index 875401da8..7d3765d6a 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/dll
- REF boost-1.69.0
- SHA512 b2948d2e7dc7899533a4ee073d6386166ccaf2fcb40feaa2a98e86f453cd58d74d7e75100cb0e85064ef11fe7caf065e165344463cbe3631333b4c8a3c6a8f50
+ REF boost-1.70.0
+ SHA512 607bcbb31cc4f630bd921a62dd57c35ace268f8eb048bc4460fde85cd399c04bc2f6880a3e868b5a5e24de91a3db04066b89e952740b1d9b2e4f4704555f8226
HEAD_REF master
)
diff --git a/ports/boost-dynamic-bitset/CONTROL b/ports/boost-dynamic-bitset/CONTROL index 95e899824..c7144e607 100644 --- a/ports/boost-dynamic-bitset/CONTROL +++ b/ports/boost-dynamic-bitset/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-dynamic-bitset
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-serialization, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/dynamic_bitset
Description: Boost dynamic_bitset module
diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 95798b5da..84296b749 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/dynamic_bitset
- REF boost-1.69.0
- SHA512 80e8b4f8f1fb0d5955e7f9ec92d6d39a214e0443d3a85b633dbc3abdb29d9b401ca1698097e12a25bbc94b6bd722a9cf7698ab4deb61a69ca8a2d84083765290
+ REF boost-1.70.0
+ SHA512 a646b54f6c85f0810da3b7346919c8b04b8e993773d42ba866909e932682989e9a31f23c590c84ec64e9fe19ff377586b8487822c9e48234643dc021e5d51c62
HEAD_REF master
)
diff --git a/ports/boost-endian/CONTROL b/ports/boost-endian/CONTROL index bc2baadc4..a57b0e7dc 100644 --- a/ports/boost-endian/CONTROL +++ b/ports/boost-endian/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-endian
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-predef, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/endian
Description: Boost endian module
diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 2fa8f985e..c99b81027 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/endian
- REF boost-1.69.0
- SHA512 13f96af6696b8ba353ab7c11dc2b26db50038b44c44287dd927b78b7ff55fa6fb37002980c878e850cfbe7b1d264722bd632db88404ac2df641b5094229e5e99
+ REF boost-1.70.0
+ SHA512 4cf95f9b28dc7936a26c1dbc73419c9a1caa770d4b3d8a613dfc77182c98cd34432c51a40a19f7720a2f061743c30b11f7df7193c5d194313901977c51a130b7
HEAD_REF master
)
diff --git a/ports/boost-exception/CONTROL b/ports/boost-exception/CONTROL index 737e7876a..89927da45 100644 --- a/ports/boost-exception/CONTROL +++ b/ports/boost-exception/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-exception
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-modular-build-helper, boost-smart-ptr, boost-tuple, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/exception
Description: Boost exception module
diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index bc699965c..c0c427674 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/exception
- REF boost-1.69.0
- SHA512 25dd5e1721e6c4668530a90c7bcd4d0adf7312562dbb62dc3a34ac88cb8d4206072dbd365608cd5fb1b3f5eab82686035bd4fba1f4e76b603b95e6d51b090e7d
+ REF boost-1.70.0
+ SHA512 6e8e40e9d5ee2478216f22279d00b835db3e0f43b8a5ff1e7bdbdab4479f86cff152f38a02171630e74ff6c61d58de7f6b9151496b18b9672be791dbd4b77e64
HEAD_REF master
)
diff --git a/ports/boost-fiber/CONTROL b/ports/boost-fiber/CONTROL index b25d07ded..2dc4f4e78 100644 --- a/ports/boost-fiber/CONTROL +++ b/ports/boost-fiber/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-fiber
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-algorithm, boost-assert, boost-build, boost-config, boost-context (!uwp), boost-core, boost-detail, boost-filesystem (!uwp), boost-format, boost-intrusive, boost-modular-build-helper, boost-predef, boost-smart-ptr, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/fiber
Description: Boost fiber module
diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index bf09a86c9..c327f0121 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/fiber
- REF boost-1.69.0
- SHA512 c76794d63742ce9b4cc2d0aea2bc806071ea8ce03bda3759ab225edfd2c92c30bb437027e8bb8d6e526406180589f1021f64611a001545a68be41c9a41714a47
+ REF boost-1.70.0
+ SHA512 d0f844808bf8644d3aad6db3cd44629c6355d6e7b028d99cecc104f97b5bcf765f4238c1c97f693af5693738813517a00c6e692840b24a2f59af376b4e7ac14f
HEAD_REF master
)
diff --git a/ports/boost-filesystem/CONTROL b/ports/boost-filesystem/CONTROL index 71630d843..954ab287a 100644 --- a/ports/boost-filesystem/CONTROL +++ b/ports/boost-filesystem/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-filesystem
-Version: 1.69.0
-Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-build, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-system, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/filesystem
Description: Boost filesystem module
diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 8fe22e891..af0af0517 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/filesystem
- REF boost-1.69.0
- SHA512 d278883d80245018a431fe5c169ecbfbf21380b3a1fb491a49aa74ad26a2db6336ef5309143ad19a08aacc9c647a264714823f415ef9fe3d4795f4b2d5cdcde9
+ REF boost-1.70.0
+ SHA512 c08d439dac95543f242528ee09e0bc71685988705c2bc4d98cb71f521b7966f86b6bec0a8c689a188b5e6a1d8629b2eeefdcc856cbe2fa407612548e26ee291c
HEAD_REF master
)
diff --git a/ports/boost-flyweight/CONTROL b/ports/boost-flyweight/CONTROL index 0f6e0c74a..61c80822f 100644 --- a/ports/boost-flyweight/CONTROL +++ b/ports/boost-flyweight/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-flyweight
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-functional, boost-interprocess, boost-mpl, boost-multi-index, boost-parameter, boost-preprocessor, boost-serialization, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/flyweight
Description: Boost flyweight module
diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 4d30fe96d..1f2d9a561 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/flyweight
- REF boost-1.69.0
- SHA512 85d2d5045c920bf46d0715805ecf3de13b59974b9a7add7baa66c9d726fdcb20e4e481a24724e52aaff050615d8c52742b764397512676065e654aeba50e81aa
+ REF boost-1.70.0
+ SHA512 5c8349be1c4c041362a9fb5d2c9da72aa52f2c36fdd88025753f042e6a37cce5818f5acbff4b8727e0997614945f9f9d6147241b52e7df2d2b308d0551da6cf6
HEAD_REF master
)
diff --git a/ports/boost-foreach/CONTROL b/ports/boost-foreach/CONTROL index 4acd878b4..3574b53c8 100644 --- a/ports/boost-foreach/CONTROL +++ b/ports/boost-foreach/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-foreach
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-detail, boost-iterator, boost-mpl, boost-range, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/foreach
Description: Boost foreach module
diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index e5379ea48..b5a420c42 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/foreach
- REF boost-1.69.0
- SHA512 fc7f18b8fbc4bbbe15c32ac8d75b8a783f4a24ae7e90371b57c3ac1571486d0c8ceae88ac943e8192fae5a8ee8e6ec6b59b17c295a4855762f148269a16d087d
+ REF boost-1.70.0
+ SHA512 c63f427066e8f964c58a3e721a037346afd62a4df6c01fd76ebce9fac5634087ac80b06ed8dc70171be51380d7a2fe65727fdcf5fb1bd993e005ae4689fe0bdd
HEAD_REF master
)
diff --git a/ports/boost-format/CONTROL b/ports/boost-format/CONTROL index 0b2637ef5..689d74729 100644 --- a/ports/boost-format/CONTROL +++ b/ports/boost-format/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-format
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-optional, boost-smart-ptr, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/format
Description: Boost format module
diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 783702c4f..fb901824e 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/format
- REF boost-1.69.0
- SHA512 094cdc1dee2020b20c78f10b1478f820948ca31c0edb258c8fc38b21b8fcdee3648eba50d536805ca19536b83e54516160e43895e44ba5403f7e7c4b5dc75d90
+ REF boost-1.70.0
+ SHA512 a36cc172fec72b5fd989d6e11d8f2f80f93138a99b03a7b1443663ff81ce2f302dd50f25e0308229de9dd6f59b8510151f27255cdafcac152b185c7174d11a86
HEAD_REF master
)
diff --git a/ports/boost-function-types/CONTROL b/ports/boost-function-types/CONTROL index cdfde4442..b71fffba5 100644 --- a/ports/boost-function-types/CONTROL +++ b/ports/boost-function-types/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-function-types
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-detail, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/function_types
Description: Boost function_types module
diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index 580bb7496..f9f380a20 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/function_types
- REF boost-1.69.0
- SHA512 642f95aa23254edfc650dc2eb729eb541f507de2ad8d20091e8bde35f4e471b04ab6a8140cd8bf891866e74ce739e3821fddae653a4cd11a2066d1d93061b253
+ REF boost-1.70.0
+ SHA512 6022a7045d39b18b76bd6ca57dd7e960d1242321a2c1adb5f9c7215e58ce472adfe2be40a4f3bd2f9d28e2fad30ad75ee896896dff15e5cfa446c085d9a5c9e2
HEAD_REF master
)
diff --git a/ports/boost-function/CONTROL b/ports/boost-function/CONTROL index a5d118abb..310e9b497 100644 --- a/ports/boost-function/CONTROL +++ b/ports/boost-function/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-function
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-integer, boost-preprocessor, boost-throw-exception, boost-type-index, boost-typeof, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/function
Description: Boost function module
diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index b5c19fc38..cc943013e 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/function
- REF boost-1.69.0
- SHA512 58d764e454aacaffb0baf299483be98e3eacdbd8a4e209a6b91727a18c9839e561da5316b8238b397c62a6d9e49631226239d9d3ba20e77b9b1ce648ce3bf940
+ REF boost-1.70.0
+ SHA512 d655792b1262ef039348b09328614acd954685726dcaeccf564ca0a4c36f25f0d764dfc2544cf2c08977d516610db8fdf22671d16881187163226953da22e654
HEAD_REF master
)
diff --git a/ports/boost-functional/CONTROL b/ports/boost-functional/CONTROL index 912eec3a2..138c8c6e3 100644 --- a/ports/boost-functional/CONTROL +++ b/ports/boost-functional/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-functional
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-iterator, boost-mpl, boost-preprocessor, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/functional
Description: Boost functional module
diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 88956532b..9dbbb6b38 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/functional
- REF boost-1.69.0
- SHA512 08d4efb9732a1d3fcd91fcbf90cfbac0a4db80b50101c5466a5ade3bee90c7a5dd42375061fd302d9aea1e2f8d9f9b7986f2ed05f3f224c617741bd76776ceec
+ REF boost-1.70.0
+ SHA512 ca32f1e0292835ff059e907e2392b059cdb85e1c1b7b7850f9e490d59ecd4d95d7cc2f6ebd548a167018b179812045104692e638334d35243da26117f8ccceb7
HEAD_REF master
)
diff --git a/ports/boost-fusion/CONTROL b/ports/boost-fusion/CONTROL index c648924a2..28305e082 100644 --- a/ports/boost-fusion/CONTROL +++ b/ports/boost-fusion/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-fusion
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-static-assert, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/fusion
Description: Boost fusion module
diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 0d6f6a962..23844aee7 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/fusion
- REF boost-1.69.0
- SHA512 fdf2dac6416f46c5d1dae6401bd224a55d693cfb7aee72f189d7cf7bc8103df2b68123f8d17e9a8081eacb83fa334e7a031098bd8626e77ef1cfc15617e821ad
+ REF boost-1.70.0
+ SHA512 709d374a225b0a92ccf52e2fcad02a182bd49bce372b1f57857b9b9409a2ee83c1f6f97f8b9e24ba5f1b22fc58f9a0895d56e83c2af772136216d2cdac237e48
HEAD_REF master
)
diff --git a/ports/boost-geometry/CONTROL b/ports/boost-geometry/CONTROL index 4d1326f47..a616793a9 100644 --- a/ports/boost-geometry/CONTROL +++ b/ports/boost-geometry/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-geometry
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-algorithm, boost-array, boost-assert, boost-concept-check, boost-config, boost-container, boost-core, boost-detail, boost-function-types, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-move, boost-mpl, boost-multiprecision, boost-numeric-conversion, boost-polygon, boost-qvm, boost-range, boost-rational, boost-serialization, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-throw-exception, boost-tokenizer, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/geometry
Description: Boost geometry module
diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 9e4211f34..dbe2412eb 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/geometry
- REF boost-1.69.0
- SHA512 a79a377497bb8270282032e77c62ba3afb25c2201dfdb26de37373141e1a4fa4edb3da4b2de22a1fccb1cbcb52c164ce98c8bb2b30b097509a38e062df85d3d6
+ REF boost-1.70.0
+ SHA512 78fd4f1f6f5956872c89f9b2d4cf20f7531ea55e50ad2dc33ee518e0f24a2e9a12e525ebbbb18ee884756e25cebb19307f199ddf1318dd4a07655e46e15d68dc
HEAD_REF master
)
diff --git a/ports/boost-gil/CONTROL b/ports/boost-gil/CONTROL index f3ad97c66..45c378a72 100644 --- a/ports/boost-gil/CONTROL +++ b/ports/boost-gil/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-gil
-Version: 1.69.0
-Build-Depends: boost-bind, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-function, boost-integer, boost-iterator, boost-lambda, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-concept-check, boost-config, boost-core, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/gil
Description: Boost gil module
diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index dcf0da0cd..8957f3e6f 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/gil
- REF boost-1.69.0
- SHA512 2875d2e41ce429c1e2b8175efcda75319383431887c30c07da0051cf7816e16ce0db13093bc4fff89d4d2f2f0224ebb6d3c8a00eb38c130f9234046fd52fe006
+ REF boost-1.70.0
+ SHA512 2b0149b690b9ae45e9e85fb1441b9d20f6f1238a710393f8acbda6cefb12483568f612eeaf5597d187edadf459d99bb8417c807b35360fb3596d107de73482cb
HEAD_REF master
)
diff --git a/ports/boost-graph-parallel/CONTROL b/ports/boost-graph-parallel/CONTROL index 861b1e550..f78581dc6 100644 --- a/ports/boost-graph-parallel/CONTROL +++ b/ports/boost-graph-parallel/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-graph-parallel
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-detail, boost-dynamic-bitset, boost-filesystem (!uwp), boost-foreach, boost-function, boost-graph, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-optional, boost-property-map, boost-random, boost-serialization, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/graph_parallel
Description: Boost graph_parallel module
diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 195508e2f..10899ea81 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/graph_parallel
- REF boost-1.69.0
- SHA512 4a475e105cb6c310c9edc59a43a272635af48c3b7fcc7c1b8f5d9f2f921f64a9a4e50dbc558a7f8d07038fd9f6af39b152a7997c9dc0c9094efdb11ff5ab9114
+ REF boost-1.70.0
+ SHA512 31331fa45061c87061137c2b1bdcce60e0bf2de93d292a7598135eb7b1bdadb8b46be8ac0d89c583b004d2a543f6a06765eafea3875a60b0b38e2986e53adfd9
HEAD_REF master
)
diff --git a/ports/boost-graph/CONTROL b/ports/boost-graph/CONTROL index b6df893ab..14d3555ad 100644 --- a/ports/boost-graph/CONTROL +++ b/ports/boost-graph/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-graph
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-algorithm, boost-any, boost-array, boost-assert, boost-bimap, boost-bind, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-preprocessor, boost-property-map, boost-property-tree, boost-random, boost-range, boost-regex, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-test (!uwp), boost-throw-exception, boost-tti, boost-tuple, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers, boost-xpressive
+Homepage: https://github.com/boostorg/graph
Description: Boost graph module
diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index fcbfc07de..9d62779d4 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/graph
- REF boost-1.69.0
- SHA512 9e8a165d87c100e0b10ec0f1a88c29fe35c6056163a9c657b9a02a064199bb511a17b03720204e37b0651468690c5bb704ef28778ef718e8593930375e9e4a2e
+ REF boost-1.70.0
+ SHA512 51f0cfed08ad19d1f4782ffeaa9e415f1b25fd49d89429105d45a2f2ac72314b12c4fd37793e9453c422e005c9c6159257313a3334df445f8e7fb4129822b73a
HEAD_REF master
)
diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL index ef0cff420..26acfb0c1 100644 --- a/ports/boost-hana/CONTROL +++ b/ports/boost-hana/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-hana
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/hana
Description: Boost hana module
diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index ac7e385a3..20b299ce8 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/hana
- REF boost-1.69.0
- SHA512 d997bad499b654ccab90fa30114fa99c2504e06d61151bf41250f9e606808bc0dfb11b00a563de485e830aed7867b6968541547e0e9c1a0795ae4a09bdba0283
+ REF boost-1.70.0
+ SHA512 0a927fe46988a7f8ebe8a799437009349270244206f3f146fa33f37e081fba34f431dfce3b5a07fd1e7f77050f11c45e60277f4555fdc8004251b603eb88fa17
HEAD_REF master
)
diff --git a/ports/boost-heap/CONTROL b/ports/boost-heap/CONTROL index 1f7e4d7a4..f0865f265 100644 --- a/ports/boost-heap/CONTROL +++ b/ports/boost-heap/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-heap
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-integer, boost-intrusive, boost-iterator, boost-parameter, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/heap
Description: Boost heap module
diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 4ba500922..d4165de94 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/heap
- REF boost-1.69.0
- SHA512 331a8ccfb5d41f3881ada825162a6d1ddd33e161edbd5cece4d65844316a5280e9ba1932efa43a60d7c3c0f538cfde5941060183c09382f58955604e7e3b909e
+ REF boost-1.70.0
+ SHA512 5f264465ab572ccd804c1209948133033f8379bea549d671a10b8e5b9db74bf92c7c580f11b689bd553a5a252854e12179c9daf00d890ff37a913d0cba463806
HEAD_REF master
)
diff --git a/ports/boost-histogram/CONTROL b/ports/boost-histogram/CONTROL new file mode 100644 index 000000000..a57571811 --- /dev/null +++ b/ports/boost-histogram/CONTROL @@ -0,0 +1,5 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-histogram
+Version: 1.70.0
+Build-Depends: boost-assert, boost-callable-traits, boost-config, boost-core, boost-integer, boost-iterator, boost-mp11, boost-serialization, boost-throw-exception, boost-variant, boost-vcpkg-helpers
+Description: Boost histogram module
diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake new file mode 100644 index 000000000..692adb096 --- /dev/null +++ b/ports/boost-histogram/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO boostorg/histogram
+ REF boost-1.70.0
+ SHA512 0eb1b9c64de27e0364c965710208d85ce2e19c009d88c4969a53f11dfb774c38bcfe1ed48bdc896e6e695bb536879e0ef1ce3ed2c7e72e15c3e480c7b625623f
+ HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-hof/CONTROL b/ports/boost-hof/CONTROL index f2cf84019..02262aaf9 100644 --- a/ports/boost-hof/CONTROL +++ b/ports/boost-hof/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-hof
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-vcpkg-helpers
Description: Boost hof module
diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index 358e67eb4..acf7acbc8 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/hof
- REF boost-1.69.0
- SHA512 a49e800a59a3c3733aa647676899bd935c7623d18e6213b949def6ed2aff5cea240a503eb4a1cc2446fd3c7ef01f0d03f546cf4e49b16d9dced3530797670924
+ REF boost-1.70.0
+ SHA512 93a0be0e6b435ca99e606098add9e784ce46925d352a35d9d928070f4deccf1091196fda16627c73f6eb008ff86996917346b83813dee6e94c8cd3927f5c7233
HEAD_REF master
)
diff --git a/ports/boost-icl/CONTROL b/ports/boost-icl/CONTROL index e723346ac..09e77e744 100644 --- a/ports/boost-icl/CONTROL +++ b/ports/boost-icl/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-icl
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-concept-check, boost-config, boost-container, boost-date-time, boost-detail, boost-iterator, boost-move, boost-mpl, boost-range, boost-rational, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/icl
Description: Boost icl module
diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index cf33c8ff9..f8adcccae 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/icl
- REF boost-1.69.0
- SHA512 520780eea6e2c7e0f9b81b899684d44655b95742fc4c3eaf812da527ff0dac607d760ab03bdeaeb2a963162651ed4a93a21c89101f957d0a959d3b88582623a1
+ REF boost-1.70.0
+ SHA512 440d2c657f0b3ff5c2755944e8eef0e068b16e84416fd7e3552dd976916b875a8cd73fae7ba205812593415a684d80791f86c7e262f3c5e3aa56711cff579722
HEAD_REF master
)
diff --git a/ports/boost-integer/CONTROL b/ports/boost-integer/CONTROL index 85c1a888b..72fe9d83f 100644 --- a/ports/boost-integer/CONTROL +++ b/ports/boost-integer/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-integer
-Version: 1.69.0
-Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-compatibility, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/integer
Description: Boost integer module
diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 36c15e9f2..4edb497ee 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/integer
- REF boost-1.69.0
- SHA512 69bb40592bdf3018facb083e9a9df12093f04e6f024526e39646cb3f4cc1ba5cf8468fd73a424050fc3b93046961fd3c83bb92e38e9f14b17324501ddec63115
+ REF boost-1.70.0
+ SHA512 914556323d480be24b9f59b3596702510d1188584eed70bc734e14ca3999a77d4119fc30eafe95548a99fc657467500193e250907f5dad5d05692d7c52607c12
HEAD_REF master
)
diff --git a/ports/boost-interprocess/CONTROL b/ports/boost-interprocess/CONTROL index 566a7dbe2..d1aebd1e0 100644 --- a/ports/boost-interprocess/CONTROL +++ b/ports/boost-interprocess/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-interprocess
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-integer, boost-intrusive, boost-move, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/interprocess
Description: Boost interprocess module
diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 3dd4adf4d..dd50bbf7b 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/interprocess
- REF boost-1.69.0
- SHA512 1bad3bb5e9fa59c48607ea2d668b61fdc15d60ab0e9f6cd04d1fcd972932b2466e94203062a65142b1b810e26b0cb59fd0890aaa4b764ac03d16ab3c95454d73
+ REF boost-1.70.0
+ SHA512 1f496d61039a6cb9084a8bea1e70538fe36b81a76a7241de5e96735d98287ee82755593c1c07201b5b14cd70b515b47e134515864bf50f075cb76f669b0b31d3
HEAD_REF master
)
diff --git a/ports/boost-interval/CONTROL b/ports/boost-interval/CONTROL index 82c37ae68..0c74b3e49 100644 --- a/ports/boost-interval/CONTROL +++ b/ports/boost-interval/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-interval
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-compatibility, boost-config, boost-logic, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/interval
Description: Boost interval module
diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 7d2d747c7..c1e5a4a29 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/interval
- REF boost-1.69.0
- SHA512 203e19a3c87fa50b22fe0c194f7774fc7dcf7ed7cd21add4bad8cdd1251783a7b173e1100cf33397d69aa3636a4dc4f2341f4a7dd8ac8c7c7f0781e9d48e1001
+ REF boost-1.70.0
+ SHA512 235bc027737963b9399c02b1ea5bc4e2024e439837f52f0d729c43df33c0202155ae1311ed114a7796ac24a5311f5c8f70deabc0a1cb8712c6bd02972bcfb974
HEAD_REF master
)
diff --git a/ports/boost-intrusive/CONTROL b/ports/boost-intrusive/CONTROL index 0bde2258f..18a831adc 100644 --- a/ports/boost-intrusive/CONTROL +++ b/ports/boost-intrusive/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-intrusive
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-container-hash, boost-core, boost-integer, boost-move, boost-static-assert, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/intrusive
Description: Boost intrusive module
diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 6d358b98f..071df857a 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/intrusive
- REF boost-1.69.0
- SHA512 1f89c9d217934db8d5a3aa169a21deed59d0f50b49ac58258bbc1f8c539df7a03d6cac0cd8d1668e73747153599f24cac87c683b12e32d9cc5f7fda438ad1d66
+ REF boost-1.70.0
+ SHA512 6f8b68b6fbb3fb400d85b7525b0bd562b27760760d1f5057b59c0e208940de3da72ba61d98ea449851af2dc3296597a84a011c3087174d955832de24716cbd6c
HEAD_REF master
)
diff --git a/ports/boost-io/CONTROL b/ports/boost-io/CONTROL index c5b043db0..aa633c00b 100644 --- a/ports/boost-io/CONTROL +++ b/ports/boost-io/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-io
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-detail, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/io
Description: Boost io module
diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index e2b759b91..ca85bb2d6 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/io
- REF boost-1.69.0
- SHA512 d00c93d23edd21042888bd2abee97eef1a16a25d3621a66273fe10ae56c90381b3b5c94e1739afd2a4b829606f6dd16513bedf450f2d0109bb27108443dfab3f
+ REF boost-1.70.0
+ SHA512 9d879f365664b36a8d8574f9f305ebb44c2742975192565f67f37258b6597fd6a13aaa33727c078501ba6373405a53c8374fe800b0b9169bc92eee97b0947a91
HEAD_REF master
)
diff --git a/ports/boost-iostreams/CMakeLists.txt b/ports/boost-iostreams/CMakeLists.txt index 454e74845..582377d4c 100644 --- a/ports/boost-iostreams/CMakeLists.txt +++ b/ports/boost-iostreams/CMakeLists.txt @@ -30,7 +30,7 @@ find_package(LibLZMA REQUIRED) target_include_directories(boost_iostreams PRIVATE ${LIBLZMA_INCLUDE_DIRS})
target_link_libraries(boost_iostreams PRIVATE ${LIBLZMA_LIBRARIES})
-find_library(ZSTD_LIBRARY NAMES zstdd zstd_staticd zstd zstd_static)
+find_library(ZSTD_LIBRARY NAMES zstdd zstd_staticd zstd zstd_static NAMES_PER_DIR)
target_link_libraries(boost_iostreams PRIVATE ${ZSTD_LIBRARY})
install(TARGETS boost_iostreams
diff --git a/ports/boost-iostreams/CONTROL b/ports/boost-iostreams/CONTROL index c8763146c..e1dafa33b 100644 --- a/ports/boost-iostreams/CONTROL +++ b/ports/boost-iostreams/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-iostreams
-Version: 1.69.0-3
+Version: 1.70.0-1
Build-Depends: boost-assert, boost-bind, boost-build, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, bzip2, liblzma, zlib, zstd
+Homepage: https://github.com/boostorg/iostreams
Description: Boost iostreams module
diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index d15007e70..6c9e41ace 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -5,14 +5,14 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/iostreams
- REF boost-1.69.0
- SHA512 263d06f2533a345eb4fe3926742c6606b486d9f7d024a001f00b09592201ee987854036174b44c39c6d9a47b52262a96f9a8ebf2af215ef217fa11aa1209fe86
+ REF boost-1.70.0
+ SHA512 0b0d3b5408d389783d6538c6ed41d615dd0eda1a5c023ed490308b010ccdb34b34dfbb934caa9df5417168570b6d2963d95b0321ab9378dc43c8dc6d89aecf89
HEAD_REF master
PATCHES Removeseekpos.patch
)
vcpkg_download_distfile(LICENSE
- URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.67.0/LICENSE_1_0.txt"
+ URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.70.0/LICENSE_1_0.txt"
FILENAME "boost_LICENSE_1_0.txt"
SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
)
diff --git a/ports/boost-iterator/CONTROL b/ports/boost-iterator/CONTROL index 4d72f30c5..c13a8fdb9 100644 --- a/ports/boost-iterator/CONTROL +++ b/ports/boost-iterator/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-iterator
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-conversion, boost-core, boost-detail, boost-function-types, boost-fusion, boost-mpl, boost-optional, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/iterator
Description: Boost iterator module
diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index 05cdb6957..bcf1b97d4 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/iterator
- REF boost-1.69.0
- SHA512 7f5fb06fdc48feb16eab33c6726713bc45fd4ed73598ffc55ba30a2cdd46ebc5d5fe858c0a2d93a348a0d3397891d8c33e6e2a5fce70aeca1d3be6586c269271
+ REF boost-1.70.0
+ SHA512 ef6b8ace53b73874efb80ba690bce03a13e86bb081282726de20a83efd5f2c58677f2c01f64a4733d81653e776074ef1a92ec67161aa5ba8ff0f3645b6df9fea
HEAD_REF master
)
diff --git a/ports/boost-lambda/CONTROL b/ports/boost-lambda/CONTROL index 460510402..645334323 100644 --- a/ports/boost-lambda/CONTROL +++ b/ports/boost-lambda/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-lambda
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-bind, boost-config, boost-detail, boost-mpl, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/lambda
Description: Boost lambda module
diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index d21189764..d9ba5ff5b 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/lambda
- REF boost-1.69.0
- SHA512 6de7a65898b08ced82dc6ff0662d1373cedaa53f4aadb7a2c47f611fd67735ed8b88d539829047ce059c27404d33b119dea116661c0124a3445efa426da88f56
+ REF boost-1.70.0
+ SHA512 165b91102f0e344e4b3c58a6b1ead403613aaff9262d85fd8286640977aced9a9f1814e7cd8cd609769f6a15333aeb40b2aaa0705c2746e19b107283792a9e84
HEAD_REF master
)
diff --git a/ports/boost-lexical-cast/CONTROL b/ports/boost-lexical-cast/CONTROL index 10a4c38de..9ca38af91 100644 --- a/ports/boost-lexical-cast/CONTROL +++ b/ports/boost-lexical-cast/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-lexical-cast
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-compatibility, boost-config, boost-container, boost-core, boost-detail, boost-integer, boost-numeric-conversion, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/lexical_cast
Description: Boost lexical_cast module
diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 2b975b3df..f203f29fd 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/lexical_cast
- REF boost-1.69.0
- SHA512 3cb8d3a300656b550d22959552e512369239a72336310678c13277f6f94fe29725c1645fdac4a0ff6035a2728e30baa3bd97e2e412d910eda2f882eb263fe3ed
+ REF boost-1.70.0
+ SHA512 20ff9790aa02177bb693a2c1bfd588725150a47cacb2d1048121982a6a2702e6dee30dcb3b4b3ae9c1dca269d144a08a085b0e229a9e2fbf0f7ae9b8ef25d31a
HEAD_REF master
)
diff --git a/ports/boost-local-function/CONTROL b/ports/boost-local-function/CONTROL index 4ee73b1a1..b00904108 100644 --- a/ports/boost-local-function/CONTROL +++ b/ports/boost-local-function/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-local-function
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-mpl, boost-preprocessor, boost-scope-exit, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/local_function
Description: Boost local_function module
diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index b6c2696a9..d2b504817 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/local_function
- REF boost-1.69.0
- SHA512 9bd3869a6abcaa0366adcb093dc13447b9402d4907b9df1433b74cee69651393a843e88ab16eb38f71c4549adef139796d43a55c28868b89415466f82e013ec3
+ REF boost-1.70.0
+ SHA512 7debd9d083fedd8446e98565bcc2fcab5091ba931166030143abef2351918f8a46a83a004b28e5ab4b413101052036424ec82d7b99428bc0e07660722e2c50c4
HEAD_REF master
)
diff --git a/ports/boost-locale/CONTROL b/ports/boost-locale/CONTROL index bf6d39521..d2b5a4e5a 100644 --- a/ports/boost-locale/CONTROL +++ b/ports/boost-locale/CONTROL @@ -1,7 +1,8 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-locale
-Version: 1.69.0-1
-Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
+Version: 1.70.0-2
+Build-Depends: boost-assert, boost-build, boost-config, boost-function, boost-integer, boost-iterator, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-vcpkg-helpers, libiconv (!uwp&!windows)
+Homepage: https://github.com/boostorg/locale
Description: Boost locale module
Feature: icu
diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 794c4e507..8643ce7ef 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/locale
- REF boost-1.69.0
- SHA512 64f738c10f35627a0949e5fa37743374f6d6644c05372d5b019468fc0273e13c024068462961376a663168ee29e7abb2c9c9c07078fc5797bb93e0b15baef2be
+ REF boost-1.70.0
+ SHA512 38ae2619d6b63239930e04f986a2bc06bd3c5ab6e13d7825c2b6eb29eb9eb2f52d74546774b9eb0ba3a4e68a4d404908386794282c2f467e8b01baea8f24fb42
HEAD_REF master
)
diff --git a/ports/boost-lockfree/CONTROL b/ports/boost-lockfree/CONTROL index f389e1ced..c7346cf6d 100644 --- a/ports/boost-lockfree/CONTROL +++ b/ports/boost-lockfree/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-lockfree
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-align, boost-array, boost-assert, boost-atomic, boost-config, boost-core, boost-integer, boost-mpl, boost-parameter, boost-predef, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/lockfree
Description: Boost lockfree module
diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index e3800b3ad..99330838f 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/lockfree
- REF boost-1.69.0
- SHA512 e0ea8c20973512d173bb1ef15c5e8b7f946b346ebcc2040283945d0db663a8afd61b854290670cc3d281be516c787af7eb2dbc310b20aaca610ba38888062eef
+ REF boost-1.70.0
+ SHA512 565539cffb0b688b02cb86b750fb9854e0d0f7a34c5dca859d5965ccee8512c5e6db493e8f7bcdf3c58b3ec2730852ad79089e7717183f358b07c0c743186c5f
HEAD_REF master
)
diff --git a/ports/boost-log/CONTROL b/ports/boost-log/CONTROL index 57dd3bb14..bb1ce3954 100644 --- a/ports/boost-log/CONTROL +++ b/ports/boost-log/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-log
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-align, boost-array, boost-asio, boost-assert, boost-atomic, boost-bind, boost-build, boost-compatibility, boost-config, boost-container, boost-core, boost-date-time, boost-detail, boost-exception, boost-filesystem (!uwp), boost-function-types, boost-fusion, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-parameter, boost-phoenix, boost-predef, boost-preprocessor, boost-property-tree, boost-proto, boost-random, boost-range, boost-regex, boost-smart-ptr, boost-spirit, boost-static-assert, boost-system, boost-thread (!arm), boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi, boost-xpressive
+Homepage: https://github.com/boostorg/log
Description: Boost log module
diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index 1e52fe3cc..968508e9e 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/log
- REF boost-1.69.0
- SHA512 d6ce7f8cc1ce2aac89adf920131b02197f37ced2d0f059a9353dc21770e34c539bbf771208f6ed293039cddb363b948b6ad4956f2819ed49478537a9305dba54
+ REF boost-1.70.0
+ SHA512 6f1b2a7692ece60abf94cdc340cc2b5b2a6c4ebeb80c4092b7846a7670e19db174f7c0df02640469e07e916b5d37448c73c73bcb14bb1632c26204a0a1274e1a
HEAD_REF master
)
diff --git a/ports/boost-logic/CONTROL b/ports/boost-logic/CONTROL index b6797de7b..7d6f02fbb 100644 --- a/ports/boost-logic/CONTROL +++ b/ports/boost-logic/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-logic
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-detail, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/logic
Description: Boost logic module
diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index b16b1817c..41fb1432b 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/logic
- REF boost-1.69.0
- SHA512 521144c4095b73fec427b8d424e8632de2795c9b34c5dd928499f2958a72d84f4ddaf20aa1a615ff1537506c7e088a45a1e4a7e17a9db9ea309309657e83b9c4
+ REF boost-1.70.0
+ SHA512 6cf4e2fa0c63de2c226a2f57ed57d07ab73cc359ebf23711b636badb9a6924992ea9edc0f9bfeefd15531ca2d06bdb3667b49bcc2f9deec64af6eafd52e944d5
HEAD_REF master
)
diff --git a/ports/boost-math/CONTROL b/ports/boost-math/CONTROL index 244fc4e99..a1ddd7c94 100644 --- a/ports/boost-math/CONTROL +++ b/ports/boost-math/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-math
-Version: 1.69.0
-Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-array, boost-assert, boost-atomic, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-integer, boost-lambda, boost-lexical-cast, boost-modular-build-helper, boost-mpl, boost-multiprecision, boost-predef, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/math
Description: Boost math module
diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index f4adc4d66..8938bfe9f 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/math
- REF boost-1.69.0
- SHA512 9aedd1d8e875d2c5ddd3e7feaeeeaf0524ee7111a26634559548f33f99d190ba33623951c781271c600880dbe8cf36d4b7f4c2212a6ec2c3804d488dec61c642
+ REF boost-1.70.0
+ SHA512 5573dc445196383ddb622514b5ea645076e1b2b94165d885c7c8924fc5d469d5f1c030817b36d9e7be78b47785a69bbcdac2da8f88817f1cd33ff47ded33dc70
HEAD_REF master
)
diff --git a/ports/boost-metaparse/CONTROL b/ports/boost-metaparse/CONTROL index e5b51a0ff..d5fd14428 100644 --- a/ports/boost-metaparse/CONTROL +++ b/ports/boost-metaparse/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-metaparse
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-mpl, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/metaparse
Description: Boost metaparse module
diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 15e02b1a1..13274cdde 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/metaparse
- REF boost-1.69.0
- SHA512 f2720f51ecaa67a61f43eac0112fad40f67ab3c6fef431adb012f644063a10c9870b85f3accf35b09bf163cea59715e25e06cb93d0ba6c9769c44cebc3205b68
+ REF boost-1.70.0
+ SHA512 dd8883843be1a6e3dc8368b13081fc3451de0ed85985cf752858d80aa62e0846b4687c16a6aa1b6dc1e5e30d0603168c48197f70f031cf21586ba729352f0f09
HEAD_REF master
)
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index df109c57e..cd5f46115 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -158,9 +158,12 @@ add_custom_target(boost ALL threading=multi
threadapi=pthread
debug-symbols=on
+
+ stage
WORKING_DIRECTORY ${SOURCE_PATH}/build
)
+set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib)
install(
- CODE "file(GLOB LIBS ${CMAKE_CURRENT_BINARY_DIR}/boost/build/*/*.a)\nif(LIBS)\nfile(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\")\nendif()"
+ CODE "file(GLOB LIBS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*)\nif(LIBS)\nfile(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\")\nendif()"
)
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 59744faee..c72ccb307 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper
-Version: 2019-04-25
+Version: 1.70.0-2
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index d85c8d662..7721973a9 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.69.0 ;
-constant BOOST_VERSION_ABI_TAG : 1_69 ;
+constant BOOST_VERSION : 1.70.0 ;
+constant BOOST_VERSION_ABI_TAG : 1_70 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
import boostcpp ;
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 8e3b2f324..93e4b457f 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -40,8 +40,16 @@ function(boost_modular_build) set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib)
else()
set(BOOST_LIB_PREFIX lib)
- set(BOOST_LIB_RELEASE_SUFFIX .a)
- set(BOOST_LIB_DEBUG_SUFFIX .a)
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ set(BOOST_LIB_RELEASE_SUFFIX .a)
+ set(BOOST_LIB_DEBUG_SUFFIX .a)
+ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ set(BOOST_LIB_RELEASE_SUFFIX .dylib)
+ set(BOOST_LIB_DEBUG_SUFFIX .dylib)
+ else()
+ set(BOOST_LIB_RELEASE_SUFFIX .so)
+ set(BOOST_LIB_DEBUG_SUFFIX .so)
+ endif()
endif()
if(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile.v2")
@@ -234,7 +242,7 @@ function(boost_modular_build) find_path(PATH_TO_CL cl.exe)
find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH)
if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
- message(FATAL_ERROR "Could not find `platform.winmd` in VS2017. Do you have the Universal Windows Platform development workload installed?")
+ message(FATAL_ERROR "Could not find `platform.winmd` in VS. Do you have the Universal Windows Platform development workload installed?")
endif()
else()
find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "$ENV{VS140COMNTOOLS}/../../VC/LIB/store/references")
@@ -253,10 +261,8 @@ function(boost_modular_build) configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)
configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
- if(VCPKG_PLATFORM_TOOLSET MATCHES "v141" OR VCPKG_PLATFORM_TOOLSET MATCHES "v142")
- list(APPEND _bm_OPTIONS toolset=msvc-14.1)
- elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
- list(APPEND _bm_OPTIONS toolset=msvc-14.0)
+ if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
+ list(APPEND _bm_OPTIONS toolset=msvc)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external")
list(APPEND _bm_OPTIONS toolset=gcc)
else()
@@ -351,7 +357,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
- string(REPLACE "-1_69" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
+ string(REPLACE "-1_70" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME})
if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
# nothing to do
diff --git a/ports/boost-move/CONTROL b/ports/boost-move/CONTROL index 8b0181ef4..90b2f4a60 100644 --- a/ports/boost-move/CONTROL +++ b/ports/boost-move/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-move
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-static-assert, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/move
Description: Boost move module
diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index d13e4df9d..a36d02705 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/move
- REF boost-1.69.0
- SHA512 c7cdc3d2452c4399f1e2f128e0d2e85c79ab5e4f45abee79b8fdd2e8df66e92974f6fa29e71e16e609fd69b5b9611a7d51ebbdd12af8af71d3cff6405c301f99
+ REF boost-1.70.0
+ SHA512 09291516819adcfed88c490607a865c6ef4beadac9ee4f948bab90e8fc4f04d958de4601ffff1c9da19793eac6de68b0dd5dfa541cb6a5182d9246d5b06d80d4
HEAD_REF master
)
diff --git a/ports/boost-mp11/CONTROL b/ports/boost-mp11/CONTROL index 248956845..3ae9d9e6f 100644 --- a/ports/boost-mp11/CONTROL +++ b/ports/boost-mp11/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-mp11
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/mp11
Description: Boost mp11 module
diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index e9494bd22..e0979c6a2 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/mp11
- REF boost-1.69.0
- SHA512 61ea485a6d325cbb7e728a4a3725d88db4d0672c092bc3aef442be6ef1f7535db6c107fe2a582a2c69bb81b927a32fab61e6d400a7b748e5d202cb3c544e99d4
+ REF boost-1.70.0
+ SHA512 d09415d5c69a1960c8af3c3e63a61aef62d2a35f00fe42e8dd8ad3eeb2f13eed48e0710485f444e79cfd7ab2fa3f72535e01d9b97337c89328b961fa20aeb047
HEAD_REF master
)
diff --git a/ports/boost-mpi/CONTROL b/ports/boost-mpi/CONTROL index 9f0d77592..3e788cd09 100644 --- a/ports/boost-mpi/CONTROL +++ b/ports/boost-mpi/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-mpi
-Version: 1.69.0-1
+Version: 1.70.0-1
Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, msmpi
+Homepage: https://github.com/boostorg/mpi
Description: Boost mpi module
diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index ce760fab9..76a92ac7c 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/mpi
- REF boost-1.69.0
- SHA512 4adda4da59b49f73a4da70fe091027046964191eeb24d29a16f027b3273ba5ac9e0552061cba15ded70db4839f7c8581c26f2b9dde16c2abfabb434fdbbcc106
+ REF boost-1.70.0
+ SHA512 be8c7abd31335b7290969179d95525855b11f79cacda0ee6d42d8fe130cbeec0768a8418b59ad1ad54c6e36a445622bd289aaabd74de297f576c70c90a871d7f
HEAD_REF master
)
diff --git a/ports/boost-mpl/CONTROL b/ports/boost-mpl/CONTROL index a802cb87d..d29e93e4d 100644 --- a/ports/boost-mpl/CONTROL +++ b/ports/boost-mpl/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-mpl
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-detail, boost-predef, boost-preprocessor, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/mpl
Description: Boost mpl module
diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 095ff4f46..e33bcbfc7 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/mpl
- REF boost-1.69.0
- SHA512 eaaaa930246f277bc4194319094356927e0d100048158f3335087dff681e4535bbdddf891df8db8c51ed209137d93c6f0f951a3dbe0e7c846c483c643dd3096a
+ REF boost-1.70.0
+ SHA512 3691a6ff9e31d8c7ee3010e2c3a6d806e02e2e71ff05e422bc7c17cf774a0a8ceb650f315bd8939275529f0c24f19df3efcd31b677894ea2c1af251b9ab20b3e
HEAD_REF master
)
diff --git a/ports/boost-msm/CONTROL b/ports/boost-msm/CONTROL index b3a91b3bf..6f9e70094 100644 --- a/ports/boost-msm/CONTROL +++ b/ports/boost-msm/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-msm
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-any, boost-assert, boost-bind, boost-circular-buffer, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-parameter, boost-phoenix, boost-preprocessor, boost-proto, boost-serialization, boost-tuple, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/msm
Description: Boost msm module
diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index 1c3fcf1bc..16ec20b85 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/msm
- REF boost-1.69.0
- SHA512 0dcdd9dbc76844d2eb5f98081f2612ab4bb0f2480f6912be5daff9fa601fbc065b4e187ae3baa9ee81f1aab31ddc561d645a70a44edfed314775b8e051ba0614
+ REF boost-1.70.0
+ SHA512 3e91a5be7bf9018c411902ebc6dd1c576a17f7d298ac3694073c12a003cb872fbde4756fbfb113d60d39dad6f683749cef26e21758c96967b06c34f31410467a
HEAD_REF master
)
diff --git a/ports/boost-multi-array/CONTROL b/ports/boost-multi-array/CONTROL index 90aa03fbb..6250f68ad 100644 --- a/ports/boost-multi-array/CONTROL +++ b/ports/boost-multi-array/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-multi-array
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-compatibility, boost-config, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/multi_array
Description: Boost multi_array module
diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 7492500b0..5285174aa 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/multi_array
- REF boost-1.69.0
- SHA512 f8fc2648333eecbe97c16560182b26e6e8f44299ab75d09fbe34ed45640dbffba7cd0a7b1fce33bdc8a0f49b611d2269bff74936082ef412628e7341c16ee423
+ REF boost-1.70.0
+ SHA512 16e0468e94d8691d6b808364c3b75063f0f0b5b27495bad9cd8fc8029b72bd272b23d82ad6003c8ab4ffc1fef8aef6871c3492c639ab0628130eb7e72183235e
HEAD_REF master
)
diff --git a/ports/boost-multi-index/CONTROL b/ports/boost-multi-index/CONTROL index 64c284ed0..19a250e3e 100644 --- a/ports/boost-multi-index/CONTROL +++ b/ports/boost-multi-index/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-multi-index
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-bind, boost-compatibility, boost-config, boost-container-hash, boost-core, boost-detail, boost-foreach, boost-functional, boost-integer, boost-iterator, boost-move, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/multi_index
Description: Boost multi_index module
diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index 75129391c..f928aaec7 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/multi_index
- REF boost-1.69.0
- SHA512 c8cc6a523941c810397165b59f3ec4855319495aecdba05671de3df3b709749a551bafe5277bbf7162f4fabf3a1ce35a3ecef4783e58733ec482435c6cf05433
+ REF boost-1.70.0
+ SHA512 2068a3f7b493dcb5d3658e6c5d0134bd8009c90bea590fa97cc78d5b86386cfa42bb98a30b06c85270c2440ccc9aa092ec78fb9227bc9c90ad4e2d7480773e32
HEAD_REF master
)
diff --git a/ports/boost-multiprecision/CONTROL b/ports/boost-multiprecision/CONTROL index 86644fd6f..49d3fb4f0 100644 --- a/ports/boost-multiprecision/CONTROL +++ b/ports/boost-multiprecision/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-multiprecision
-Version: 1.69.0
-Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-math, boost-mpl, boost-predef, boost-random, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-array, boost-assert, boost-config, boost-container-hash, boost-core, boost-functional, boost-integer, boost-lexical-cast, boost-mpl, boost-predef, boost-rational, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/multiprecision
Description: Boost multiprecision module
diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 4d3a34e6a..f6d1a3b5f 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/multiprecision
- REF boost-1.69.0
- SHA512 845a8e5aea10627fb9412ccd4aea4aa8315db00dd07d3b432a6574e6bf0d68574a69e98ae26591ebb47f45d98df9bea3b2392552ec23de8d18f068288a6b24c3
+ REF boost-1.70.0
+ SHA512 a583b0df0855146ad0ee841cfc9ad646be89b38cf0d895d9ba69f4e5b2013887343863678bfbaed055b55c54d2ebe4026dc38f2dc021b8c7f9f18bf540d9189c
HEAD_REF master
)
diff --git a/ports/boost-numeric-conversion/CONTROL b/ports/boost-numeric-conversion/CONTROL index 824d164a6..702c4f5de 100644 --- a/ports/boost-numeric-conversion/CONTROL +++ b/ports/boost-numeric-conversion/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-numeric-conversion
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-throw-exception, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/numeric_conversion
Description: Boost numeric_conversion module
diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index db73afa20..8a71be47d 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/numeric_conversion
- REF boost-1.69.0
- SHA512 5b39ffc0eb4589483540ea49ea72ab86ae4f12b9c7a1e0902c1bf0a86e2f79d14b4cba107ae18c8390e69e0e4a83b96d4fddfba17ed6372821abd85052003b03
+ REF boost-1.70.0
+ SHA512 05a936bd820c40a9ddf84f5c05790aa13191ff00ab2232a046bbef11bc0adb0eb60ec630ab9397ca841d7b12d74a74ca2c7b53c33780db8e9607b4b757fd901e
HEAD_REF master
)
diff --git a/ports/boost-odeint/CONTROL b/ports/boost-odeint/CONTROL index 8a96b34d8..a4c0381f7 100644 --- a/ports/boost-odeint/CONTROL +++ b/ports/boost-odeint/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-odeint
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-bind, boost-compute, boost-config, boost-core, boost-function, boost-fusion, boost-iterator, boost-math, boost-mpl, boost-multi-array, boost-preprocessor, boost-range, boost-static-assert, boost-throw-exception, boost-type-traits, boost-units, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/odeint
Description: Boost odeint module
diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index a8bad4df7..91b9ce949 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/odeint
- REF boost-1.69.0
- SHA512 058f4554fe2a573ef489ea4a7262078ff2c9d1682e389089f04d601c67feba6d258028f1be1715711d0302d33614aa8e04ad781ffcfa0c427f418b9096c53b90
+ REF boost-1.70.0
+ SHA512 1edcd84ee3f9bb8a421971285fe18b6b30af720042f80e87d6178682bb2ec7163185be08e7648f2bb944562f9abafe8bf34fe520412b7f1bd02e7195670c964b
HEAD_REF master
)
diff --git a/ports/boost-optional/CONTROL b/ports/boost-optional/CONTROL index 1f2ea069d..b97a5df25 100644 --- a/ports/boost-optional/CONTROL +++ b/ports/boost-optional/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-optional
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/optional
Description: Boost optional module
diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 11c3b5b68..cb2556c23 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/optional
- REF boost-1.69.0
- SHA512 0bf1520af676a3f1fc34a074f8029018a9353fcf21dc3a3c895d2d3dcf68a2ecb0eae22e2edb9f687cc70e228c24f31a531b91b3d8160fa0559b9411401da64b
+ REF boost-1.70.0
+ SHA512 739fea7e373aa651268db2712cc2fb4ca18dce8c93626aa05f89657ae89b16ff755c1994d336ec7e72991120b01c9fed0310591cf78dc25c02bf42ce2b947a67
HEAD_REF master
)
diff --git a/ports/boost-outcome/CONTROL b/ports/boost-outcome/CONTROL new file mode 100644 index 000000000..c97930c08 --- /dev/null +++ b/ports/boost-outcome/CONTROL @@ -0,0 +1,5 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+Source: boost-outcome
+Version: 1.70.0
+Build-Depends: boost-config, boost-throw-exception, boost-vcpkg-helpers
+Description: Boost outcome module
diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake new file mode 100644 index 000000000..c715bafb0 --- /dev/null +++ b/ports/boost-outcome/portfile.cmake @@ -0,0 +1,14 @@ +# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO boostorg/outcome
+ REF boost-1.70.0
+ SHA512 7741d0aca8dd352a530f3b6a6878de492b5aca7f3ade7a86f17fa971dc054616dab0bb10c8d304a298b3e065ca16ab7dcd192d0fec4aaf237ed391390a93a0a8
+ HEAD_REF master
+)
+
+include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
+boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-parameter-python/CONTROL b/ports/boost-parameter-python/CONTROL index c4da4f4cc..3f047968d 100644 --- a/ports/boost-parameter-python/CONTROL +++ b/ports/boost-parameter-python/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-parameter-python
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-mpl, boost-parameter, boost-preprocessor, boost-python (windows), boost-vcpkg-helpers
Description: Boost parameter_python module
diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index 284476775..e29f53f51 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/parameter_python
- REF boost-1.69.0
- SHA512 1a50243b3f527a6bfd95964053e0c0624c5bd859d037770e0c41c4158b4ae4d0da6bcf493759b6cdd66cc08ee9c6c5d82fa4173f67b2a20f9715e2f30f90e6cb
+ REF boost-1.70.0
+ SHA512 d2f43ca744bedfdeda806c0d1b24216f4926401059450d12485dc2175e8731991476c1bb530d28c631d9bc034c7ce184b62daffe0c3a6449fc619ff5e3e4e2cb
HEAD_REF master
)
diff --git a/ports/boost-parameter/CONTROL b/ports/boost-parameter/CONTROL index 01ec570d1..0e11e2e8b 100644 --- a/ports/boost-parameter/CONTROL +++ b/ports/boost-parameter/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-parameter
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-detail, boost-mpl, boost-optional, boost-preprocessor, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/parameter
Description: Boost parameter module
diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index 1e569ea28..d3ba3c0e0 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/parameter
- REF boost-1.69.0
- SHA512 08d4397c3edd73a0d1e0485540846cd4d7b537d9046cf08ab841ae323de85d6df9a8a132d5204f514ff0d1d1b41047d63261875fbfd30ca1b1f9b3b0f93c6c81
+ REF boost-1.70.0
+ SHA512 a923427630563ebd77c0cdbbda37a4288e375f2ba1315a5596e8711b8854fb23e6984e88e1108b44cf6a909f6f8acc80867a34f86aed7ea6a18dbd766a93cc1a
HEAD_REF master
)
diff --git a/ports/boost-phoenix/CONTROL b/ports/boost-phoenix/CONTROL index 33cd2bb96..4ef5e2b67 100644 --- a/ports/boost-phoenix/CONTROL +++ b/ports/boost-phoenix/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-phoenix
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-fusion, boost-mpl, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/phoenix
Description: Boost phoenix module
diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 3493ab0cb..eb5f0dffb 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/phoenix
- REF boost-1.69.0
- SHA512 e07e678fe7373ec33f331fecefb3951b5b6adbed0e2d9f22148a9d75327c1194c45ba2f0b403ba2978040400cd6fb0f604686ca77c48a2c3878c9e7d15ea33dd
+ REF boost-1.70.0
+ SHA512 d8e42ecd1e93fc3e48a1b1f0de9d2054f73e5d591da71af09f664b94edfa612ff377c20d2d913ed3790bca4d5ff74d176c50e298f979c88e5db5bf80ea239f2d
HEAD_REF master
)
diff --git a/ports/boost-poly-collection/CONTROL b/ports/boost-poly-collection/CONTROL index a45de2679..eccbe4835 100644 --- a/ports/boost-poly-collection/CONTROL +++ b/ports/boost-poly-collection/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-poly-collection
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-iterator, boost-mp11, boost-mpl, boost-type-erasure (!arm), boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/poly_collection
Description: Boost poly_collection module
diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index b2849bf72..9119ffba5 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/poly_collection
- REF boost-1.69.0
- SHA512 636f406d1ee0e7f6612ea285d745fc64137fc7b499efb8e852933747a69cc0efbb41b2643514f5d264ea7df087fb950e8f77b433645847b785e376c729c1d098
+ REF boost-1.70.0
+ SHA512 c3ea37138000ed584ab1cc17441be7bce0962e542b9cf2af6cf3c76d78a9905e42d4ab6c32506ff7dbb44a25e8def60223c6075bc4b39e523d9c0b9fbf6cabb3
HEAD_REF master
)
diff --git a/ports/boost-polygon/CONTROL b/ports/boost-polygon/CONTROL index 1a588f66d..1f0f0bc12 100644 --- a/ports/boost-polygon/CONTROL +++ b/ports/boost-polygon/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-polygon
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-integer, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/polygon
Description: Boost polygon module
diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index 46d0062dd..a8945fc3c 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/polygon
- REF boost-1.69.0
- SHA512 4cd1a3a9856322f475cdf3d4643043143531cf78b9f951d7b533bbfcab38df1dfa55d2326a983dcb7c88635efe72f878215280532dcf47c6cee755bcdfe50f2f
+ REF boost-1.70.0
+ SHA512 c4d07fc5a419442e614376197611d131ae05cb25127bb3e300e0e9eb5c1336b2bae99522460b69a61dfd05e5e4785cf9b0a33b61fa199c738a9e16cbde3c34d7
HEAD_REF master
)
diff --git a/ports/boost-pool/CONTROL b/ports/boost-pool/CONTROL index 888b0cce7..95fff6e7d 100644 --- a/ports/boost-pool/CONTROL +++ b/ports/boost-pool/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-pool
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-detail, boost-integer, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/pool
Description: Boost pool module
diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 23d73e65b..72c3df4e0 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/pool
- REF boost-1.69.0
- SHA512 b3fad5e548912a485599ee3e1db1989848dee84d5376fd9eda00d63044a6c10deb675a20518ac7626932770350015cdbe4e82cc74ee570edb8abeba85628b832
+ REF boost-1.70.0
+ SHA512 035a8fb9a0b4f4983a1da755182183ea636da4a87c58c9a9aa0e5b7f52eb4ac72c089cb34ca217a3bb7feb8475d3aafed78a7ab910078c11f4db5740809fe290
HEAD_REF master
)
diff --git a/ports/boost-predef/CONTROL b/ports/boost-predef/CONTROL index 256939088..018f5737c 100644 --- a/ports/boost-predef/CONTROL +++ b/ports/boost-predef/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-predef
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/predef
Description: Boost predef module
diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 9e5a39d8c..489c5b7c7 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/predef
- REF boost-1.69.0
- SHA512 0fadcf5e36fe83d777843d3a02c730a7f4af06cff52700ef032b196805307d92e4e8665e6387a4d4b1d046d76fffefd980c1208c8f3bc556e6d4d7bdeef2b7ee
+ REF boost-1.70.0
+ SHA512 2ff61f1beb2745151f64b2d63c0eedd5edad885c9561abde6464c470bc8b79ad5b61c9e949992ebde3ce877db0c24760cedacbdc87e86ca11bf5b0f2ca5fbeb2
HEAD_REF master
)
diff --git a/ports/boost-preprocessor/CONTROL b/ports/boost-preprocessor/CONTROL index 276c211ae..6eacdff96 100644 --- a/ports/boost-preprocessor/CONTROL +++ b/ports/boost-preprocessor/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-preprocessor
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/preprocessor
Description: Boost preprocessor module
diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 202454897..712b4a73b 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/preprocessor
- REF boost-1.69.0
- SHA512 33366ae1f998644ef9d151037598facbb832cfbacad07c15a5076b61d9d1f7f2d4e0f45af0e87a437af0b43b134f88392aaf697f0144c838b7c6ad274d0f8fd5
+ REF boost-1.70.0
+ SHA512 e5a0b7995e2be1aade07cfa0543d28cb90ea3704c745adb6db6095332150c588d48260c47990ba38f8d860d2964b87ef023f4958c6b67f9102e8bb877e1de95f
HEAD_REF master
)
diff --git a/ports/boost-process/CONTROL b/ports/boost-process/CONTROL index e07261e05..36d5b8ca6 100644 --- a/ports/boost-process/CONTROL +++ b/ports/boost-process/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-process
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-algorithm, boost-asio, boost-config, boost-core, boost-filesystem (!uwp), boost-fusion, boost-iterator, boost-move, boost-optional, boost-system, boost-tokenizer, boost-type-index, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/process
Description: Boost process module
diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 8c8c53218..353b8d648 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/process
- REF boost-1.69.0
- SHA512 f01bfad34458fd245785efa12c070f8a21565698a181b55418f19e0ca948f219be6339ad9e43a0bd87a782ecca92e212671081dc18f7c9699e9b984e0e85d4e3
+ REF boost-1.70.0
+ SHA512 6265e0705e89ce2a9b3a0df212db76dd309a8bee905249070f0ebc3449207cfc9e30fa6b73dc1de83752c97a95dd214f9e922c87c0a5b03e7df978645620ea62
HEAD_REF master
)
diff --git a/ports/boost-program-options/CONTROL b/ports/boost-program-options/CONTROL index cd62877f0..25d37164e 100644 --- a/ports/boost-program-options/CONTROL +++ b/ports/boost-program-options/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-program-options
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-any, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-tokenizer, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/program_options
Description: Boost program_options module
diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 2d5308f8c..be596617e 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/program_options
- REF boost-1.69.0
- SHA512 02a469c0746cef85b2493b46cfa62da87dd2134af33a874d103e6f225577c74264781c567010f2aeaa4a3c8632d1856e107575230c9c370c22e75e2d78c751ef
+ REF boost-1.70.0
+ SHA512 1a7aef92a0f3de1769a1cb4cee86f47d3278c723bc2203d0db96fc3ae6b7b15c47f22e61375e670a4cd40ca74eea32356e5768ca4079926b1e56cba9fcc6ecc5
HEAD_REF master
)
diff --git a/ports/boost-property-map/CONTROL b/ports/boost-property-map/CONTROL index e9bcd373c..9592eee2f 100644 --- a/ports/boost-property-map/CONTROL +++ b/ports/boost-property-map/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-property-map
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-any, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-multi-index, boost-optional, boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/property_map
Description: Boost property_map module
diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index ba2881c75..4200bb4d6 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/property_map
- REF boost-1.69.0
- SHA512 6712f57133e12db2e094dae1895fedc995168c54b74052c02355f13164ea71ab393dbac1fe5f8236188a3282a30a91c39ee5dde4328b4e986f06da4bb3d0f033
+ REF boost-1.70.0
+ SHA512 b4c9ab834ce9c3f09105e5814734fb16f2f4061331427904c04dbcac64ac91ea76c2edb3d63e036c5ea3dac699c1da247cbe8861380020373cc64eada9491990
HEAD_REF master
)
diff --git a/ports/boost-property-tree/CONTROL b/ports/boost-property-tree/CONTROL index c7398baa5..f896ed5cd 100644 --- a/ports/boost-property-tree/CONTROL +++ b/ports/boost-property-tree/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-property-tree
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-any, boost-assert, boost-bind, boost-compatibility, boost-config, boost-core, boost-format, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/property_tree
Description: Boost property_tree module
diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index 856597cef..ea8432c7b 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/property_tree
- REF boost-1.69.0
- SHA512 4f0ccacbddc0bc6685a7234dcc80c10134e6e6beb872128d90246d5e9402f5e48ec26da8895bbe2d760e110256db9d16bde3dcccb59d1014afc9bf6970d48bab
+ REF boost-1.70.0
+ SHA512 872aa8e7869048b04bc3714b3a50f13aa17c90733d22ca7585c4c0fe237c922a72018023a5a9d6ce6a9ea00c0dbd5cd88d3115f02d39a8b5ed3e110e2c7a03d5
HEAD_REF master
)
diff --git a/ports/boost-proto/CONTROL b/ports/boost-proto/CONTROL index 7aaaaf15e..6f16038c2 100644 --- a/ports/boost-proto/CONTROL +++ b/ports/boost-proto/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-proto
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-detail, boost-fusion, boost-mpl, boost-preprocessor, boost-range, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/proto
Description: Boost proto module
diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 5dc43fc70..1d6a0594b 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/proto
- REF boost-1.69.0
- SHA512 54cdc0f1350ac38388ba45bcb33bca3736ebe32214e6cd8c06a3a7471b0ede697ffc4124419ff13d93af667f728bb1713e5dc92c8a8dd1e28e9c526e3ea36ab4
+ REF boost-1.70.0
+ SHA512 63976484ce6895818715d4fa0073e526fca654a42a0353c1af66928faefb3764b0ec644f7876f38188ed7425cc3b75cb155cd75f1241fb2bb33938bb964a3ebf
HEAD_REF master
)
diff --git a/ports/boost-ptr-container/CONTROL b/ports/boost-ptr-container/CONTROL index e86decd35..573dd2ced 100644 --- a/ports/boost-ptr-container/CONTROL +++ b/ports/boost-ptr-container/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-ptr-container
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/ptr_container
Description: Boost ptr_container module
diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 3cf955911..b61514cc8 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/ptr_container
- REF boost-1.69.0
- SHA512 6df58700545067232139b2088e6abe28268a0a158f6827327ad243d616191b11097b9c6bed8705206ae5daa672555f3ed5c11c20352dc95f2c54aacec54d820a
+ REF boost-1.70.0
+ SHA512 b61e6b8d52d33d783163d8cad1aaaa1b092fc74b5022de235ab01fadab119c9ffb09f0d6a43f9154997b5cc12f60379a50e70d4ac65319eea965c6c6fea322a9
HEAD_REF master
)
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 236c94c6a..2dc872ec0 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-python
-Version: 1.69.0-1
+Version: 1.70.0-1
Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3
+Homepage: https://github.com/boostorg/python
Description: Boost python module
diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 06b739663..912926d61 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/python
- REF boost-1.69.0
- SHA512 7ca3210a35ac43eae31c58d7ccd58e6410ec0d62a25ae7a03fb2db9baa4cf863fbaad1686c6ceaf804663c5707f6e60b4806f792f0aceb5c12a85b705d4242d0
+ REF boost-1.70.0
+ SHA512 0e540f68713460c64f195f56af1cbd00ae4fa98adc91a83a0c1fdb7e60950cf282cab02b772f06e7c268c3cd294566d6abfa1d1aa545c687a256d6863870f72d
HEAD_REF master
PATCHES unwind-type.patch
)
diff --git a/ports/boost-qvm/CONTROL b/ports/boost-qvm/CONTROL index e076506b1..0cdc846b4 100644 --- a/ports/boost-qvm/CONTROL +++ b/ports/boost-qvm/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-qvm
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-exception, boost-static-assert, boost-throw-exception, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/qvm
Description: Boost qvm module
diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 2a9a48d31..a677cde90 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/qvm
- REF boost-1.69.0
- SHA512 b801ce8f2e96364fbafa31d1a501706a81d57b7d6f2c0ce63c4ca103957f8a4504eb1797fa96e812dac032e4972b18bc973e8a4bc24cfb38ac3a367dad75b4f7
+ REF boost-1.70.0
+ SHA512 ea777d15e35dc22057e6b3a6b95204bade5592ded3175a0462c497cfd2e204dcbbb564ab5d8b99adf38bdfd4f41ce0443af9cc82f863d1977068222880ef5aab
HEAD_REF master
)
diff --git a/ports/boost-random/CONTROL b/ports/boost-random/CONTROL index c89a37d88..a76d33a7b 100644 --- a/ports/boost-random/CONTROL +++ b/ports/boost-random/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-random
-Version: 1.69.0
-Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-dynamic-bitset, boost-integer, boost-io, boost-math, boost-modular-build-helper, boost-mpl, boost-multiprecision, boost-range, boost-static-assert, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/random
Description: Boost random module
diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index 3024a3317..9c426b5ef 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/random
- REF boost-1.69.0
- SHA512 13875116f5d4fd18eb3ec8b9e09bd1381bc0d5ce533552c555a233380ea91139b7b9e24ff7788c495c2838a3ab9efd400f627d86b09a7b176e2e63ec61d5e6d1
+ REF boost-1.70.0
+ SHA512 887c12de1235dd9ba5a211a23f6da6def14b0100060f94855ac187528a90cbeaf9202298476380ce436634b573f755820e32350f3af2436dddc14f94744c49d2
HEAD_REF master
)
diff --git a/ports/boost-range/CONTROL b/ports/boost-range/CONTROL index 98735fddd..bfb40f155 100644 --- a/ports/boost-range/CONTROL +++ b/ports/boost-range/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-range
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-regex, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/range
Description: Boost range module
diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index 394292b95..5c6334c21 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/range
- REF boost-1.69.0
- SHA512 948a2ed81fa0d3b92a40f5aa51b564e221c06e0d5111cd346ebb2d11de96045a880f373befccf0ae49317f7c03f1a93813f530d4e1a5b9b016fcb1fa14664085
+ REF boost-1.70.0
+ SHA512 f6945ca391a577f6265d651cbcfd183e544b42db37a7fa21899f457c1ca94045865ce71ab9e0171a9aee3451575c18668b609da892d7676f2d9321e5db979371
HEAD_REF master
)
diff --git a/ports/boost-ratio/CONTROL b/ports/boost-ratio/CONTROL index 7eed485c7..ac2e08214 100644 --- a/ports/boost-ratio/CONTROL +++ b/ports/boost-ratio/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-ratio
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-integer, boost-mpl, boost-rational, boost-static-assert, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/ratio
Description: Boost ratio module
diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index fc6174fec..900a861bd 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/ratio
- REF boost-1.69.0
- SHA512 c52acdde2a8b523f98294a77ad61411fb017dc30cf5232f872581c665fca632dae6955c5869240865f2f0868a96d3d25445506bcd7832a3a5def96ded771b3f8
+ REF boost-1.70.0
+ SHA512 0952107943f975644a81c2bf70c0a4c2580138a373d765ec9c037c33345436e210cc7f8f24fa2ddf0fe30cf7b25a592b8a62dc09ce95cd2326fef2647f355575
HEAD_REF master
)
diff --git a/ports/boost-rational/CONTROL b/ports/boost-rational/CONTROL index 2ecdf706a..9ec244996 100644 --- a/ports/boost-rational/CONTROL +++ b/ports/boost-rational/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-rational
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-integer, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/rational
Description: Boost rational module
diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 299a9cdb2..fcb7f7027 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/rational
- REF boost-1.69.0
- SHA512 8115d3f45248918267e1f8630e62d2667302ca11957248a4b6377da58bb6c61b7a0f5e9c11b46133c860e19f90b862c2a466fb38e757f7f7fe88afae3e1ee3c4
+ REF boost-1.70.0
+ SHA512 b2b36bff63247d3456f4c0d298ea04eb285a283eed6278e71365b3b97c673e122e52608f143ec4fdcdb77d5bbda48326ce8785843f5458192054236330576a50
HEAD_REF master
)
diff --git a/ports/boost-regex/CONTROL b/ports/boost-regex/CONTROL index 18b331a48..c5f323543 100644 --- a/ports/boost-regex/CONTROL +++ b/ports/boost-regex/CONTROL @@ -1,7 +1,8 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-regex
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-compatibility, boost-concept-check, boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-iterator, boost-modular-build-helper, boost-mpl, boost-predef, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/regex
Description: Boost regex module
Feature: icu
diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index 1f6fa035b..54cb58dd5 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/regex
- REF boost-1.69.0
- SHA512 7ca27b7585ea3627117275711a29c3ed2a5882e0cad7028ccdf63fbd09380807ffa9e344705ea86846b75f45b85f04ad7cc28149c6ba61579684fd6f9febbd48
+ REF boost-1.70.0
+ SHA512 691608b794a8ed293afe8d7d31fc6cf0ddebd3c850467c33e7572f1a22080b1407aa1c157631abd6e9a3eea0b8c9d6ef477dde1e39e8859d8d8fdd73b98fb301
HEAD_REF master
)
diff --git a/ports/boost-safe-numerics/CONTROL b/ports/boost-safe-numerics/CONTROL index 5eb2449ab..00e9cd754 100644 --- a/ports/boost-safe-numerics/CONTROL +++ b/ports/boost-safe-numerics/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-safe-numerics
-Version: 1.69.0
-Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-mpl, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-config, boost-core, boost-integer, boost-logic, boost-mp11, boost-vcpkg-helpers
Description: Boost safe_numerics module
diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index f3c41c5e8..506b5f40b 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/safe_numerics
- REF boost-1.69.0
- SHA512 708f23d304402671466c24a3c8acb1fd497799eb1c97d314c5ed78712d3906142f3ad5442e159cc304ace46b1e761b920bbe454ebf80df46127be78e98f25f8b
+ REF boost-1.70.0
+ SHA512 b5babfddc56f404602a5c071cef5505d534e1503ab08e9b6acc8e6fe4ebc87b9ae4db71d9c71cc3dcc739d17eea81ac0fe639f442db347e219be1acf39e6c2ef
HEAD_REF master
)
diff --git a/ports/boost-scope-exit/CONTROL b/ports/boost-scope-exit/CONTROL index 22ce65238..0d088b73c 100644 --- a/ports/boost-scope-exit/CONTROL +++ b/ports/boost-scope-exit/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-scope-exit
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-detail, boost-function, boost-preprocessor, boost-typeof, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/scope_exit
Description: Boost scope_exit module
diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index e60cd1769..46584e781 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/scope_exit
- REF boost-1.69.0
- SHA512 d89d5793f1916218892e3a9c2b4b59d637a613a053be09a9f4b74d73413f98e100868ddccbfbcc7d42af154757836532a16d5301fdd9ac6878d94f8bb9ac7a0d
+ REF boost-1.70.0
+ SHA512 e75c746d0829bedf336acb1b4b36c8f2e75cdb650e8f0c18c3a1b3298e81efde643be941bf27cdb3855e9ecc1c6cd15e484c2e54529828ac1fd3b17df7f616c4
HEAD_REF master
)
diff --git a/ports/boost-serialization/CONTROL b/ports/boost-serialization/CONTROL index e82a3cbda..4d24cae11 100644 --- a/ports/boost-serialization/CONTROL +++ b/ports/boost-serialization/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-serialization
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-array, boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-preprocessor, boost-smart-ptr, boost-spirit, boost-static-assert, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/serialization
Description: Boost serialization module
diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 240762224..c1545ef1c 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/serialization
- REF boost-1.69.0
- SHA512 1db8a9db4a972625b76cbe41b35c4c68940b0b0c3caf8fc3108142df922e359af00533d4a2125a6899a68a9c18b3719c0855da63821b4158c253499d677bd753
+ REF boost-1.70.0
+ SHA512 1df374bb3acfffde289d919941302ef988096d59745805ab118d2a31f628ef2fc3aa778bfe1f6434c75ce1db777805c8c092febbec9cb2080e0ed13d05d22156
HEAD_REF master
)
diff --git a/ports/boost-signals/CONTROL b/ports/boost-signals/CONTROL index 10f1465f3..5b58c978c 100644 --- a/ports/boost-signals/CONTROL +++ b/ports/boost-signals/CONTROL @@ -2,4 +2,5 @@ Source: boost-signals
Version: 1.68.0
Build-Depends: boost-any, boost-build, boost-config, boost-core, boost-function, boost-iterator, boost-modular-build-helper, boost-optional, boost-smart-ptr, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/signals
Description: Boost signals module
diff --git a/ports/boost-signals2/CONTROL b/ports/boost-signals2/CONTROL index f20771f5a..d4b236778 100644 --- a/ports/boost-signals2/CONTROL +++ b/ports/boost-signals2/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-signals2
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-function, boost-iterator, boost-mpl, boost-multi-index, boost-optional, boost-parameter, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-variant, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/signals2
Description: Boost signals2 module
diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 74fc65c98..4be1b4f89 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/signals2
- REF boost-1.69.0
- SHA512 96be2cce707e433dadfd23766870d0b01b67e0d156e4178022eedb29928844964c632eefe1da359266180ec7b7bf5f6083f30baa06eb4eb0092078366e9ac4cd
+ REF boost-1.70.0
+ SHA512 4b8db8941f70a3092992da11c7056916017f76d13c6445d3af4abe5f46dca7d8f3dc5d69e669cad607295b40ec387f65a54464166761a3e7503c841eb8f1aeac
HEAD_REF master
)
diff --git a/ports/boost-smart-ptr/CONTROL b/ports/boost-smart-ptr/CONTROL index 491dcaa37..dab71c99e 100644 --- a/ports/boost-smart-ptr/CONTROL +++ b/ports/boost-smart-ptr/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-smart-ptr
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-integer, boost-move, boost-predef, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/smart_ptr
Description: Boost smart_ptr module
diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index cf3d86cd7..26b10dc10 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/smart_ptr
- REF boost-1.69.0
- SHA512 b11e39bde74287c2c9b24ea2c9509fb2f44714ee75e876e8c2c5754cf8c1c7a8f42570f7084393d031b4347abb1ac9715c779c19ecaf5917abb53e368c1e5868
+ REF boost-1.70.0
+ SHA512 c8b25aea25a01b96783ce5f2a9ce066cc2894b236b6f82e45a80913f67a37d113f3ffc0a5bbfa601e951b0a4dde8b12fb69dc7b07e551a206e28e48f6a4bd89c
HEAD_REF master
)
diff --git a/ports/boost-sort/CONTROL b/ports/boost-sort/CONTROL index 903d8b8db..db9a38674 100644 --- a/ports/boost-sort/CONTROL +++ b/ports/boost-sort/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-sort
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-integer, boost-range, boost-serialization, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/sort
Description: Boost sort module
diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 79a6b239f..759291d62 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/sort
- REF boost-1.69.0
- SHA512 70756aeed4d2b179835ae86a91993d18ee388035b107536e8ab78b32309984ee72151c4359d834722b7e0cfb02262a6f4a708d724e8d154518976589b6f3897b
+ REF boost-1.70.0
+ SHA512 c9665e63eea1ec58d0fd664710b42161613efcd7f4123b94a829f38d7e0fe6309687c5c188ffcbd4986803992b119d1a00d759b2cd0e62a1ce76295510fe605e
HEAD_REF master
)
diff --git a/ports/boost-spirit/CONTROL b/ports/boost-spirit/CONTROL index d6fa7c194..89644cb61 100644 --- a/ports/boost-spirit/CONTROL +++ b/ports/boost-spirit/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-spirit
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-algorithm, boost-array, boost-assert, boost-compatibility, boost-concept-check, boost-config, boost-core, boost-detail, boost-endian, boost-filesystem (!uwp), boost-foreach, boost-function, boost-function-types, boost-fusion, boost-integer, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lexical-cast, boost-locale (!uwp), boost-math, boost-move, boost-mpl, boost-optional, boost-phoenix, boost-pool, boost-predef, boost-preprocessor, boost-proto, boost-range, boost-regex, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-throw-exception, boost-tti, boost-typeof, boost-type-traits, boost-unordered, boost-utility, boost-variant, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/spirit
Description: Boost spirit module
diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 49e6b4b66..4c7e20274 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/spirit
- REF boost-1.69.0
- SHA512 2a27761676401c697de19f847fc000c0dd0fbcfac98f48c18d82bf4a8ff33cc53f05dd7843f596ddbaf3a60497bfb8b08f66a7dd4ec034fa3ea8730e45aef7ec
+ REF boost-1.70.0
+ SHA512 333e675b2742c55071d517e8dee0251d36b75ad4a11a70b48c74d060899710eb10e38afd20e9d40f28a041c792000c43c11208abad676ff923ca6d4866170a78
HEAD_REF master
)
diff --git a/ports/boost-stacktrace/CONTROL b/ports/boost-stacktrace/CONTROL index 26932388d..d1b709934 100644 --- a/ports/boost-stacktrace/CONTROL +++ b/ports/boost-stacktrace/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-stacktrace
-Version: 1.69.0
-Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Version: 1.70.0
+Build-Depends: boost-array, boost-build, boost-config, boost-container-hash, boost-core, boost-modular-build-helper, boost-predef, boost-static-assert, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/stacktrace
Description: Boost stacktrace module
diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 66df0a916..5efef9a4b 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/stacktrace
- REF boost-1.69.0
- SHA512 ba8de7c238b60104d3d5b7c720121c52f08b430293736a2ad7636fe361827c7bda61d111357436807a77cd5c1a2973abcc2fd5924bf0f74d85a2a258afad366c
+ REF boost-1.70.0
+ SHA512 154c9caf3ff24f2a5f1d0af1dd5fcbc5b0b59039b30b495dd788086d731530ea724da496f639d995b700cb0a0c8ef0b9d03b63271386e2fe9bc935ef373d1fa7
HEAD_REF master
)
diff --git a/ports/boost-statechart/CONTROL b/ports/boost-statechart/CONTROL index fa93f1c6c..242256a8c 100644 --- a/ports/boost-statechart/CONTROL +++ b/ports/boost-statechart/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-statechart
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-function, boost-mpl, boost-smart-ptr, boost-static-assert, boost-thread (!arm), boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/statechart
Description: Boost statechart module
diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index aac983e0a..47b354ea4 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/statechart
- REF boost-1.69.0
- SHA512 7f3f17be8efde4017666f7009c55b53036d94aa7db61f0be8634f891486f4ccb1157b2a4f0b7e8a45e8a1bbf6bc5f0f154c9e769344a810e374fc7ea96ae7566
+ REF boost-1.70.0
+ SHA512 4a19b927898427c696afe3f9ae8ab7845e34075976d41d6d3845a3e4ccf17d16e3b9d1057400022d131b4f0258aeea230fc24c80f2ec55cc72e44b9573280753
HEAD_REF master
)
diff --git a/ports/boost-static-assert/CONTROL b/ports/boost-static-assert/CONTROL index 5abb78a89..0c8f3a532 100644 --- a/ports/boost-static-assert/CONTROL +++ b/ports/boost-static-assert/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-static-assert
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/static_assert
Description: Boost static_assert module
diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 7e45459d0..71c111d3b 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/static_assert
- REF boost-1.69.0
- SHA512 66e7931bab7cf87ad70e463f7154714d88cccf45b32c40adb68ac3af386158220d148df26beb2fc2f111e5cbc443744e32572e8ef26f279c3e81634f0d18ecf6
+ REF boost-1.70.0
+ SHA512 712f47459f97892cb3dc0b366c198ceee2f57e10f2986e9bfef087448fe3b1de988ccad9222c0f21a42db757975d9714a79d58f1e5092af1daaf777887be703b
HEAD_REF master
)
diff --git a/ports/boost-system/CONTROL b/ports/boost-system/CONTROL index 344927735..79089afd9 100644 --- a/ports/boost-system/CONTROL +++ b/ports/boost-system/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-system
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-build, boost-config, boost-integer, boost-modular-build-helper, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/system
Description: Boost system module
diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index fe1699d66..96fe08461 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/system
- REF boost-1.69.0
- SHA512 64f49a8f2484e3a539a922d66ce05ece9d0ea214c3b1ddf66487ae4201d2a6050ef39da8b1f7dbdb48fbdbc04a1446df0f03cbe8fb85729fcf8b70f066c92053
+ REF boost-1.70.0
+ SHA512 3ad8ee46b99bab77b2ec3cb70ad01ae56156361fd1ad9c54b36b059a19e3c523d222e556e23ec71a80db2d095d4e37bcd7dae7d0745b5eee6e85b6bf121be4fe
HEAD_REF master
)
diff --git a/ports/boost-test/CONTROL b/ports/boost-test/CONTROL index fc4602edb..e1c83b08a 100644 --- a/ports/boost-test/CONTROL +++ b/ports/boost-test/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-test
-Version: 1.69.0-2
-Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-timer, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0-2
+Build-Depends: boost-algorithm, boost-assert, boost-bind, boost-build, boost-compatibility, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-integer, boost-io, boost-iterator, boost-modular-build-helper, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/test
Description: Boost test module
diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 2b165347e..a949d2a6b 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/test
- REF boost-1.69.0
- SHA512 3a265dc888d749ec1aa5cd13889963b19705d7dbe4092941d8943d3f84a82fc67cee9c3e49cecd9769229b9adea1f09b45a7f4a494cca73cf894a402487ea621
+ REF boost-1.70.0
+ SHA512 5efda970fe5530ecb92a609f2aabb486c5a790206004ed72d4e854430a957d31ef016670b21be773aedaf80a203a18945febc1f8d9fdf9b55dbc05196fcbf450
HEAD_REF master
)
diff --git a/ports/boost-thread/CONTROL b/ports/boost-thread/CONTROL index 0bd043a56..e38b6f31a 100644 --- a/ports/boost-thread/CONTROL +++ b/ports/boost-thread/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-thread
-Version: 1.69.0
+Version: 1.70.0-1
Build-Depends: boost-algorithm, boost-assert, boost-atomic, boost-bind, boost-build, boost-chrono, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-core, boost-date-time, boost-detail, boost-exception, boost-function, boost-integer, boost-intrusive, boost-io, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-move, boost-mpl, boost-optional, boost-predef, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-system, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/thread
Description: Boost thread module
diff --git a/ports/boost-thread/avoid-winapi.patch b/ports/boost-thread/avoid-winapi.patch index ed6a89ee7..2308600ea 100644 --- a/ports/boost-thread/avoid-winapi.patch +++ b/ports/boost-thread/avoid-winapi.patch @@ -1,13 +1,13 @@ -diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp
-index 5e378f7..6144621 100644
---- a/include/boost/thread/win32/thread_primitives.hpp
-+++ b/include/boost/thread/win32/thread_primitives.hpp
-@@ -70,7 +70,7 @@ namespace boost
- {
- namespace win32
- {
-- namespace detail { typedef ticks_type (WINAPI *gettickcount64_t)(); }
-+ namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); }
- extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64;
-
- enum event_type
+diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp +index e075140..d60ab36 100644 +--- a/include/boost/thread/win32/thread_primitives.hpp ++++ b/include/boost/thread/win32/thread_primitives.hpp +@@ -70,7 +70,7 @@ namespace boost + { + namespace win32 + { +- namespace detail { typedef ticks_type (BOOST_WINAPI_WINAPI_CC *gettickcount64_t)(); } ++ namespace detail { typedef ticks_type (__stdcall *gettickcount64_t)(); } + extern BOOST_THREAD_DECL boost::detail::win32::detail::gettickcount64_t gettickcount64; + + enum event_type diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 712f1e310..f17812eb3 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/thread
- REF boost-1.69.0
- SHA512 4315662f1592e1f71a1b1a4a502c61df759a4993a376eeb61b5f01a18f4099379ad12989242ccb7d20029b7538b2629e11e707afe10d7fd721e6005c5eb25c56
+ REF boost-1.70.0
+ SHA512 2c29fc8f1ff805f126f162865c8bad51f8aa56942d54999fe0191bcf4bf8f472c070d7977e731ceb6d46ff9d0e6d39013a3df79bfe8f4ed4631906cd26c8537a
HEAD_REF master
PATCHES avoid-winapi.patch
)
diff --git a/ports/boost-throw-exception/CONTROL b/ports/boost-throw-exception/CONTROL index df3e41f63..31502e60c 100644 --- a/ports/boost-throw-exception/CONTROL +++ b/ports/boost-throw-exception/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-throw-exception
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-detail, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/throw_exception
Description: Boost throw_exception module
diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index 36c4fdff7..c3841366d 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/throw_exception
- REF boost-1.69.0
- SHA512 fc9fa9eef9fba2e290598ff0469279f0eaba90918f62d1006837c415a5c49f45ff1b57852b9f03571047f075582498f9c114e7552b7f0d0b8f6edbabb890cc11
+ REF boost-1.70.0
+ SHA512 2b95ab70b141ea077c420c2fd6e139851aac6e6ccfb8a6772e7492066d3746f492f268a56ea79b2843e2631444d0a8dceba4551d98a3e315ef86017b307585fc
HEAD_REF master
)
diff --git a/ports/boost-timer/CONTROL b/ports/boost-timer/CONTROL index 6979036fb..213ccc19c 100644 --- a/ports/boost-timer/CONTROL +++ b/ports/boost-timer/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-timer
-Version: 1.69.0
-Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-system, boost-throw-exception, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-build, boost-chrono, boost-compatibility, boost-config, boost-core, boost-integer, boost-io, boost-modular-build-helper, boost-predef, boost-system, boost-throw-exception, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/timer
Description: Boost timer module
diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index db0933381..805efc619 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/timer
- REF boost-1.69.0
- SHA512 cfa6a8976b2b91ade5f22c8e8e37cbf687bbfc5bf2904f652287188a903bb1c25f537280a61293141436b71bb1bf0df1e14615948e76571ebf4d3b98fcb9470a
+ REF boost-1.70.0
+ SHA512 d00d5637b420346d65530a2d6df43cd91e6ac222fd4710ee630bdcede5e00ea4b30a20aa2f9181244530a6f9a434b8421208f5936a0dddb9386d9105b4594263
HEAD_REF master
)
diff --git a/ports/boost-tokenizer/CONTROL b/ports/boost-tokenizer/CONTROL index 0ce98025a..3b7497e82 100644 --- a/ports/boost-tokenizer/CONTROL +++ b/ports/boost-tokenizer/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-tokenizer
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-detail, boost-iterator, boost-mpl, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/tokenizer
Description: Boost tokenizer module
diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 225fcbe21..5c0fccb26 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/tokenizer
- REF boost-1.69.0
- SHA512 a01120203c4caa6bcfcda803f7811f575b247410e7aa74815646f383a374946263e42987d1cff8a33a65c925cf9d3798854d14995446f637ff8e4e77a3b3b4bc
+ REF boost-1.70.0
+ SHA512 f1c48f599d9b0e8722d4b78a2def4760a48602838e03bc5a5e964ce4f78b7ffafad12ddd272fee1f576da06b231781e2fb95898ca7d1f09e68f9bbddcf4ee954
HEAD_REF master
)
diff --git a/ports/boost-tti/CONTROL b/ports/boost-tti/CONTROL index 6c4c059c7..f284303ea 100644 --- a/ports/boost-tti/CONTROL +++ b/ports/boost-tti/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-tti
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-detail, boost-function-types, boost-mpl, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/tti
Description: Boost tti module
diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 0e3237b42..5ac42c6d1 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/tti
- REF boost-1.69.0
- SHA512 1c8c0ea6e47ea4565d280e9ad465851d1f8abf14639676112a45e275889e1cfb9b517c5f12a9e26c32c465c24e93a843f46ea5854060ed7a96ba29bc1f5e687e
+ REF boost-1.70.0
+ SHA512 0933d8dac91052ad3a702130162e512f5c1c6a52e2d7bcbc96cd3424ca7eba6e51091e7a2639b17203ff3db84d22f8bf1c402567f471c26a87bc2468a7442e4c
HEAD_REF master
)
diff --git a/ports/boost-tuple/CONTROL b/ports/boost-tuple/CONTROL index bd0d1a7ee..ba38ab267 100644 --- a/ports/boost-tuple/CONTROL +++ b/ports/boost-tuple/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-tuple
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-core, boost-static-assert, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/tuple
Description: Boost tuple module
diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 9a6582a65..985d651b1 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/tuple
- REF boost-1.69.0
- SHA512 b298a179fd103f8da526315cab50bcbc1d2b6f63ad753add05353a943ab6ae1044412eddaafec760809a6ccb881dee6302c5014283eda20bc7563f3eea47c4a8
+ REF boost-1.70.0
+ SHA512 79baa5840f6533934c8c9dfd9e4a2af9705dd4e5243d4434ca9dd5edb5407805f8f28f1983e8883e62c735cb73b5743ba091263be0680a394216a83a0b387793
HEAD_REF master
)
diff --git a/ports/boost-type-erasure/CONTROL b/ports/boost-type-erasure/CONTROL index d937f7c6c..d9090d787 100644 --- a/ports/boost-type-erasure/CONTROL +++ b/ports/boost-type-erasure/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-type-erasure
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-config, boost-detail, boost-fusion, boost-iterator, boost-modular-build-helper, boost-mp11, boost-mpl, boost-preprocessor, boost-smart-ptr, boost-thread (!arm), boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers, boost-vmd
+Homepage: https://github.com/boostorg/type_erasure
Description: Boost type_erasure module
diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 6fce4db2b..ee6015fad 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/type_erasure
- REF boost-1.69.0
- SHA512 40445b1b5f3e3ce61c7d5d2bc0d5018b4ebe2ebbba4d05e941bfbc792a52b04f6dd0025b6502f105686dc55d74ccbc5f7ca61a96a36532ddb6879a9d8d2f6afd
+ REF boost-1.70.0
+ SHA512 b975d7efa5c50c711607c28bd8e4862754d589b2fc384e06170318debd7a1b3e72231409c5bebae44ac80f67ef8a8f466fda0e8775ad1473b7fd69c9c39c42c4
HEAD_REF master
)
diff --git a/ports/boost-type-index/CONTROL b/ports/boost-type-index/CONTROL index e147947ff..4f52f6368 100644 --- a/ports/boost-type-index/CONTROL +++ b/ports/boost-type-index/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-type-index
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-container-hash, boost-core, boost-preprocessor, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/type_index
Description: Boost type_index module
diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index a97f2000b..365de0ca4 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/type_index
- REF boost-1.69.0
- SHA512 c323a0f779084272127e1da31efbd166bc1c8ba83083cafba19984c86a91aa87ce84bbfe95a5f439feffb53f286006c215b0b828d8626cc4bbde509ffb05d994
+ REF boost-1.70.0
+ SHA512 e7c6c36c4c24045fcb9ddd3a804b051b1076bab92488927b0fb5b6e9f551c45c19c09a33e4002e843fd00500e40dd7511ff23124f73fe889883f79e35fbb4bd3
HEAD_REF master
)
diff --git a/ports/boost-type-traits/CONTROL b/ports/boost-type-traits/CONTROL index 24997fa5f..eeacc1736 100644 --- a/ports/boost-type-traits/CONTROL +++ b/ports/boost-type-traits/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-type-traits
-Version: 1.69.0-1
+Version: 1.70.0-1
Build-Depends: boost-config, boost-detail, boost-static-assert, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/type_traits
Description: Boost type_traits module
diff --git a/ports/boost-type-traits/msvc-arm-2.patch b/ports/boost-type-traits/msvc-arm-2.patch deleted file mode 100644 index f6f192ecb..000000000 --- a/ports/boost-type-traits/msvc-arm-2.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp
-index 82303fb..de0ce7e 100644
---- a/include/boost/type_traits/detail/is_function_cxx_11.hpp
-+++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp
-@@ -96,7 +96,7 @@ namespace boost {
- template <class Ret, class ...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_function<Ret(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-@@ -328,7 +328,7 @@ namespace boost {
- template <class Ret, class ...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_function<Ret(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-index d5f1c21..0465ae0 100644
---- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-+++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-@@ -108,7 +108,7 @@ namespace boost {
- template <class Ret, class C, class ...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret(C::*)(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-@@ -362,7 +362,7 @@ namespace boost {
- template <class Ret, class C, class ...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret(C::*)(Args..., ...)const volatile && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
-
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && (defined(_M_AMD64) || defined(_M_IX86))
- #ifdef __CLR_VER
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
diff --git a/ports/boost-type-traits/msvc-arm.patch b/ports/boost-type-traits/msvc-arm.patch index cf3d9005a..7ef352087 100644 --- a/ports/boost-type-traits/msvc-arm.patch +++ b/ports/boost-type-traits/msvc-arm.patch @@ -1,5 +1,5 @@ diff --git a/include/boost/type_traits/detail/is_function_cxx_11.hpp b/include/boost/type_traits/detail/is_function_cxx_11.hpp
-index 3031130..82303fb 100644
+index 432af4e..97f029a 100644
--- a/include/boost/type_traits/detail/is_function_cxx_11.hpp
+++ b/include/boost/type_traits/detail/is_function_cxx_11.hpp
@@ -101,7 +101,7 @@ namespace boost {
@@ -10,8 +10,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -114,7 +114,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -118,7 +118,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -19,8 +19,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -127,7 +127,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -135,7 +135,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -28,8 +28,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -140,7 +140,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -152,7 +152,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -37,8 +37,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -154,7 +154,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -170,7 +170,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -46,8 +46,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -167,7 +167,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -187,7 +187,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -55,8 +55,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -180,7 +180,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -204,7 +204,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -64,8 +64,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -193,7 +193,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -221,7 +221,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -73,17 +73,17 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -207,7 +207,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -239,7 +239,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)&&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_function<Ret __stdcall(Args...)&&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -220,7 +220,7 @@ namespace boost {
+ struct is_function<Ret __stdcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -256,7 +256,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -91,8 +91,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -233,7 +233,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -273,7 +273,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -100,8 +100,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -246,7 +246,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -290,7 +290,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -109,8 +109,8 @@ index 3031130..82303fb 100644 +#ifdef _M_IX86
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -333,7 +333,7 @@ namespace boost {
+ #ifndef __CLR_VER
+@@ -381,7 +381,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -119,7 +119,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -346,7 +346,7 @@ namespace boost {
+@@ -396,7 +396,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -128,7 +128,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -359,7 +359,7 @@ namespace boost {
+@@ -411,7 +411,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -137,7 +137,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -372,7 +372,7 @@ namespace boost {
+@@ -426,7 +426,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -146,7 +146,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -386,7 +386,7 @@ namespace boost {
+@@ -442,7 +442,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -155,7 +155,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -399,7 +399,7 @@ namespace boost {
+@@ -457,7 +457,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -164,7 +164,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -412,7 +412,7 @@ namespace boost {
+@@ -472,7 +472,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -173,7 +173,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -425,7 +425,7 @@ namespace boost {
+@@ -487,7 +487,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -182,7 +182,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -439,7 +439,7 @@ namespace boost {
+@@ -503,7 +503,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -191,7 +191,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -452,7 +452,7 @@ namespace boost {
+@@ -518,7 +518,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -200,7 +200,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -465,7 +465,7 @@ namespace boost {
+@@ -533,7 +533,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -209,7 +209,7 @@ index 3031130..82303fb 100644 template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __stdcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -478,7 +478,7 @@ namespace boost {
+@@ -548,7 +548,7 @@ namespace boost {
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_function<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
@@ -219,222 +219,222 @@ index 3031130..82303fb 100644 struct is_function<Ret __stdcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
template <class Ret, class...Args BOOST_TT_NOEXCEPT_PARAM>
diff --git a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-index b77a4a5..d5f1c21 100644
+index d88a004..f02693e 100644
--- a/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
+++ b/include/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
@@ -113,7 +113,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret (__clrcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -133,7 +133,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -128,7 +128,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -153,7 +153,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -143,7 +143,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -173,7 +173,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -158,7 +158,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -193,7 +193,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -174,7 +174,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -213,7 +213,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -189,7 +189,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -233,7 +233,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -204,7 +204,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -253,7 +253,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -219,7 +219,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -273,7 +273,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -235,7 +235,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -293,7 +293,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -250,7 +250,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -313,7 +313,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -265,7 +265,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -333,7 +333,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -280,7 +280,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret (__stdcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -424,7 +424,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -367,7 +367,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -444,7 +444,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -382,7 +382,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -464,7 +464,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -397,7 +397,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -484,7 +484,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -412,7 +412,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -504,7 +504,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -428,7 +428,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -524,7 +524,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -443,7 +443,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -544,7 +544,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -458,7 +458,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -564,7 +564,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -473,7 +473,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile &BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -584,7 +584,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -489,7 +489,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...) && BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -604,7 +604,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -504,7 +504,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -624,7 +624,7 @@ namespace boost {
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -519,7 +519,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
-@@ -534,7 +534,7 @@ namespace boost {
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
- struct is_member_function_pointer<Ret __clrcall(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+ #ifndef __CLR_VER
+@@ -645,7 +645,7 @@ namespace boost {
+ struct is_member_function_pointer<Ret(__clrcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
+
#endif
-#ifndef _M_AMD64
+#ifdef _M_IX86
template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
struct is_member_function_pointer<Ret(__stdcall C::*)(Args...)const volatile &&BOOST_TT_NOEXCEPT_DECL> : public true_type {};
- template <class Ret, class C, class...Args BOOST_TT_NOEXCEPT_PARAM>
+ #ifndef __CLR_VER
diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index f2661a4ba..a3bc496b2 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -5,12 +5,11 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/type_traits
- REF boost-1.69.0
- SHA512 83d585933374420808aaf3743cda48d914bb7d536bf3f19e59bba1b24403a1482ff509e1f804a0b55d3bc434aceedcb0b75f873b9feaa9ba1c1a762a11d4fc94
+ REF boost-1.70.0
+ SHA512 e9c672bb0e02cea9be8179908dfbb0c21903a7e6b9fade6e6666c01af97d81e489983143eedd668df446a1fb532d3c5298458c18efacd747ce66b77170d0da14
HEAD_REF master
PATCHES
msvc-arm.patch
- msvc-arm-2.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-typeof/CONTROL b/ports/boost-typeof/CONTROL index 8ee36b04c..aeca892fe 100644 --- a/ports/boost-typeof/CONTROL +++ b/ports/boost-typeof/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-typeof
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-preprocessor, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/typeof
Description: Boost typeof module
diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 66486e83c..b3c269834 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/typeof
- REF boost-1.69.0
- SHA512 66932eaef89b406c1570bd469370cc62ad298ee7c1864d01a0380a32c90511711cb8b00776c203c8ed6eb2ecec8fb5c005bb932c2277e4fe29b182e485927b18
+ REF boost-1.70.0
+ SHA512 ff55aa51b66275a18c8d83d95eadc66aa410fc0e21e3cfee9ecb70051fe7fb8015b17ebd54541ef0eb96f638aafa61bd77df40dcc6d460e9227040336c61ec5c
HEAD_REF master
)
diff --git a/ports/boost-ublas/CONTROL b/ports/boost-ublas/CONTROL index eca065013..319b99bed 100644 --- a/ports/boost-ublas/CONTROL +++ b/ports/boost-ublas/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-ublas
-Version: 1.69.0
-Build-Depends: boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Version: 1.70.0
+Build-Depends: boost-compute, boost-concept-check, boost-config, boost-core, boost-iterator, boost-mpl, boost-range, boost-serialization, boost-smart-ptr, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/ublas
Description: Boost ublas module
diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index b46d7a830..f81cbb420 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/ublas
- REF boost-1.69.0
- SHA512 ef39748840ebdb19dfab07f51120c771e08d82edcd526952d15db105b3779c17a8c6742c73a55b0427ad84b7dfa30d08337f331d915fed09b0de30b3606c2385
+ REF boost-1.70.0
+ SHA512 050be7c25c50b31274e6b19d2c882343ac6b065c093bab20f5c9ce4050db78886525299cc1814525f0ef7da6ae002aef0c3c1539f65e3d9646d0e399293b019e
HEAD_REF master
)
diff --git a/ports/boost-units/CONTROL b/ports/boost-units/CONTROL index 1d1fa035c..8e1fe4a8a 100644 --- a/ports/boost-units/CONTROL +++ b/ports/boost-units/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-units
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-config, boost-core, boost-integer, boost-io, boost-lambda, boost-math, boost-mpl, boost-preprocessor, boost-serialization, boost-static-assert, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/units
Description: Boost units module
diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index f823754e6..ac58d7284 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/units
- REF boost-1.69.0
- SHA512 6a4a18e6dc8b2d8ddcd027bab0b30a6892639de6e85f25dd456b23fb36f162fd6ec142f49e7ab416bbd1e9d6f5eac541faaa46450896dbfa9691c31c855e217f
+ REF boost-1.70.0
+ SHA512 001bfe9ca2a6be94ec66c123ed983468cefebfebbee58f439bbb2a392fa152cb0818fc03a782bfd698693702df185242187d91ba6cbab8f742bb04d53cd1ca28
HEAD_REF master
)
diff --git a/ports/boost-unordered/CONTROL b/ports/boost-unordered/CONTROL index 796d8bf7d..d128e273f 100644 --- a/ports/boost-unordered/CONTROL +++ b/ports/boost-unordered/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-unordered
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container, boost-container-hash, boost-core, boost-detail, boost-functional, boost-move, boost-predef, boost-preprocessor, boost-smart-ptr, boost-throw-exception, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/unordered
Description: Boost unordered module
diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index aaf69b4fe..69c681d99 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/unordered
- REF boost-1.69.0
- SHA512 51bbbdcc0661b502445e53091bb5ab859ece03ce549365ac58964459e0b7c162e10b166324b8b9c28a9a8aef5532fa31fed68bbb878e3d36f115a6279109e4b7
+ REF boost-1.70.0
+ SHA512 8fc3692777e6b7e997a888237628489bcac80b45ddb4ac2bf73809e7e689506ba8e2679915d8025369375610a7a63cf94f18bafb1fe638df57e76be468bae761
HEAD_REF master
)
diff --git a/ports/boost-utility/CONTROL b/ports/boost-utility/CONTROL index 7850447a2..7f54df7de 100644 --- a/ports/boost-utility/CONTROL +++ b/ports/boost-utility/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-utility
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-container-hash, boost-core, boost-detail, boost-integer, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/utility
Description: Boost utility module
diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 521de5622..4297c262a 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/utility
- REF boost-1.69.0
- SHA512 92c97875eff9aee2724b4ae1ed04a6885b06c77fa14ce646423c6b7024bb1d86ef358ecc5d3fa3835b3d70adb968a49f647828fe181ae469aa6fd1fe0a1bc8cf
+ REF boost-1.70.0
+ SHA512 c81bb47c9d9d95b2a1e43f969b7ce91d148e207d4a5b5efe9d9ca5b0ef87f182216aae6e45c6bba52f8ba7b5d5601984c4551a5d84352d3d221433d8652c9570
HEAD_REF master
)
diff --git a/ports/boost-uuid/CONTROL b/ports/boost-uuid/CONTROL index b17b48ef8..efc4b3094 100644 --- a/ports/boost-uuid/CONTROL +++ b/ports/boost-uuid/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-uuid
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-container-hash, boost-core, boost-integer, boost-io, boost-move, boost-numeric-conversion, boost-predef, boost-random, boost-serialization, boost-static-assert, boost-throw-exception, boost-tti, boost-type-traits, boost-vcpkg-helpers, boost-winapi
+Homepage: https://github.com/boostorg/uuid
Description: Boost uuid module
diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index b8c43c34a..f1baff5ee 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/uuid
- REF boost-1.69.0
- SHA512 b6f1dbceb1ca2665df63b7d4745c185aca0812ede640e569d086d5f428b9babdfb15096ba5b2475bd59b87bc27b3f961388fe251a25fe0422f036058ab9c5856
+ REF boost-1.70.0
+ SHA512 8fa80562f79b6192d7086add50a6c89996106161df0e43a5738e460253cdb7f94c3a941e72fbce49c0ae5eca67429ca6eb42e08af647832941b624a82160e9cf
HEAD_REF master
)
diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL index 45e40a9b8..395d00758 100644 --- a/ports/boost-variant/CONTROL +++ b/ports/boost-variant/CONTROL @@ -2,4 +2,5 @@ Source: boost-variant
Version: 1.69.0
Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/variant
Description: Boost variant module
diff --git a/ports/boost-vcpkg-helpers/generate-ports.ps1 b/ports/boost-vcpkg-helpers/generate-ports.ps1 index e49ee32e8..7ab6c9680 100644 --- a/ports/boost-vcpkg-helpers/generate-ports.ps1 +++ b/ports/boost-vcpkg-helpers/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()]
param (
$libraries = @(),
- $version = "1.69.0"
+ $version = "1.70.0"
)
$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
@@ -215,6 +215,9 @@ $libraries_found = ls $scriptsDir/boost/libs -directory | % name | % { "ublas"
"safe_numerics"
}
+ elseif ($_ -eq "headers")
+ {
+ }
else
{
$_
@@ -316,7 +319,7 @@ foreach ($library in $libraries) -and `
(($library -ne "config") -or ($_ -notmatch "integer"))`
-and `
- (($library -notmatch "random") -or ($_ -notmatch "multiprecision"))`
+ (($library -notmatch "multiprecision") -or ($_ -notmatch "random|math"))`
-and `
(($library -notmatch "lexical_cast") -or ($_ -notmatch "math"))`
-and `
diff --git a/ports/boost-vmd/CONTROL b/ports/boost-vmd/CONTROL index 928a66dc2..6c2bda21a 100644 --- a/ports/boost-vmd/CONTROL +++ b/ports/boost-vmd/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-vmd
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-preprocessor, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/vmd
Description: Boost vmd module
diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 176d487f0..0f8ac16c1 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/vmd
- REF boost-1.69.0
- SHA512 d6b6a88a92849eb6c21aad27ee59e5a6d488524ea813cfa0fd9dc015b5c25e98da6ad97bd62d80d24d973b07b01ccf437f8b1d1f10b4e6aa7402ee8e594953c3
+ REF boost-1.70.0
+ SHA512 88290fb0718b4681f684ffabe756ae1f80fb91f658382444c1e71756ec8138e41db395601dbbd30081b7cda37076574b4de3a08384ced1142551ee04e3680128
HEAD_REF master
)
diff --git a/ports/boost-wave/CONTROL b/ports/boost-wave/CONTROL index d9cc98840..279eb5700 100644 --- a/ports/boost-wave/CONTROL +++ b/ports/boost-wave/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-wave
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-build, boost-concept-check, boost-config, boost-core, boost-detail, boost-filesystem (!uwp), boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-multi-index, boost-pool, boost-preprocessor, boost-serialization, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-type-traits, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/wave
Description: Boost wave module
diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index 294109a06..189eccc57 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/wave
- REF boost-1.69.0
- SHA512 aeb8ba65a0fcc85aae27aa5bba45b2a7421c2e04b64bb03ece77b6c7fa0f2d9282a5e19c64506bcd906357375deb7a1e5711334c74859995b1d0e70014248609
+ REF boost-1.70.0
+ SHA512 0ad42a92f8a7361fd0ba99b319826b74aaf81b5ac2b85f9fc1cd4e065a3931924a13151cdc827e11e7ad34d4526ebfcb55f64d40e7b2eabb1ab7f72e02d304c0
HEAD_REF master
)
diff --git a/ports/boost-winapi/CONTROL b/ports/boost-winapi/CONTROL index 927d9e06f..985612d10 100644 --- a/ports/boost-winapi/CONTROL +++ b/ports/boost-winapi/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-winapi
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-config, boost-predef, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/winapi
Description: Boost winapi module
diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 78144f25d..0877a216f 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/winapi
- REF boost-1.69.0
- SHA512 e1ed458c0ce6d5daa6e9fe577a0010e05e5bc290e485b4f2183e5f61b5ebb07983eab9f5477b3195049f232a699074a1a58f719b5d5b8c0f550ab9e3abae6764
+ REF boost-1.70.0
+ SHA512 aa14bbb4dad1a5fbbd0177918325cc8138268c7c311dca4aef9c4570b8630dceb4b5448e0fc440afca30bd9eef2cd37b5d99843f482131249065cf76d5654174
HEAD_REF master
)
diff --git a/ports/boost-xpressive/CONTROL b/ports/boost-xpressive/CONTROL index 1be7e5128..d2960cf5b 100644 --- a/ports/boost-xpressive/CONTROL +++ b/ports/boost-xpressive/CONTROL @@ -1,5 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-xpressive
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-assert, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-exception, boost-fusion, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-optional, boost-preprocessor, boost-proto, boost-range, boost-smart-ptr, boost-spirit, boost-static-assert, boost-throw-exception, boost-typeof, boost-type-traits, boost-utility, boost-vcpkg-helpers
+Homepage: https://github.com/boostorg/xpressive
Description: Boost xpressive module
diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index dad20d014..79bc1d026 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/xpressive
- REF boost-1.69.0
- SHA512 ac6ab9955ab4cb6e8a1905304595a9b33c71b4041673b6e942adc023bd67c7b64bf786976f40cb2daea6ce164f72fff50fc6fa583dd12d5978a4e3ba6524b523
+ REF boost-1.70.0
+ SHA512 4b242c54b50331cf4bc5318610efe2269ea3794264bec832debb39fb77910d26bb576837b35dce829fb13674a5b427231406e059f7dcbe68f01ba6317af988f6
HEAD_REF master
)
diff --git a/ports/boost-yap/CONTROL b/ports/boost-yap/CONTROL index 97a727fd5..48dea0e8d 100644 --- a/ports/boost-yap/CONTROL +++ b/ports/boost-yap/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-yap
-Version: 1.69.0
+Version: 1.70.0
Build-Depends: boost-hana, boost-preprocessor, boost-type-index, boost-vcpkg-helpers
Description: Boost yap module
diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index edbed9475..106114009 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/yap
- REF boost-1.69.0
- SHA512 12a6d5ed8491a9ebd258fa83ef752af88db38a9517a4da43fd20dd63a244271c7b889f92a32fc67f098230c7cbf530578c8ef163d6427144173183dc2fdc1156
+ REF boost-1.70.0
+ SHA512 f6211eed15eb28418513a525efc250993eed9aa940a20ed989e5f7af6c0890c06e3a0aa571e6825a8b15c62a7f238c7e269872f7b6c3bc3ab2e097a9f101fcf6
HEAD_REF master
)
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL index fc51d7cec..54dfc3c7a 100644 --- a/ports/boost/CONTROL +++ b/ports/boost/CONTROL @@ -1,8 +1,9 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost
-Version: 1.69.0
+Version: 1.70.0
+Homepage: https://boost.org
Description: Peer-reviewed portable C++ source libraries
-Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-parameter, boost-parameter-python (windows), boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!arm), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
+Build-Depends: boost-accumulators, boost-algorithm, boost-align, boost-any, boost-array, boost-asio, boost-assert, boost-assign, boost-atomic, boost-beast, boost-bimap, boost-bind, boost-callable-traits, boost-chrono, boost-circular-buffer, boost-compatibility, boost-compute, boost-concept-check, boost-config, boost-container, boost-container-hash, boost-context (!uwp), boost-contract (!arm), boost-conversion, boost-convert, boost-core, boost-coroutine (!uwp), boost-coroutine2, boost-crc, boost-date-time, boost-detail, boost-disjoint-sets, boost-dll, boost-dynamic-bitset, boost-endian, boost-exception, boost-fiber (windows), boost-filesystem (!uwp), boost-flyweight, boost-foreach, boost-format, boost-function, boost-functional, boost-function-types, boost-fusion, boost-geometry, boost-gil, boost-graph, boost-graph-parallel, boost-hana, boost-heap, boost-histogram, boost-hof, boost-icl, boost-integer, boost-interprocess, boost-intrusive, boost-io, boost-iostreams (!uwp), boost-iterator, boost-lambda, boost-lexical-cast, boost-locale (!uwp), boost-local-function, boost-lockfree, boost-log (!uwp), boost-logic, boost-math, boost-metaparse, boost-move, boost-mp11, boost-mpl, boost-msm, boost-multiprecision, boost-multi-array, boost-multi-index, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-optional, boost-outcome, boost-parameter, boost-parameter-python (windows), boost-phoenix, boost-polygon, boost-poly-collection, boost-pool, boost-predef, boost-preprocessor, boost-process, boost-program-options, boost-property-map, boost-property-tree, boost-proto, boost-ptr-container, boost-python (windows), boost-qvm, boost-random, boost-range, boost-ratio, boost-rational, boost-regex, boost-numeric-conversion, boost-interval, boost-odeint, boost-ublas, boost-safe-numerics, boost-scope-exit, boost-serialization, boost-signals2, boost-smart-ptr, boost-sort, boost-spirit, boost-stacktrace (!uwp), boost-statechart, boost-static-assert, boost-system, boost-test (!uwp), boost-thread (!arm), boost-throw-exception, boost-timer, boost-tokenizer, boost-tti, boost-tuple, boost-typeof, boost-type-erasure (!arm), boost-type-index, boost-type-traits, boost-units, boost-unordered, boost-utility, boost-uuid, boost-variant, boost-vmd, boost-wave (!uwp), boost-winapi, boost-xpressive, boost-yap
Feature: mpi
Description: Build with MPI support
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL index 3961c2ccb..9221e7f66 100644 --- a/ports/botan/CONTROL +++ b/ports/botan/CONTROL @@ -1,3 +1,4 @@ Source: botan -Version: 2.9.0 +Version: 2.9.0-1 +Homepage: https://botan.randombit.net Description: A cryptography library written in C++11 diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 8b9a200d4..4dc02d588 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -10,32 +10,14 @@ vcpkg_from_github( HEAD_REF master ) -set(NUMBER_OF_PROCESSORS "1") -if(DEFINED ENV{NUMBER_OF_PROCESSORS}) - set(NUMBER_OF_PROCESSORS $ENV{NUMBER_OF_PROCESSORS}) -else() - if(APPLE) - set(job_count_command sysctl -n hw.physicalcpu) - else() - set(job_count_command nproc) - endif() - execute_process( - COMMAND ${job_count_command} - OUTPUT_VARIABLE NUMBER_OF_PROCESSORS - ) - string(REPLACE "\n" "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}") - string(REPLACE " " "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}") - if(NOT NUMBER_OF_PROCESSORS) - set(NUMBER_OF_PROCESSORS "1") - endif() -endif() - if(CMAKE_HOST_WIN32) vcpkg_find_acquire_program(JOM) - set(build_tool "${JOM}" /J ${NUMBER_OF_PROCESSORS}) + set(build_tool "${JOM}") + set(parallel_build "/J ${VCPKG_CONCURRENCY}") else() find_program(MAKE make) - set(build_tool "${MAKE}" -j${NUMBER_OF_PROCESSORS}) + set(build_tool "${MAKE}") + set(parallel_build "-j${VCPKG_CONCURRENCY}") endif() vcpkg_find_acquire_program(PYTHON3) @@ -93,7 +75,7 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) --link-method=copy) if(CMAKE_HOST_WIN32) list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX}) - endif() + endif() vcpkg_execute_required_process( COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments} @@ -102,8 +84,9 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}") - vcpkg_execute_required_process( + vcpkg_execute_build_process( COMMAND ${build_tool} + NO_PARALLEL_COMMAND "${build_tool} ${parallel_build}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" LOGNAME build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") diff --git a/ports/box2d/CONTROL b/ports/box2d/CONTROL index 943b1ec94..98f6e2cbd 100644 --- a/ports/box2d/CONTROL +++ b/ports/box2d/CONTROL @@ -1,3 +1,4 @@ Source: box2d
Version: 2.3.1-374664b-2
-Description: Box2D (http://box2d.org) is an open source C++ engine for simulating rigid bodies in 2D.
+Description: An open source C++ engine for simulating rigid bodies in 2D.
+Homepage: https://box2d.org
diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL index 55ca2a8c3..0f6ba1dcb 100644 --- a/ports/breakpad/CONTROL +++ b/ports/breakpad/CONTROL @@ -1,4 +1,5 @@ Source: breakpad
-Version: 2018-09-18 +Version: 2019-05-08 Build-Depends: libdisasm
+Homepage: https://github.com/google/breakpad
Description: a set of client and server components which implement a crash-reporting system.
diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index 18b1b8152..9bab01f23 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/breakpad
- REF 54fa71efbe50fb2b58096d871575b59e12edba6d - SHA512 ecd1c6c5cc0e3984d05fe86ec11172e93b0e31c39ce0af9d0de08b8d03083686e2288e0cd787180c599446c277e58f48550ce4ab718019576c64fc403a592745
+ REF 21b48a72aa50dde84149267f6b7402522b846b24 + SHA512 4ca2f877871c0a79c24ce4cc592dddb3ac4c2eac2a5962dad6d3d94edc91ac82afec3d7e4e7f81e7d9916eb83f8708e66759c38a6ef0e1b2c19691dd1518558a
HEAD_REF master
)
diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL index 1256f920f..aef306101 100644 --- a/ports/brotli/CONTROL +++ b/ports/brotli/CONTROL @@ -1,3 +1,4 @@ Source: brotli
-Version: 1.0.2-4
+Version: 1.0.7
+Homepage: https://github.com/google/brotli
Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index 4a95f89a4..fa0413711 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/brotli - REF v1.0.2 - SHA512 b3ec98159e63b4169dea3e958d60d89247dc1c0f78aab27bfffb2ece659fa024df990d410aa15c12b2082d42e3785e32ec248dce2b116c7f34e98bb6337f9fc9 + REF v1.0.7 + SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a HEAD_REF master PATCHES install.patch ) diff --git a/ports/brynet/CONTROL b/ports/brynet/CONTROL index 9133017a1..5566fad32 100644 --- a/ports/brynet/CONTROL +++ b/ports/brynet/CONTROL @@ -1,4 +1,5 @@ Source: brynet Version: 1.0.2 +Homepage: https://github.com/IronsDu/brynet Description: A C++ cross platform high performance tcp network library, and support SSL/HTTP/Websocket. Build-Depends: openssl diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL index 57270412d..437908356 100644 --- a/ports/bullet3/CONTROL +++ b/ports/bullet3/CONTROL @@ -1,3 +1,4 @@ Source: bullet3
-Version: 2.87-1
+Version: 2.88
+Homepage: https://github.com/bulletphysics/bullet3
Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 6008b2a5f..aef9757a7 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bulletphysics/bullet3 - REF 2.87 - SHA512 649e470223295666eda6f7ff59d03097637c2645b5cd951977060ae14b89f56948ce03e437e83c986d26876f187d7ee34e790bc3882d5d66da9af89a4ab81c21 + REF 2.88 + SHA512 15face1940d496c96fd19a44139d11d2cbb629526c40432be4a0eef5fa9a532c842ec7318248c0359a080f2034111bf1a3c2d3a6fd789bec675bd368fac7bd93 HEAD_REF master ) diff --git a/ports/butteraugli/CONTROL b/ports/butteraugli/CONTROL index 848b5eb82..d210263c3 100644 --- a/ports/butteraugli/CONTROL +++ b/ports/butteraugli/CONTROL @@ -1,4 +1,5 @@ Source: butteraugli
-Version: 2018-02-25-1
+Version: 2019-05-08
+Homepage: https://github.com/google/butteraugli
Description: butteraugli estimates the psychovisual difference between two images
Build-Depends: libpng, libjpeg-turbo
diff --git a/ports/butteraugli/portfile.cmake b/ports/butteraugli/portfile.cmake index b044b1694..a3fb2a19d 100644 --- a/ports/butteraugli/portfile.cmake +++ b/ports/butteraugli/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/butteraugli - REF 856a4da68d02d30e3bf843e33536f2b3a698b249 - SHA512 f02ee97f186b59cc685a63095e5618aedbfebf08ab2cf438189fc4214c7d562506368ec210c08df236132dc2f855b6b0a6226bd6dc27c1c04e9c1b0b0ac4f1df + REF 71b18b636b9c7d1ae0c1d3730b85b3c127eb4511 + SHA512 2e73f8ad8953307eea956ed8bd828e110419d6d9f8a42685d225953d3a8017a79d0701bde0282459dc51198e75a99dcd99dd3c4e7ef065736c512a7b11ea0fdf HEAD_REF master ) diff --git a/ports/byte-lite/CONTROL b/ports/byte-lite/CONTROL new file mode 100644 index 000000000..e16ff8e3c --- /dev/null +++ b/ports/byte-lite/CONTROL @@ -0,0 +1,3 @@ +Source: byte-lite
+Version: 0.2.0
+Description: A C++17-like byte type for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/byte-lite/portfile.cmake b/ports/byte-lite/portfile.cmake new file mode 100644 index 000000000..7fd9f5620 --- /dev/null +++ b/ports/byte-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/byte-lite
+ REF v0.2.0
+ SHA512 eefc730a39453dfc367a4478a84d4825cd85721d3c332a57321d0a5c3040a4d45921603ff24220f968dd21df61acea856ae30db8bae6c1e835a1755fb03c84b7
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBYTE_LITE_OPT_BUILD_TESTS=OFF
+ -DBYTE_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/bzip2/CONTROL b/ports/bzip2/CONTROL index 00995aed9..5f52faad4 100644 --- a/ports/bzip2/CONTROL +++ b/ports/bzip2/CONTROL @@ -1,3 +1,4 @@ Source: bzip2
Version: 1.0.6-4
+Homepage: http://www.bzip.org/
Description: High-quality data compressor.
diff --git a/ports/c-ares/CONTROL b/ports/c-ares/CONTROL index 525bd8985..c8a5f4854 100644 --- a/ports/c-ares/CONTROL +++ b/ports/c-ares/CONTROL @@ -1,4 +1,4 @@ Source: c-ares -Version: 2019-5-2 +Version: 2019-5-2-1 +Homepage: https://github.com/c-ares/c-ares Description: A C library for asynchronous DNS requests -Build-Depends: diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 094b52ff4..6d3769b1c 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -30,7 +30,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/c-ares") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c-ares) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) diff --git a/ports/caf/CONTROL b/ports/caf/CONTROL index 64d42a4da..f4a438357 100644 --- a/ports/caf/CONTROL +++ b/ports/caf/CONTROL @@ -1,4 +1,4 @@ Source: caf
-Version: 0.16.2-1
+Version: 0.16.3 Build-Depends: openssl
Description: an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index 3ee26634c..2e34e888e 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF 2cc4377715afc3d3c35848f9d59b9e6876afd875 - SHA512 7e7962bf5a30122bde8be63f6de0058f865bd890e2d10f4d90f4885b7953467fb6532f69c1a77a35802de7c531f6aac192a2993b53a8dc0b05f503c3f4083a31 + REF 0.16.3 + SHA512 f7e567264ea1686a431eacbf2a62f49c0f4467df073ec983ae622d9417c28124eb456eb40d6a70dbe062ad58333944924f04f7e3fee5a7b76917890d98bedce1 HEAD_REF master PATCHES openssl-version-override.patch diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL index 5cac9b00d..4d72fb764 100644 --- a/ports/caffe2/CONTROL +++ b/ports/caffe2/CONTROL @@ -1,4 +1,5 @@ Source: caffe2
Version: 0.8.1-3
Build-Depends: lmdb, gflags, glog, eigen3, protobuf
+Homepage: https://github.com/caffe2/caffe2
Description: Caffe2 is a lightweight, modular, and scalable deep learning framework.
diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt index a23d776ed..750a9850d 100644 --- a/ports/cairo/CMakeLists.txt +++ b/ports/cairo/CMakeLists.txt @@ -167,9 +167,6 @@ find_package(Freetype REQUIRED) find_package(unofficial-glib CONFIG REQUIRED) find_package(unofficial-fontconfig CONFIG REQUIRED) find_package(unofficial-pixman CONFIG REQUIRED) -if(APPLE) - find_package(Threads REQUIRED) -endif() # Cairo needs to be told which features of FreeType are availible add_definitions( @@ -193,7 +190,11 @@ endif() add_library(cairo ${SOURCES}) -target_link_libraries(cairo PRIVATE gdi32 msimg32 user32 ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig) +target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig) + +if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + target_link_libraries(cairo PRIVATE gdi32 msimg32 user32) +endif() # GObject support module diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL index fd3ce1187..d53d5003d 100644 --- a/ports/cairo/CONTROL +++ b/ports/cairo/CONTROL @@ -1,4 +1,5 @@ Source: cairo -Version: 1.16.0 +Version: 1.16.0-1 +Homepage: https://cairographics.org 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. Build-Depends: zlib, libpng, pixman, glib, freetype, fontconfig diff --git a/ports/cairo/cairo-features.h b/ports/cairo/cairo-features.h index 3a1963974..e3eb31c13 100644 --- a/ports/cairo/cairo-features.h +++ b/ports/cairo/cairo-features.h @@ -5,8 +5,10 @@ */ /* Always for Win32 */ +#ifdef _WIN32 #define CAIRO_HAS_WIN32_SURFACE 1 #define CAIRO_HAS_WIN32_FONT 1 +#endif /* Require libpng */ #define CAIRO_HAS_PNG_FUNCTIONS 1 diff --git a/ports/cairomm/CONTROL b/ports/cairomm/CONTROL index df07bd81d..4705065fc 100644 --- a/ports/cairomm/CONTROL +++ b/ports/cairomm/CONTROL @@ -1,4 +1,5 @@ Source: cairomm
Version: 1.15.3-3
+Homepage: https://www.cairographics.org
Description: A C++ wrapper for the cairo graphics library
Build-Depends: cairo, libsigcpp
diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL index 3014018b9..694469b1f 100644 --- a/ports/capnproto/CONTROL +++ b/ports/capnproto/CONTROL @@ -1,4 +1,5 @@ Source: capnproto -Version: 0.7.0-1 -Description: Data interchange format and capability-based RPC system https://capnproto.org/ +Version: 0.7.0-2 +Description: Data interchange format and capability-based RPC system +Homepage: https://capnproto.org/ Build-Depends: zlib diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index a9916a70a..4043a53c5 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -23,7 +23,7 @@ vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CapnProto") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CapnProto) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/capnproto") @@ -39,4 +39,4 @@ file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/capnp file(RENAME ${CURRENT_PACKAGES_DIR}/share/capnproto/LICENSE ${CURRENT_PACKAGES_DIR}/share/capnproto/copyright) # Disabled for now, see #5630 and #5635 -# vcpkg_test_cmake(PACKAGE_NAME CapnProto)
\ No newline at end of file +# vcpkg_test_cmake(PACKAGE_NAME CapnProto) diff --git a/ports/capstone/CONTROL b/ports/capstone/CONTROL index e7baa3d97..d7d422d25 100644 --- a/ports/capstone/CONTROL +++ b/ports/capstone/CONTROL @@ -1,5 +1,6 @@ Source: capstone Version: 4.0.1-120373dc +Homepage: https://github.com/aquynh/capstone Description: Multi-architecture disassembly framework Feature: arm diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL index 9e22c33b6..bf2916b69 100644 --- a/ports/cartographer/CONTROL +++ b/ports/cartographer/CONTROL @@ -1,4 +1,5 @@ Source: cartographer
-Version: 0.3.0-6
-Build-Depends: ceres[eigensparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
+Version: 1.0.0-1
+Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
+Homepage: https://github.com/googlecartographer/cartographer
Description: Google 2D & 3D SLAM package
diff --git a/ports/cartographer/disable-C2338-cartographer.patch b/ports/cartographer/disable-C2338-cartographer.patch index d43367218..17452622d 100644 --- a/ports/cartographer/disable-C2338-cartographer.patch +++ b/ports/cartographer/disable-C2338-cartographer.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc92e9b..4c1826a 100644
+index 95bb132..fbd624d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -226,7 +226,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
- "${GMOCK_INCLUDE_DIRS}")
- target_link_libraries(${PROJECT_NAME} PUBLIC ${GMOCK_LIBRARY})
+@@ -237,7 +237,7 @@ if(${BUILD_PROMETHEUS})
+ target_compile_definitions(${PROJECT_NAME} PUBLIC USE_PROMETHEUS=1)
+ endif()
-set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
+set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
diff --git a/ports/cartographer/fix-build-error.patch b/ports/cartographer/fix-build-error.patch new file mode 100644 index 000000000..9474c78dc --- /dev/null +++ b/ports/cartographer/fix-build-error.patch @@ -0,0 +1,25 @@ +diff --git a/cartographer/common/internal/testing/thread_pool_for_testing.cc b/cartographer/common/internal/testing/thread_pool_for_testing.cc
+index f804e13..c987f68 100644
+--- a/cartographer/common/internal/testing/thread_pool_for_testing.cc
++++ b/cartographer/common/internal/testing/thread_pool_for_testing.cc
+@@ -16,7 +16,7 @@
+
+ #include "cartographer/common/internal/testing/thread_pool_for_testing.h"
+
+-#include <unistd.h>
++//#include <unistd.h>
+ #include <algorithm>
+ #include <chrono>
+ #include <numeric>
+diff --git a/cartographer/mapping/pose_graph_interface.h b/cartographer/mapping/pose_graph_interface.h
+index 6483ef4..6456720 100644
+--- a/cartographer/mapping/pose_graph_interface.h
++++ b/cartographer/mapping/pose_graph_interface.h
+@@ -18,6 +18,7 @@
+ #define CARTOGRAPHER_MAPPING_POSE_GRAPH_INTERFACE_H_
+
+ #include <vector>
++#include <array>
+
+ #include "cartographer/common/optional.h"
+ #include "cartographer/mapping/id.h"
diff --git a/ports/cartographer/fix-find-packages.patch b/ports/cartographer/fix-find-packages.patch index 19694b704..3ab53bff9 100644 --- a/ports/cartographer/fix-find-packages.patch +++ b/ports/cartographer/fix-find-packages.patch @@ -1,146 +1,181 @@ - CMakeLists.txt | 45 ++++++++++++++++++++++---------------- - cartographer/common/math.h | 4 +++- - cartographer/common/thread_pool.cc | 2 +- - cmake/functions.cmake | 10 ++++----- - 4 files changed, 35 insertions(+), 26 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55e9adc..bc92e9b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,18 +26,23 @@ option(BUILD_GRPC "build Cartographer gRPC support" false) - set(GRPC_PLUGIN_PATH "/usr/local/bin/grpc_cpp_plugin") - - include("${PROJECT_SOURCE_DIR}/cmake/functions.cmake") --google_initialize_cartographer_project() --google_enable_testing() -+#google_initialize_cartographer_project() -+#google_enable_testing() - - find_package(Boost REQUIRED COMPONENTS iostreams) - find_package(Ceres REQUIRED COMPONENTS SparseLinearAlgebraLibrary) - find_package(Eigen3 REQUIRED) --find_package(LuaGoogle REQUIRED) -+find_package(Lua REQUIRED) - find_package(Protobuf 3.0.0 REQUIRED) -+find_package(glog REQUIRED) -+find_package(gflags REQUIRED) - --include(FindPkgConfig) --PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) -- -+#include(FindPkgConfig) -+#PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16) -+if(CMAKE_BUILD_TYPE STREQUAL Debug) -+ set(CAIRO_LIB_SUFFIX d) -+endif() -+find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX}) - # Only build the documentation if we can find Sphinx. - find_package(Sphinx) - if(SPHINX_FOUND) -@@ -144,15 +149,15 @@ configure_file( - ${PROJECT_SOURCE_DIR}/cartographer/common/config.h.cmake - ${PROJECT_BINARY_DIR}/cartographer/common/config.h) - --google_binary(cartographer_autogenerate_ground_truth -- SRCS -- cartographer/ground_truth/autogenerate_ground_truth_main.cc --) -- --google_binary(cartographer_compute_relations_metrics -- SRCS -- cartographer/ground_truth/compute_relations_metrics_main.cc --) -+#google_binary(cartographer_autogenerate_ground_truth -+# SRCS -+# cartographer/ground_truth/autogenerate_ground_truth_main.cc -+#) -+# -+#google_binary(cartographer_compute_relations_metrics -+# SRCS -+# cartographer/ground_truth/compute_relations_metrics_main.cc -+#) - - if(${BUILD_GRPC}) - google_binary(cartographer_grpc_server -@@ -167,7 +172,7 @@ foreach(ABS_FIL ${ALL_TESTS}) - get_filename_component(FIL_WE ${REL_FIL} NAME_WE) - # Replace slashes as required for CMP0037. - string(REPLACE "/" "." TEST_TARGET_NAME "${DIR}/${FIL_WE}") -- google_test("${TEST_TARGET_NAME}" ${ABS_FIL}) -+ #google_test("${TEST_TARGET_NAME}" ${ABS_FIL}) - if(${BUILD_GRPC}) - target_link_libraries("${TEST_TARGET_NAME}" PUBLIC grpc++) - endif() -@@ -190,8 +195,9 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC - target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES}) - - # We expect find_package(Ceres) to have located these for us. --target_link_libraries(${PROJECT_NAME} PUBLIC glog) --target_link_libraries(${PROJECT_NAME} PUBLIC gflags) -+#target_link_libraries(${PROJECT_NAME} PUBLIC glog) -+#target_link_libraries(${PROJECT_NAME} PUBLIC gflags) -+target_link_libraries(${PROJECT_NAME} PUBLIC ${CAIRO_LIBRARY}) - - target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC - "${CAIRO_INCLUDE_DIRS}") -@@ -201,7 +207,8 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC - ${PROTOBUF_INCLUDE_DIR}) - # TODO(hrapp): This should not explicitly list pthread and use - # PROTOBUF_LIBRARIES, but that failed on first try. --target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread) -+#target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread) -+target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY}) - if(${BUILD_GRPC}) - target_link_libraries(${PROJECT_NAME} PUBLIC grpc++) - endif() -diff --git a/cartographer/common/math.h b/cartographer/common/math.h -index f0ae9e2..d32bdbe 100644 ---- a/cartographer/common/math.h -+++ b/cartographer/common/math.h -@@ -16,7 +16,9 @@ - - #ifndef CARTOGRAPHER_COMMON_MATH_H_ - #define CARTOGRAPHER_COMMON_MATH_H_ -- -+ #ifndef M_PI -+ #define M_PI 3.14159265358979323846 -+ #endif - #include <cmath> - #include <vector> - -diff --git a/cartographer/common/thread_pool.cc b/cartographer/common/thread_pool.cc -index fdda166..178472f 100644 ---- a/cartographer/common/thread_pool.cc -+++ b/cartographer/common/thread_pool.cc -@@ -16,7 +16,7 @@ - - #include "cartographer/common/thread_pool.h" - --#include <unistd.h> -+//#include <unistd.h> - #include <algorithm> - #include <chrono> - #include <numeric> -diff --git a/cmake/functions.cmake b/cmake/functions.cmake -index 3bfd343..b41a84e 100644 ---- a/cmake/functions.cmake -+++ b/cmake/functions.cmake -@@ -118,12 +118,12 @@ macro(google_initialize_cartographer_project) - set(LIST_FILES_CMD "find ${PROJECT_SOURCE_DIR}/ -not -iwholename '*.git*' | sort | sed 's/^/#/'") - set(FILES_LIST_PATH "${PROJECT_BINARY_DIR}/AllFiles.cmake") - set(DETECT_CHANGES_CMD "bash" "-c" "${LIST_FILES_CMD} | diff -N -q ${FILES_LIST_PATH} - || ${LIST_FILES_CMD} > ${FILES_LIST_PATH}") -- add_custom_target(${PROJECT_NAME}_detect_changes ALL -- COMMAND ${DETECT_CHANGES_CMD} -- VERBATIM -- ) -+ #add_custom_target(${PROJECT_NAME}_detect_changes ALL -+ # COMMAND ${DETECT_CHANGES_CMD} -+ # VERBATIM -+ #) - if(NOT EXISTS ${FILES_LIST_PATH}) -- execute_process(COMMAND ${DETECT_CHANGES_CMD}) -+ # execute_process(COMMAND ${DETECT_CHANGES_CMD}) - endif() - include(${FILES_LIST_PATH}) - endmacro() +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e3a686..f36f15a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,27 +25,33 @@ option(BUILD_GRPC "build Cartographer gRPC support" false)
+ option(BUILD_PROMETHEUS "build Prometheus monitoring support" false)
+
+ include("${PROJECT_SOURCE_DIR}/cmake/functions.cmake")
+-google_initialize_cartographer_project()
+-google_enable_testing()
++#google_initialize_cartographer_project()
++#google_enable_testing()
+
+ find_package(Boost REQUIRED COMPONENTS iostreams)
+ find_package(Ceres REQUIRED COMPONENTS SuiteSparse)
+ find_package(Eigen3 REQUIRED)
+-find_package(LuaGoogle REQUIRED)
++find_package(Lua REQUIRED)
+ find_package(Protobuf 3.0.0 REQUIRED)
++find_package(glog REQUIRED)
++find_package(gflags REQUIRED)
+
+ if (${BUILD_GRPC})
+ find_package(async_grpc REQUIRED)
+ endif()
+
+-include(FindPkgConfig)
+-PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16)
++#include(FindPkgConfig)
++#PKG_SEARCH_MODULE(CAIRO REQUIRED cairo>=1.12.16)
++if(CMAKE_BUILD_TYPE STREQUAL Debug)
++ set(CAIRO_LIB_SUFFIX d)
++endif()
++find_library(CAIRO_LIBRARY cairo${CAIRO_LIB_SUFFIX})
+
+ # Only build the documentation if we can find Sphinx.
+-find_package(Sphinx)
+-if(SPHINX_FOUND)
+- add_subdirectory("docs")
+-endif()
++#find_package(Sphinx)
++#if(SPHINX_FOUND)
++# add_subdirectory("docs")
++#endif()
+
+ # Install catkin package.xml
+ install(FILES package.xml DESTINATION share/cartographer)
+@@ -169,20 +175,20 @@ configure_file(
+ ${PROJECT_SOURCE_DIR}/cartographer/common/config.h.cmake
+ ${PROJECT_BINARY_DIR}/cartographer/common/config.h)
+
+-google_binary(cartographer_autogenerate_ground_truth
+- SRCS
+- cartographer/ground_truth/autogenerate_ground_truth_main.cc
+-)
+-
+-google_binary(cartographer_compute_relations_metrics
+- SRCS
+- cartographer/ground_truth/compute_relations_metrics_main.cc
+-)
+-
+-google_binary(cartographer_migrate_serialization_format
+- SRCS
+- cartographer/io/migrate_serialization_format_main.cc
+-)
++#google_binary(cartographer_autogenerate_ground_truth
++# SRCS
++# cartographer/ground_truth/autogenerate_ground_truth_main.cc
++#)
++#
++#google_binary(cartographer_compute_relations_metrics
++# SRCS
++# cartographer/ground_truth/compute_relations_metrics_main.cc
++#)
++#
++#google_binary(cartographer_migrate_serialization_format
++# SRCS
++# cartographer/io/migrate_serialization_format_main.cc
++#)
+
+ if(${BUILD_GRPC})
+ google_binary(cartographer_grpc_server
+@@ -213,8 +219,9 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${Boost_LIBRARIES})
+
+ # We expect find_package(Ceres) to have located these for us.
+-target_link_libraries(${PROJECT_NAME} PUBLIC glog)
+-target_link_libraries(${PROJECT_NAME} PUBLIC gflags)
++#target_link_libraries(${PROJECT_NAME} PUBLIC glog)
++#target_link_libraries(${PROJECT_NAME} PUBLIC gflags)
++target_link_libraries(${PROJECT_NAME} PUBLIC ${CAIRO_LIBRARY})
+
+ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
+ "${CAIRO_INCLUDE_DIRS}")
+@@ -224,7 +231,8 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
+ ${PROTOBUF_INCLUDE_DIR})
+ # TODO(hrapp): This should not explicitly list pthread and use
+ # PROTOBUF_LIBRARIES, but that failed on first try.
+-target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread)
++#target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} pthread)
++target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY})
+ if(${BUILD_GRPC})
+ target_link_libraries(${PROJECT_NAME} PUBLIC grpc++)
+ target_link_libraries(${PROJECT_NAME} PUBLIC async_grpc)
+@@ -234,7 +242,7 @@ if(${BUILD_PROMETHEUS})
+ target_compile_definitions(${PROJECT_NAME} PUBLIC USE_PROMETHEUS=1)
+ endif()
+
+-set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
++set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES
+ COMPILE_FLAGS ${TARGET_COMPILE_FLAGS})
+
+@@ -255,7 +263,7 @@ foreach(ABS_FIL ${ALL_TESTS})
+ get_filename_component(FIL_WE ${REL_FIL} NAME_WE)
+ # Replace slashes as required for CMP0037.
+ string(REPLACE "/" "." TEST_TARGET_NAME "${DIR}/${FIL_WE}")
+- google_test("${TEST_TARGET_NAME}" ${ABS_FIL})
++ #google_test("${TEST_TARGET_NAME}" ${ABS_FIL})
+ if(${BUILD_GRPC})
+ target_link_libraries("${TEST_TARGET_NAME}" PUBLIC grpc++)
+ target_link_libraries("${TEST_TARGET_NAME}" PUBLIC async_grpc)
+@@ -263,7 +271,7 @@ foreach(ABS_FIL ${ALL_TESTS})
+ if(${BUILD_PROMETHEUS})
+ target_link_libraries("${TEST_TARGET_NAME}" PUBLIC prometheus-cpp)
+ endif()
+- target_link_libraries("${TEST_TARGET_NAME}" PUBLIC ${TEST_LIB})
++ #target_link_libraries("${TEST_TARGET_NAME}" PUBLIC ${TEST_LIB})
+ endforeach()
+
+ # Add the binary directory first, so that port.h is included after it has
+diff --git a/cartographer/common/math.h b/cartographer/common/math.h
+index c4a77ef..0248f66 100644
+--- a/cartographer/common/math.h
++++ b/cartographer/common/math.h
+@@ -17,6 +17,10 @@
+ #ifndef CARTOGRAPHER_COMMON_MATH_H_
+ #define CARTOGRAPHER_COMMON_MATH_H_
+
++#ifndef M_PI
++#define M_PI 3.14159265358979323846
++#endif
++
+ #include <cmath>
+ #include <vector>
+
+diff --git a/cartographer/common/thread_pool.cc b/cartographer/common/thread_pool.cc
+index bc3c743..db424d1 100644
+--- a/cartographer/common/thread_pool.cc
++++ b/cartographer/common/thread_pool.cc
+@@ -16,7 +16,7 @@
+
+ #include "cartographer/common/thread_pool.h"
+
+-#include <unistd.h>
++//#include <unistd.h>
+ #include <algorithm>
+ #include <chrono>
+ #include <numeric>
+diff --git a/cmake/functions.cmake b/cmake/functions.cmake
+index 3bfd343..3d961b0 100644
+--- a/cmake/functions.cmake
++++ b/cmake/functions.cmake
+@@ -118,12 +118,12 @@ macro(google_initialize_cartographer_project)
+ set(LIST_FILES_CMD "find ${PROJECT_SOURCE_DIR}/ -not -iwholename '*.git*' | sort | sed 's/^/#/'")
+ set(FILES_LIST_PATH "${PROJECT_BINARY_DIR}/AllFiles.cmake")
+ set(DETECT_CHANGES_CMD "bash" "-c" "${LIST_FILES_CMD} | diff -N -q ${FILES_LIST_PATH} - || ${LIST_FILES_CMD} > ${FILES_LIST_PATH}")
+- add_custom_target(${PROJECT_NAME}_detect_changes ALL
+- COMMAND ${DETECT_CHANGES_CMD}
+- VERBATIM
+- )
++ #add_custom_target(${PROJECT_NAME}_detect_changes ALL
++ # COMMAND ${DETECT_CHANGES_CMD}
++ # VERBATIM
++ #)
+ if(NOT EXISTS ${FILES_LIST_PATH})
+- execute_process(COMMAND ${DETECT_CHANGES_CMD})
++ #execute_process(COMMAND ${DETECT_CHANGES_CMD})
+ endif()
+ include(${FILES_LIST_PATH})
+ endmacro()
diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake index 77275fea8..f8b1ddcd8 100644 --- a/ports/cartographer/portfile.cmake +++ b/ports/cartographer/portfile.cmake @@ -5,12 +5,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googlecartographer/cartographer - REF a7ed7e224f98b396762c865b81b62dc3abea2e81 - SHA512 2ab167c1c314591b4916baf70b8ad92ae542986c3578319d2454c904adae10f8027bc696579d6e2864d3606a6711563b82438e847527cad4ab0c2bd603a63eb7 + REF 1.0.0 + SHA512 4e3b38ee40d9758cbd51f087578b82efb7d1199b4b7696d31f45938ac06250caaea2b4d85ccb0a848c958ba187a0101ee95c87323ca236c613995b23b215041c HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-find-packages.patch - ${CMAKE_CURRENT_LIST_DIR}/disable-C2338-cartographer.patch + fix-find-packages.patch + disable-C2338-cartographer.patch + fix-build-error.patch ) vcpkg_configure_cmake( @@ -26,7 +27,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cartographer) +vcpkg_fixup_cmake_targets() vcpkg_copy_pdbs() # Clean diff --git a/ports/casclib/CMakeLists.txt b/ports/casclib/CMakeLists.txt new file mode 100644 index 000000000..4165814f5 --- /dev/null +++ b/ports/casclib/CMakeLists.txt @@ -0,0 +1,74 @@ +cmake_minimum_required(VERSION 3.9)
+project(CascLib)
+
+set(HEADER_FILES
+ src/CascCommon.h
+ src/CascLib.h
+ src/CascLib.def
+ src/CascPort.h
+ src/common/Array.h
+ src/common/Common.h
+ src/common/Csv.h
+ src/common/FileStream.h
+ src/common/FileTree.h
+ src/common/ListFile.h
+ src/common/Map.h
+ src/jenkins/lookup.h
+)
+
+set(SRC_FILES
+ src/CascCommon.cpp
+ src/CascDecompress.cpp
+ src/CascDecrypt.cpp
+ src/CascDumpData.cpp
+ src/CascFiles.cpp
+ src/CascFindFile.cpp
+ src/CascIndexFiles.cpp
+ src/CascOpenFile.cpp
+ src/CascOpenStorage.cpp
+ src/CascReadFile.cpp
+ src/CascRootFile_Diablo3.cpp
+ src/CascRootFile_Install.cpp
+ src/CascRootFile_MNDX.cpp
+ src/CascRootFile_OW.cpp
+ src/CascRootFile_Text.cpp
+ src/CascRootFile_TVFS.cpp
+ src/CascRootFile_WoW.cpp
+ src/common/Common.cpp
+ src/common/Csv.cpp
+ src/common/Directory.cpp
+ src/common/FileStream.cpp
+ src/common/FileTree.cpp
+ src/common/ListFile.cpp
+ src/common/RootHandler.cpp
+ src/jenkins/lookup3.c
+)
+
+set(MD5_FILES
+ src/md5/md5.cpp
+)
+
+set(ZLIB_FILES
+ src/zlib/adler32.c
+ src/zlib/crc32.c
+ src/zlib/inffast.c
+ src/zlib/inflate.c
+ src/zlib/inftrees.c
+ src/zlib/zutil.c
+)
+
+if(WIN32)
+ add_definitions(-DUNICODE -D_UNICODE)
+endif()
+
+add_library(CascLib ${SRC_FILES} ${HEADER_FILES} ${TOMCRYPT_FILES} ${ZLIB_FILES} ${MD5_FILES})
+
+set_target_properties(CascLib PROPERTIES PUBLIC_HEADER "src/CascLib.h;src/CascPort.h")
+
+install(TARGETS CascLib
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ FRAMEWORK DESTINATION /Library/Frameworks
+ PUBLIC_HEADER DESTINATION include
+ INCLUDES DESTINATION include)
\ No newline at end of file diff --git a/ports/casclib/CONTROL b/ports/casclib/CONTROL new file mode 100644 index 000000000..a9a10ac9b --- /dev/null +++ b/ports/casclib/CONTROL @@ -0,0 +1,4 @@ +Source: casclib
+Version: 1.50
+Build-Depends: zlib
+Description: An open-source implementation of library for reading CASC storage from Blizzard games since 2014
\ No newline at end of file diff --git a/ports/casclib/ctype_for_mac.patch b/ports/casclib/ctype_for_mac.patch new file mode 100644 index 000000000..30f790c1f --- /dev/null +++ b/ports/casclib/ctype_for_mac.patch @@ -0,0 +1,27 @@ +diff --git a/src/CascPort.h b/src/CascPort.h
+index 87a2f2f..da74aef 100644
+--- a/src/CascPort.h
++++ b/src/CascPort.h
+@@ -79,14 +79,19 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+- #include <unistd.h>
+ #include <fcntl.h>
+- #include <stdlib.h>
+ #include <dirent.h>
+- #include <errno.h>
++ #include <unistd.h>
+ #include <stddef.h>
++ #include <stdint.h>
++ #include <stdlib.h>
++ #include <stdio.h>
++ #include <stdarg.h>
+ #include <string.h>
++ #include <ctype.h>
++ #include <wchar.h>
+ #include <cassert>
++ #include <errno.h>
+
+ // Support for PowerPC on Max OS X
+ #if (__ppc__ == 1) || (__POWERPC__ == 1) || (_ARCH_PPC == 1)
diff --git a/ports/casclib/portfile.cmake b/ports/casclib/portfile.cmake new file mode 100644 index 000000000..bf17bc545 --- /dev/null +++ b/ports/casclib/portfile.cmake @@ -0,0 +1,23 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO ladislav-zezula/CascLib
+ REF 1.50
+ SHA512 7e95e314f09e504566e6fa2b1742f986d17526fb0283af8ffb77681338c9a852d369cbd863512a20ddd3a277d10a9bf701d745f500a717826dd08e201eb6d80e
+ HEAD_REF master
+ PATCHES
+ ctype_for_mac.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/casclib RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
\ No newline at end of file diff --git a/ports/catch-classic/CONTROL b/ports/catch-classic/CONTROL index af4d6a737..bce6fc106 100644 --- a/ports/catch-classic/CONTROL +++ b/ports/catch-classic/CONTROL @@ -1,5 +1,6 @@ Source: catch-classic Version: 1.12.2 +Homepage: https://github.com/catchorg/Catch2 Description: A modern, header-only test framework for unit tests This is specifically the legacy 1.x branch provided for compatibility with older compilers. diff --git a/ports/catch2/CONTROL b/ports/catch2/CONTROL index c65c51408..1a8c9265d 100644 --- a/ports/catch2/CONTROL +++ b/ports/catch2/CONTROL @@ -1,4 +1,4 @@ Source: catch2 -Version: 2.7.1 +Version: 2.7.2-2 Description: A modern, header-only test framework for unit testing. - Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2 +Homepage: https://github.com/catchorg/Catch2 diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 32121c988..d79098572 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v2.7.1 - SHA512 1566f63122984a8f29645db8e76028ba2559bb4b812f1e15081f79725530effe2ff432b6f61f404dc2b386829004d126b9511053d25a811c017f3102a01608a1 + REF v2.7.2 + SHA512 ac58cb3b676c73a361a494492e7b1f1b85cba7d08feb2d09b2269109a89b66aa37efead6b0a9fca64678f42a3395a3b02b6d461b4cb35310451ce849a79d04ae HEAD_REF master ) @@ -18,7 +18,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2 TARGET_PATH share/catch2) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/cccapstone/CONTROL b/ports/cccapstone/CONTROL index d81c1acda..8681f2328 100644 --- a/ports/cccapstone/CONTROL +++ b/ports/cccapstone/CONTROL @@ -1,4 +1,5 @@ Source: cccapstone -Version: 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e +Version: 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1 +Homepage: https://github.com/zer0mem/cccapstone Description: c++ bindings for capstone disasembly framework Build-Depends: capstone diff --git a/ports/cccapstone/fix-include-path.patch b/ports/cccapstone/fix-include-path.patch new file mode 100644 index 000000000..266308149 --- /dev/null +++ b/ports/cccapstone/fix-include-path.patch @@ -0,0 +1,24 @@ +diff --git a/cppbindings/CsCapstoneHelper.hh b/cppbindings/CsCapstoneHelper.hh
+index daf7a73..8ed5194 100644
+--- a/cppbindings/CsCapstoneHelper.hh
++++ b/cppbindings/CsCapstoneHelper.hh
+@@ -1,6 +1,6 @@
+ #pragma once
+
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ #include <memory>
+
+ struct CS_HANDLE :
+diff --git a/cppbindings/CsIns.hpp b/cppbindings/CsIns.hpp
+index 6e8ba71..c723be9 100644
+--- a/cppbindings/CsIns.hpp
++++ b/cppbindings/CsIns.hpp
+@@ -1,6 +1,6 @@
+ #pragma once
+
+-#include <capstone.h>
++#include <capstone/capstone.h>
+ #include "CsCapstoneHelper.hh"
+
+ //x86_insn_group, x86_reg, x86_op_type, x86_insn
diff --git a/ports/cccapstone/portfile.cmake b/ports/cccapstone/portfile.cmake index 69b8bcef7..d653783c3 100644 --- a/ports/cccapstone/portfile.cmake +++ b/ports/cccapstone/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( REPO zer0mem/cccapstone SHA512 d0023586281f921314dbba501fa2c06d822b1adba0a0c32f30b78628ee935e5822caebe3881a5d1cc4cc696b82a7e348044d887a7f652303359d2853d2ee45fb HEAD_REF master + PATCHES fix-include-path.patch ) file(INSTALL ${SOURCE_PATH}/cppbindings/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/cccapstone/cppbindings) diff --git a/ports/ccd/CONTROL b/ports/ccd/CONTROL index 9246cec90..7820a1455 100644 --- a/ports/ccd/CONTROL +++ b/ports/ccd/CONTROL @@ -1,3 +1,4 @@ Source: ccd -Version: 2.0.0-2 +Version: 2.1-1 +Homepage: https://github.com/danfis/libccd Description: Library for collision detection between two convex shapes diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake index 0ce278220..45674918e 100644 --- a/ports/ccd/portfile.cmake +++ b/ports/ccd/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH REPO danfis/libccd - REF 64f02f741ac94fccd0fb660a5bffcbe6d01d9939 - SHA512 901b09d57e119e4661b3556bbefe5a4d58cb843bff5c76ee3952fe379ff183c878a04e86e6192006c11012309c6e93d42319e9d606abdf7ad723f6d8afeea47f - HEAD_REF master -) + REF v2.1 + SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d + HEAD_REF master +) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} @@ -21,7 +21,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/ccd") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ccd) file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ccd RENAME copyright) diff --git a/ports/ccfits/CONTROL b/ports/ccfits/CONTROL index 5cd10f63d..18937d5e7 100644 --- a/ports/ccfits/CONTROL +++ b/ports/ccfits/CONTROL @@ -1,4 +1,5 @@ Source: ccfits Version: 2.5-2 +Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++. Build-Depends: cfitsio diff --git a/ports/cctz/CONTROL b/ports/cctz/CONTROL index 2934951b4..a223586d6 100644 --- a/ports/cctz/CONTROL +++ b/ports/cctz/CONTROL @@ -1,4 +1,5 @@ Source: cctz
Version: 2.3-2
+Homepage: https://github.com/google/cctz
Build-Depends: benchmark
Description: two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.
diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL index aa90dad66..c9670b14f 100644 --- a/ports/celero/CONTROL +++ b/ports/celero/CONTROL @@ -1,3 +1,4 @@ Source: celero -Version: 2.4.0-1 +Version: 2.5.0-1 +Homepage: https://github.com/DigitalInBlue/Celero Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake index 61dbec10e..a3dd2ad93 100644 --- a/ports/celero/portfile.cmake +++ b/ports/celero/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DigitalInBlue/Celero - REF 9f41c21e35b04d7d65dcb0aff4c962f6e5f2cbc3 - SHA512 62a4803e61cf9e876c09cc68be07d4bfa31f291d3ced23e092347bf43b48086b3ba7862fc454082f42263d9ec0c260e8ba58da5c0c461ebff9c871209784e2a7 + REF 6f24a1d98db4fee41ddd2f615cf490a5b514795a + SHA512 7dc8cecd2aac7bd312bfa01013f290fbfac8a43d07cc0d884e9b446c29a6c233e800f9bd3d03551f6e3b1ee2424cf90571f16590b23fc9333900fcc82143d048 HEAD_REF master ) diff --git a/ports/cereal/CONTROL b/ports/cereal/CONTROL index fc3c7921a..05175d91d 100644 --- a/ports/cereal/CONTROL +++ b/ports/cereal/CONTROL @@ -1,3 +1,4 @@ Source: cereal -Version: 1.2.2-1 +Version: 1.2.2-2 +Homepage: https://github.com/USCiLab/cereal Description: a header-only C++11 serialization library (built in support for binary, XML and JSon) diff --git a/ports/cereal/portfile.cmake b/ports/cereal/portfile.cmake index 47eb76c49..de056150d 100644 --- a/ports/cereal/portfile.cmake +++ b/ports/cereal/portfile.cmake @@ -18,8 +18,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/cmake/cereal") +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cereal) # Clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/ceres/0001_add_missing_include_path.patch b/ports/ceres/0001_add_missing_include_path.patch deleted file mode 100644 index 8bb8dfb50..000000000 --- a/ports/ceres/0001_add_missing_include_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02c72b5..15a947e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -582,7 +582,7 @@ include_directories( - # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS - # used by clients after find_package(Ceres) does not identify Eigen as - # as system headers. --include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS}) -+include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen) - - if (SUITESPARSE) - include_directories(${SUITESPARSE_INCLUDE_DIRS}) diff --git a/ports/ceres/0002_cmakelists_fixes.patch b/ports/ceres/0001_cmakelists_fixes.patch index f806794a8..f269f05ee 100644 --- a/ports/ceres/0002_cmakelists_fixes.patch +++ b/ports/ceres/0001_cmakelists_fixes.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 15a947e..62d8c59 100644 +index 02c72b5..62d8c59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,27 +374,7 @@ if (MINIGLOG) @@ -31,6 +31,15 @@ index 15a947e..62d8c59 100644 endif (MINIGLOG) if (NOT SCHUR_SPECIALIZATIONS) +@@ -582,7 +562,7 @@ include_directories( + # Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS + # used by clients after find_package(Ceres) does not identify Eigen as + # as system headers. +-include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS}) ++include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen) + + if (SUITESPARSE) + include_directories(${SUITESPARSE_INCLUDE_DIRS}) @@ -917,8 +897,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake" DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake" diff --git a/ports/ceres/0004_use_glog_target.patch b/ports/ceres/0002_use_glog_target.patch index 6ca328a8e..6ca328a8e 100644 --- a/ports/ceres/0004_use_glog_target.patch +++ b/ports/ceres/0002_use_glog_target.patch diff --git a/ports/ceres/0005_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch index 5cc41013e..5cc41013e 100644 --- a/ports/ceres/0005_fix_exported_ceres_config.patch +++ b/ports/ceres/0003_fix_exported_ceres_config.patch diff --git a/ports/ceres/0003_remove_unnecessary_cmake_modules.patch b/ports/ceres/0003_remove_unnecessary_cmake_modules.patch deleted file mode 100644 index 698d410b9..000000000 --- a/ports/ceres/0003_remove_unnecessary_cmake_modules.patch +++ /dev/null @@ -1,949 +0,0 @@ -diff --git a/cmake/FindGflags.cmake b/cmake/FindGflags.cmake -deleted file mode 100644 -index 32c04ea..0000000 ---- a/cmake/FindGflags.cmake -+++ /dev/null -@@ -1,591 +0,0 @@ --# Ceres Solver - A fast non-linear least squares minimizer --# Copyright 2015 Google Inc. All rights reserved. --# http://ceres-solver.org/ --# --# 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 Google Inc. 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 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. --# --# Author: alexs.mac@gmail.com (Alex Stewart) --# -- --# FindGflags.cmake - Find Google gflags logging library. --# --# This module will attempt to find gflags, either via an exported CMake --# configuration (generated by gflags >= 2.1 which are built with CMake), or --# by performing a standard search for all gflags components. The order of --# precedence for these two methods of finding gflags is controlled by: --# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION. --# --# This module defines the following variables: --# --# GFLAGS_FOUND: TRUE iff gflags is found. --# GFLAGS_INCLUDE_DIRS: Include directories for gflags. --# GFLAGS_LIBRARIES: Libraries required to link gflags. --# GFLAGS_NAMESPACE: The namespace in which gflags is defined. In versions of --# gflags < 2.1, this was google, for versions >= 2.1 it is --# by default gflags, although can be configured when building --# gflags to be something else (i.e. google for legacy --# compatibility). --# FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION: True iff the version of gflags --# found was built & installed / --# exported as a CMake package. --# --# The following variables control the behaviour of this module when an exported --# gflags CMake configuration is not found. --# --# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION: TRUE/FALSE, iff TRUE then --# then prefer using an exported CMake configuration --# generated by gflags >= 2.1 over searching for the --# gflags components manually. Otherwise (FALSE) --# ignore any exported gflags CMake configurations and --# always perform a manual search for the components. --# Default: TRUE iff user does not define this variable --# before we are called, and does NOT specify either --# GFLAGS_INCLUDE_DIR_HINTS or GFLAGS_LIBRARY_DIR_HINTS --# otherwise FALSE. --# GFLAGS_INCLUDE_DIR_HINTS: List of additional directories in which to --# search for gflags includes, e.g: /timbuktu/include. --# GFLAGS_LIBRARY_DIR_HINTS: List of additional directories in which to --# search for gflags libraries, e.g: /timbuktu/lib. --# --# The following variables are also defined by this module, but in line with --# CMake recommended FindPackage() module style should NOT be referenced directly --# by callers (use the plural variables detailed above instead). These variables --# do however affect the behaviour of the module via FIND_[PATH/LIBRARY]() which --# are NOT re-called (i.e. search for library is not repeated) if these variables --# are set with valid values _in the CMake cache_. This means that if these --# variables are set directly in the cache, either by the user in the CMake GUI, --# or by the user passing -DVAR=VALUE directives to CMake when called (which --# explicitly defines a cache variable), then they will be used verbatim, --# bypassing the HINTS variables and other hard-coded search locations. --# --# GFLAGS_INCLUDE_DIR: Include directory for gflags, not including the --# include directory of any dependencies. --# GFLAGS_LIBRARY: gflags library, not including the libraries of any --# dependencies. -- --# Reset CALLERS_CMAKE_FIND_LIBRARY_PREFIXES to its value when FindGflags was --# invoked, necessary for MSVC. --macro(GFLAGS_RESET_FIND_LIBRARY_PREFIX) -- if (MSVC AND CALLERS_CMAKE_FIND_LIBRARY_PREFIXES) -- set(CMAKE_FIND_LIBRARY_PREFIXES "${CALLERS_CMAKE_FIND_LIBRARY_PREFIXES}") -- endif() --endmacro(GFLAGS_RESET_FIND_LIBRARY_PREFIX) -- --# Called if we failed to find gflags or any of it's required dependencies, --# unsets all public (designed to be used externally) variables and reports --# error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument. --macro(GFLAGS_REPORT_NOT_FOUND REASON_MSG) -- unset(GFLAGS_FOUND) -- unset(GFLAGS_INCLUDE_DIRS) -- unset(GFLAGS_LIBRARIES) -- # Do not use unset, as we want to keep GFLAGS_NAMESPACE in the cache, -- # but simply clear its value. -- set(GFLAGS_NAMESPACE "" CACHE STRING -- "gflags namespace (google or gflags)" FORCE) -- -- # Make results of search visible in the CMake GUI if gflags has not -- # been found so that user does not have to toggle to advanced view. -- mark_as_advanced(CLEAR GFLAGS_INCLUDE_DIR -- GFLAGS_LIBRARY -- GFLAGS_NAMESPACE) -- -- gflags_reset_find_library_prefix() -- -- # Note <package>_FIND_[REQUIRED/QUIETLY] variables defined by FindPackage() -- # use the camelcase library name, not uppercase. -- if (Gflags_FIND_QUIETLY) -- message(STATUS "Failed to find gflags - " ${REASON_MSG} ${ARGN}) -- elseif (Gflags_FIND_REQUIRED) -- message(FATAL_ERROR "Failed to find gflags - " ${REASON_MSG} ${ARGN}) -- else() -- # Neither QUIETLY nor REQUIRED, use no priority which emits a message -- # but continues configuration and allows generation. -- message("-- Failed to find gflags - " ${REASON_MSG} ${ARGN}) -- endif () -- return() --endmacro(GFLAGS_REPORT_NOT_FOUND) -- --# Verify that all variable names passed as arguments are defined (can be empty --# but must be defined) or raise a fatal error. --macro(GFLAGS_CHECK_VARS_DEFINED) -- foreach(CHECK_VAR ${ARGN}) -- if (NOT DEFINED ${CHECK_VAR}) -- message(FATAL_ERROR "Ceres Bug: ${CHECK_VAR} is not defined.") -- endif() -- endforeach() --endmacro(GFLAGS_CHECK_VARS_DEFINED) -- --# Use check_cxx_source_compiles() to compile trivial test programs to determine --# the gflags namespace. This works on all OSs except Windows. If using Visual --# Studio, it fails because msbuild forces check_cxx_source_compiles() to use --# CMAKE_BUILD_TYPE=Debug for the test project, which usually breaks detection --# because MSVC requires that the test project use the same build type as gflags, --# which would normally be built in Release. --# --# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace, --# which is blank (empty string, will test FALSE is CMake conditionals) --# if detection failed. --function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE) -- # Verify that all required variables are defined. -- gflags_check_vars_defined( -- GFLAGS_INCLUDE_DIR GFLAGS_LIBRARY) -- # Ensure that GFLAGS_NAMESPACE is always unset on completion unless -- # we explicitly set if after having the correct namespace. -- set(GFLAGS_NAMESPACE "" PARENT_SCOPE) -- -- include(CheckCXXSourceCompiles) -- # Setup include path & link library for gflags for CHECK_CXX_SOURCE_COMPILES. -- set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR}) -- set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES}) -- # First try the (older) google namespace. Note that the output variable -- # MUST be unique to the build type as otherwise the test is not repeated as -- # it is assumed to have already been performed. -- check_cxx_source_compiles( -- "#include <gflags/gflags.h> -- int main(int argc, char * argv[]) { -- google::ParseCommandLineFlags(&argc, &argv, true); -- return 0; -- }" -- GFLAGS_IN_GOOGLE_NAMESPACE) -- if (GFLAGS_IN_GOOGLE_NAMESPACE) -- set(GFLAGS_NAMESPACE google PARENT_SCOPE) -- return() -- endif() -- -- # Try (newer) gflags namespace instead. Note that the output variable -- # MUST be unique to the build type as otherwise the test is not repeated as -- # it is assumed to have already been performed. -- set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR}) -- set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES}) -- check_cxx_source_compiles( -- "#include <gflags/gflags.h> -- int main(int argc, char * argv[]) { -- gflags::ParseCommandLineFlags(&argc, &argv, true); -- return 0; -- }" -- GFLAGS_IN_GFLAGS_NAMESPACE) -- if (GFLAGS_IN_GFLAGS_NAMESPACE) -- set(GFLAGS_NAMESPACE gflags PARENT_SCOPE) -- return() -- endif (GFLAGS_IN_GFLAGS_NAMESPACE) --endfunction(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE) -- --# Use regex on the gflags headers to attempt to determine the gflags namespace. --# Checks both gflags.h (contained namespace on versions < 2.1.2) and --# gflags_declare.h, which contains the namespace on versions >= 2.1.2. --# In general, this method should only be used when --# GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE() cannot be used, or has --# failed. --# --# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace, --# which is blank (empty string, will test FALSE is CMake conditionals) --# if detection failed. --function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_REGEX) -- # Verify that all required variables are defined. -- gflags_check_vars_defined(GFLAGS_INCLUDE_DIR) -- # Ensure that GFLAGS_NAMESPACE is always undefined on completion unless -- # we explicitly set if after having the correct namespace. -- set(GFLAGS_NAMESPACE "" PARENT_SCOPE) -- -- # Scan gflags.h to identify what namespace gflags was built with. On -- # versions of gflags < 2.1.2, gflags.h was configured with the namespace -- # directly, on >= 2.1.2, gflags.h uses the GFLAGS_NAMESPACE #define which -- # is defined in gflags_declare.h, we try each location in turn. -- set(GFLAGS_HEADER_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h) -- if (NOT EXISTS ${GFLAGS_HEADER_FILE}) -- gflags_report_not_found( -- "Could not find file: ${GFLAGS_HEADER_FILE} " -- "containing namespace information in gflags install located at: " -- "${GFLAGS_INCLUDE_DIR}.") -- endif() -- file(READ ${GFLAGS_HEADER_FILE} GFLAGS_HEADER_FILE_CONTENTS) -- -- string(REGEX MATCH "namespace [A-Za-z]+" -- GFLAGS_NAMESPACE "${GFLAGS_HEADER_FILE_CONTENTS}") -- string(REGEX REPLACE "namespace ([A-Za-z]+)" "\\1" -- GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}") -- -- if (NOT GFLAGS_NAMESPACE) -- gflags_report_not_found( -- "Failed to extract gflags namespace from header file: " -- "${GFLAGS_HEADER_FILE}.") -- endif (NOT GFLAGS_NAMESPACE) -- -- if (GFLAGS_NAMESPACE STREQUAL "google" OR -- GFLAGS_NAMESPACE STREQUAL "gflags") -- # Found valid gflags namespace from gflags.h. -- set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE) -- return() -- endif() -- -- # Failed to find gflags namespace from gflags.h, gflags is likely a new -- # version, check gflags_declare.h, which in newer versions (>= 2.1.2) contains -- # the GFLAGS_NAMESPACE #define, which is then referenced in gflags.h. -- set(GFLAGS_DECLARE_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags_declare.h) -- if (NOT EXISTS ${GFLAGS_DECLARE_FILE}) -- gflags_report_not_found( -- "Could not find file: ${GFLAGS_DECLARE_FILE} " -- "containing namespace information in gflags install located at: " -- "${GFLAGS_INCLUDE_DIR}.") -- endif() -- file(READ ${GFLAGS_DECLARE_FILE} GFLAGS_DECLARE_FILE_CONTENTS) -- -- string(REGEX MATCH "#define GFLAGS_NAMESPACE [A-Za-z]+" -- GFLAGS_NAMESPACE "${GFLAGS_DECLARE_FILE_CONTENTS}") -- string(REGEX REPLACE "#define GFLAGS_NAMESPACE ([A-Za-z]+)" "\\1" -- GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}") -- -- if (NOT GFLAGS_NAMESPACE) -- gflags_report_not_found( -- "Failed to extract gflags namespace from declare file: " -- "${GFLAGS_DECLARE_FILE}.") -- endif (NOT GFLAGS_NAMESPACE) -- -- if (GFLAGS_NAMESPACE STREQUAL "google" OR -- GFLAGS_NAMESPACE STREQUAL "gflags") -- # Found valid gflags namespace from gflags.h. -- set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE) -- return() -- endif() --endfunction(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_REGEX) -- --# Protect against any alternative find_package scripts for this library having --# been called previously (in a client project) which set GFLAGS_FOUND, but not --# the other variables we require / set here which could cause the search logic --# here to fail. --unset(GFLAGS_FOUND) -- --# ----------------------------------------------------------------- --# By default, if the user has expressed no preference for using an exported --# gflags CMake configuration over performing a search for the installed --# components, and has not specified any hints for the search locations, then --# prefer a gflags exported configuration if available. --if (NOT DEFINED GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION -- AND NOT GFLAGS_INCLUDE_DIR_HINTS -- AND NOT GFLAGS_LIBRARY_DIR_HINTS) -- message(STATUS "No preference for use of exported gflags CMake configuration " -- "set, and no hints for include/library directories provided. " -- "Defaulting to preferring an installed/exported gflags CMake configuration " -- "if available.") -- set(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION TRUE) --endif() -- --if (GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION) -- # Try to find an exported CMake configuration for gflags, as generated by -- # gflags versions >= 2.1. -- # -- # We search twice, s/t we can invert the ordering of precedence used by -- # find_package() for exported package build directories, and installed -- # packages (found via CMAKE_SYSTEM_PREFIX_PATH), listed as items 6) and 7) -- # respectively in [1]. -- # -- # By default, exported build directories are (in theory) detected first, and -- # this is usually the case on Windows. However, on OS X & Linux, the install -- # path (/usr/local) is typically present in the PATH environment variable -- # which is checked in item 4) in [1] (i.e. before both of the above, unless -- # NO_SYSTEM_ENVIRONMENT_PATH is passed). As such on those OSs installed -- # packages are usually detected in preference to exported package build -- # directories. -- # -- # To ensure a more consistent response across all OSs, and as users usually -- # want to prefer an installed version of a package over a locally built one -- # where both exist (esp. as the exported build directory might be removed -- # after installation), we first search with NO_CMAKE_PACKAGE_REGISTRY which -- # means any build directories exported by the user are ignored, and thus -- # installed directories are preferred. If this fails to find the package -- # we then research again, but without NO_CMAKE_PACKAGE_REGISTRY, so any -- # exported build directories will now be detected. -- # -- # To prevent confusion on Windows, we also pass NO_CMAKE_BUILDS_PATH (which -- # is item 5) in [1]), to not preferentially use projects that were built -- # recently with the CMake GUI to ensure that we always prefer an installed -- # version if available. -- # -- # [1] http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package -- find_package(gflags QUIET -- NO_MODULE -- NO_CMAKE_PACKAGE_REGISTRY -- NO_CMAKE_BUILDS_PATH) -- if (gflags_FOUND) -- message(STATUS "Found installed version of gflags: ${gflags_DIR}") -- else(gflags_FOUND) -- # Failed to find an installed version of gflags, repeat search allowing -- # exported build directories. -- message(STATUS "Failed to find installed gflags CMake configuration, " -- "searching for gflags build directories exported with CMake.") -- # Again pass NO_CMAKE_BUILDS_PATH, as we know that gflags is exported and -- # do not want to treat projects built with the CMake GUI preferentially. -- find_package(gflags QUIET -- NO_MODULE -- NO_CMAKE_BUILDS_PATH) -- if (gflags_FOUND) -- message(STATUS "Found exported gflags build directory: ${gflags_DIR}") -- endif(gflags_FOUND) -- endif(gflags_FOUND) -- -- set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION ${gflags_FOUND}) -- -- # gflags v2.1 - 2.1.2 shipped with a bug in their gflags-config.cmake [1] -- # whereby gflags_LIBRARIES = "gflags", but there was no imported target -- # called "gflags", they were called: gflags[_nothreads]-[static/shared]. -- # As this causes linker errors when gflags is not installed in a location -- # on the current library paths, detect if this problem is present and -- # fix it. -- # -- # [1] https://github.com/gflags/gflags/issues/110 -- if (gflags_FOUND) -- # NOTE: This is not written as additional conditions in the outer -- # if (gflags_FOUND) as the NOT TARGET "${gflags_LIBRARIES}" -- # condition causes problems if gflags is not found. -- if (${gflags_VERSION} VERSION_LESS 2.1.3 AND -- NOT TARGET "${gflags_LIBRARIES}") -- message(STATUS "Detected broken gflags install in: ${gflags_DIR}, " -- "version: ${gflags_VERSION} <= 2.1.2 which defines gflags_LIBRARIES = " -- "${gflags_LIBRARIES} which is not an imported CMake target, see: " -- "https://github.com/gflags/gflags/issues/110. Attempting to fix by " -- "detecting correct gflags target.") -- # Ordering here expresses preference for detection, specifically we do not -- # want to use the _nothreads variants if the full library is available. -- list(APPEND CHECK_GFLAGS_IMPORTED_TARGET_NAMES -- gflags-shared gflags-static -- gflags_nothreads-shared gflags_nothreads-static) -- foreach(CHECK_GFLAGS_TARGET ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES}) -- if (TARGET ${CHECK_GFLAGS_TARGET}) -- message(STATUS "Found valid gflags target: ${CHECK_GFLAGS_TARGET}, " -- "updating gflags_LIBRARIES.") -- set(gflags_LIBRARIES ${CHECK_GFLAGS_TARGET}) -- break() -- endif() -- endforeach() -- if (NOT TARGET ${gflags_LIBRARIES}) -- message(STATUS "Failed to fix detected broken gflags install in: " -- "${gflags_DIR}, version: ${gflags_VERSION} <= 2.1.2, none of the " -- "imported targets for gflags: ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES} " -- "are defined. Will continue with a manual search for gflags " -- "components. We recommend you build/install a version of gflags > " -- "2.1.2 (or master).") -- set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION FALSE) -- endif() -- endif() -- endif() -- -- if (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION) -- message(STATUS "Detected gflags version: ${gflags_VERSION}") -- set(GFLAGS_FOUND ${gflags_FOUND}) -- set(GFLAGS_INCLUDE_DIR ${gflags_INCLUDE_DIR}) -- set(GFLAGS_LIBRARY ${gflags_LIBRARIES}) -- -- # gflags does not export the namespace in their CMake configuration, so -- # use our function to determine what it should be, as it can be either -- # gflags or google dependent upon version & configuration. -- # -- # NOTE: We use the regex method to determine the namespace here, as -- # check_cxx_source_compiles() will not use imported targets, which -- # is what gflags will be in this case. -- gflags_check_gflags_namespace_using_regex() -- -- if (NOT GFLAGS_NAMESPACE) -- gflags_report_not_found( -- "Failed to determine gflags namespace using regex for gflags " -- "version: ${gflags_VERSION} exported here: ${gflags_DIR} using CMake.") -- endif (NOT GFLAGS_NAMESPACE) -- else (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION) -- message(STATUS "Failed to find an installed/exported CMake configuration " -- "for gflags, will perform search for installed gflags components.") -- endif (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION) --endif(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION) -- --if (NOT GFLAGS_FOUND) -- # Either failed to find an exported gflags CMake configuration, or user -- # told us not to use one. Perform a manual search for all gflags components. -- -- # Handle possible presence of lib prefix for libraries on MSVC, see -- # also GFLAGS_RESET_FIND_LIBRARY_PREFIX(). -- if (MSVC) -- # Preserve the caller's original values for CMAKE_FIND_LIBRARY_PREFIXES -- # s/t we can set it back before returning. -- set(CALLERS_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}") -- # The empty string in this list is important, it represents the case when -- # the libraries have no prefix (shared libraries / DLLs). -- set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "" "${CMAKE_FIND_LIBRARY_PREFIXES}") -- endif (MSVC) -- -- # Search user-installed locations first, so that we prefer user installs -- # to system installs where both exist. -- list(APPEND GFLAGS_CHECK_INCLUDE_DIRS -- /usr/local/include -- /usr/local/homebrew/include # Mac OS X -- /opt/local/var/macports/software # Mac OS X. -- /opt/local/include -- /usr/include) -- list(APPEND GFLAGS_CHECK_PATH_SUFFIXES -- gflags/include # Windows (for C:/Program Files prefix). -- gflags/Include ) # Windows (for C:/Program Files prefix). -- -- list(APPEND GFLAGS_CHECK_LIBRARY_DIRS -- /usr/local/lib -- /usr/local/homebrew/lib # Mac OS X. -- /opt/local/lib -- /usr/lib) -- list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES -- gflags/lib # Windows (for C:/Program Files prefix). -- gflags/Lib ) # Windows (for C:/Program Files prefix). -- -- # Search supplied hint directories first if supplied. -- find_path(GFLAGS_INCLUDE_DIR -- NAMES gflags/gflags.h -- HINTS ${GFLAGS_INCLUDE_DIR_HINTS} -- PATHS ${GFLAGS_CHECK_INCLUDE_DIRS} -- PATH_SUFFIXES ${GFLAGS_CHECK_PATH_SUFFIXES}) -- if (NOT GFLAGS_INCLUDE_DIR OR -- NOT EXISTS ${GFLAGS_INCLUDE_DIR}) -- gflags_report_not_found( -- "Could not find gflags include directory, set GFLAGS_INCLUDE_DIR " -- "to directory containing gflags/gflags.h") -- endif (NOT GFLAGS_INCLUDE_DIR OR -- NOT EXISTS ${GFLAGS_INCLUDE_DIR}) -- -- find_library(GFLAGS_LIBRARY NAMES gflags -- HINTS ${GFLAGS_LIBRARY_DIR_HINTS} -- PATHS ${GFLAGS_CHECK_LIBRARY_DIRS} -- PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES}) -- if (NOT GFLAGS_LIBRARY OR -- NOT EXISTS ${GFLAGS_LIBRARY}) -- gflags_report_not_found( -- "Could not find gflags library, set GFLAGS_LIBRARY " -- "to full path to libgflags.") -- endif (NOT GFLAGS_LIBRARY OR -- NOT EXISTS ${GFLAGS_LIBRARY}) -- -- # gflags typically requires a threading library (which is OS dependent), note -- # that this defines the CMAKE_THREAD_LIBS_INIT variable. If we are able to -- # detect threads, we assume that gflags requires it. -- find_package(Threads QUIET) -- set(GFLAGS_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) -- # On Windows (including MinGW), the Shlwapi library is used by gflags if -- # available. -- if (WIN32) -- include(CheckIncludeFileCXX) -- check_include_file_cxx("shlwapi.h" HAVE_SHLWAPI) -- if (HAVE_SHLWAPI) -- list(APPEND GFLAGS_LINK_LIBRARIES shlwapi.lib) -- endif(HAVE_SHLWAPI) -- endif (WIN32) -- -- # Mark internally as found, then verify. GFLAGS_REPORT_NOT_FOUND() unsets -- # if called. -- set(GFLAGS_FOUND TRUE) -- -- # Identify what namespace gflags was built with. -- if (GFLAGS_INCLUDE_DIR AND NOT GFLAGS_NAMESPACE) -- # To handle Windows peculiarities / CMake bugs on MSVC we try two approaches -- # to detect the gflags namespace: -- # -- # 1) Try to use check_cxx_source_compiles() to compile a trivial program -- # with the two choices for the gflags namespace. -- # -- # 2) [In the event 1) fails] Use regex on the gflags headers to try to -- # determine the gflags namespace. Whilst this is less robust than 1), -- # it does avoid any interaction with msbuild. -- gflags_check_gflags_namespace_using_try_compile() -- -- if (NOT GFLAGS_NAMESPACE) -- # Failed to determine gflags namespace using check_cxx_source_compiles() -- # method, try and obtain it using regex on the gflags headers instead. -- message(STATUS "Failed to find gflags namespace using using " -- "check_cxx_source_compiles(), trying namespace regex instead, " -- "this is expected on Windows.") -- gflags_check_gflags_namespace_using_regex() -- -- if (NOT GFLAGS_NAMESPACE) -- gflags_report_not_found( -- "Failed to determine gflags namespace either by " -- "check_cxx_source_compiles(), or namespace regex.") -- endif (NOT GFLAGS_NAMESPACE) -- endif (NOT GFLAGS_NAMESPACE) -- endif (GFLAGS_INCLUDE_DIR AND NOT GFLAGS_NAMESPACE) -- -- # Make the GFLAGS_NAMESPACE a cache variable s/t the user can view it, and could -- # overwrite it in the CMake GUI. -- set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" CACHE STRING -- "gflags namespace (google or gflags)" FORCE) -- -- # gflags does not seem to provide any record of the version in its -- # source tree, thus cannot extract version. -- -- # Catch case when caller has set GFLAGS_NAMESPACE in the cache / GUI -- # with an invalid value. -- if (GFLAGS_NAMESPACE AND -- NOT GFLAGS_NAMESPACE STREQUAL "google" AND -- NOT GFLAGS_NAMESPACE STREQUAL "gflags") -- gflags_report_not_found( -- "Caller defined GFLAGS_NAMESPACE:" -- " ${GFLAGS_NAMESPACE} is not valid, not google or gflags.") -- endif () -- # Catch case when caller has set GFLAGS_INCLUDE_DIR in the cache / GUI and -- # thus FIND_[PATH/LIBRARY] are not called, but specified locations are -- # invalid, otherwise we would report the library as found. -- if (GFLAGS_INCLUDE_DIR AND -- NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h) -- gflags_report_not_found( -- "Caller defined GFLAGS_INCLUDE_DIR:" -- " ${GFLAGS_INCLUDE_DIR} does not contain gflags/gflags.h header.") -- endif (GFLAGS_INCLUDE_DIR AND -- NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h) -- # TODO: This regex for gflags library is pretty primitive, we use lowercase -- # for comparison to handle Windows using CamelCase library names, could -- # this check be better? -- string(TOLOWER "${GFLAGS_LIBRARY}" LOWERCASE_GFLAGS_LIBRARY) -- if (GFLAGS_LIBRARY AND -- NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*") -- gflags_report_not_found( -- "Caller defined GFLAGS_LIBRARY: " -- "${GFLAGS_LIBRARY} does not match gflags.") -- endif (GFLAGS_LIBRARY AND -- NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*") -- -- gflags_reset_find_library_prefix() -- --endif(NOT GFLAGS_FOUND) -- --# Set standard CMake FindPackage variables if found. --if (GFLAGS_FOUND) -- set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR}) -- set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES}) --endif (GFLAGS_FOUND) -- --# Handle REQUIRED / QUIET optional arguments. --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Gflags DEFAULT_MSG -- GFLAGS_INCLUDE_DIRS GFLAGS_LIBRARIES GFLAGS_NAMESPACE) -- --# Only mark internal variables as advanced if we found gflags, otherwise --# leave them visible in the standard GUI for the user to set manually. --if (GFLAGS_FOUND) -- mark_as_advanced(FORCE GFLAGS_INCLUDE_DIR -- GFLAGS_LIBRARY -- GFLAGS_NAMESPACE -- gflags_DIR) # Autogenerated by find_package(gflags) --endif (GFLAGS_FOUND) -diff --git a/cmake/FindGlog.cmake b/cmake/FindGlog.cmake -deleted file mode 100644 -index 979dced..0000000 ---- a/cmake/FindGlog.cmake -+++ /dev/null -@@ -1,346 +0,0 @@ --# Ceres Solver - A fast non-linear least squares minimizer --# Copyright 2015 Google Inc. All rights reserved. --# http://ceres-solver.org/ --# --# 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 Google Inc. 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 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. --# --# Author: alexs.mac@gmail.com (Alex Stewart) --# -- --# FindGlog.cmake - Find Google glog logging library. --# --# This module defines the following variables: --# --# GLOG_FOUND: TRUE iff glog is found. --# GLOG_INCLUDE_DIRS: Include directories for glog. --# GLOG_LIBRARIES: Libraries required to link glog. --# FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION: True iff the version of glog found --# was built & installed / exported --# as a CMake package. --# --# The following variables control the behaviour of this module: --# --# GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION: TRUE/FALSE, iff TRUE then --# then prefer using an exported CMake configuration --# generated by glog > 0.3.4 over searching for the --# glog components manually. Otherwise (FALSE) --# ignore any exported glog CMake configurations and --# always perform a manual search for the components. --# Default: TRUE iff user does not define this variable --# before we are called, and does NOT specify either --# GLOG_INCLUDE_DIR_HINTS or GLOG_LIBRARY_DIR_HINTS --# otherwise FALSE. --# GLOG_INCLUDE_DIR_HINTS: List of additional directories in which to --# search for glog includes, e.g: /timbuktu/include. --# GLOG_LIBRARY_DIR_HINTS: List of additional directories in which to --# search for glog libraries, e.g: /timbuktu/lib. --# --# The following variables are also defined by this module, but in line with --# CMake recommended FindPackage() module style should NOT be referenced directly --# by callers (use the plural variables detailed above instead). These variables --# do however affect the behaviour of the module via FIND_[PATH/LIBRARY]() which --# are NOT re-called (i.e. search for library is not repeated) if these variables --# are set with valid values _in the CMake cache_. This means that if these --# variables are set directly in the cache, either by the user in the CMake GUI, --# or by the user passing -DVAR=VALUE directives to CMake when called (which --# explicitly defines a cache variable), then they will be used verbatim, --# bypassing the HINTS variables and other hard-coded search locations. --# --# GLOG_INCLUDE_DIR: Include directory for glog, not including the --# include directory of any dependencies. --# GLOG_LIBRARY: glog library, not including the libraries of any --# dependencies. -- --# Reset CALLERS_CMAKE_FIND_LIBRARY_PREFIXES to its value when --# FindGlog was invoked. --macro(GLOG_RESET_FIND_LIBRARY_PREFIX) -- if (MSVC AND CALLERS_CMAKE_FIND_LIBRARY_PREFIXES) -- set(CMAKE_FIND_LIBRARY_PREFIXES "${CALLERS_CMAKE_FIND_LIBRARY_PREFIXES}") -- endif() --endmacro(GLOG_RESET_FIND_LIBRARY_PREFIX) -- --# Called if we failed to find glog or any of it's required dependencies, --# unsets all public (designed to be used externally) variables and reports --# error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument. --macro(GLOG_REPORT_NOT_FOUND REASON_MSG) -- unset(GLOG_FOUND) -- unset(GLOG_INCLUDE_DIRS) -- unset(GLOG_LIBRARIES) -- # Make results of search visible in the CMake GUI if glog has not -- # been found so that user does not have to toggle to advanced view. -- mark_as_advanced(CLEAR GLOG_INCLUDE_DIR -- GLOG_LIBRARY) -- -- glog_reset_find_library_prefix() -- -- # Note <package>_FIND_[REQUIRED/QUIETLY] variables defined by FindPackage() -- # use the camelcase library name, not uppercase. -- if (Glog_FIND_QUIETLY) -- message(STATUS "Failed to find glog - " ${REASON_MSG} ${ARGN}) -- elseif (Glog_FIND_REQUIRED) -- message(FATAL_ERROR "Failed to find glog - " ${REASON_MSG} ${ARGN}) -- else() -- # Neither QUIETLY nor REQUIRED, use no priority which emits a message -- # but continues configuration and allows generation. -- message("-- Failed to find glog - " ${REASON_MSG} ${ARGN}) -- endif () -- return() --endmacro(GLOG_REPORT_NOT_FOUND) -- --# Protect against any alternative find_package scripts for this library having --# been called previously (in a client project) which set GLOG_FOUND, but not --# the other variables we require / set here which could cause the search logic --# here to fail. --unset(GLOG_FOUND) -- --# ----------------------------------------------------------------- --# By default, if the user has expressed no preference for using an exported --# glog CMake configuration over performing a search for the installed --# components, and has not specified any hints for the search locations, then --# prefer a glog exported configuration if available. --if (NOT DEFINED GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION -- AND NOT GLOG_INCLUDE_DIR_HINTS -- AND NOT GLOG_LIBRARY_DIR_HINTS) -- message(STATUS "No preference for use of exported glog CMake configuration " -- "set, and no hints for include/library directories provided. " -- "Defaulting to preferring an installed/exported glog CMake configuration " -- "if available.") -- set(GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION TRUE) --endif() -- --if (GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION) -- # Try to find an exported CMake configuration for glog, as generated by -- # glog versions > 0.3.4 -- # -- # We search twice, s/t we can invert the ordering of precedence used by -- # find_package() for exported package build directories, and installed -- # packages (found via CMAKE_SYSTEM_PREFIX_PATH), listed as items 6) and 7) -- # respectively in [1]. -- # -- # By default, exported build directories are (in theory) detected first, and -- # this is usually the case on Windows. However, on OS X & Linux, the install -- # path (/usr/local) is typically present in the PATH environment variable -- # which is checked in item 4) in [1] (i.e. before both of the above, unless -- # NO_SYSTEM_ENVIRONMENT_PATH is passed). As such on those OSs installed -- # packages are usually detected in preference to exported package build -- # directories. -- # -- # To ensure a more consistent response across all OSs, and as users usually -- # want to prefer an installed version of a package over a locally built one -- # where both exist (esp. as the exported build directory might be removed -- # after installation), we first search with NO_CMAKE_PACKAGE_REGISTRY which -- # means any build directories exported by the user are ignored, and thus -- # installed directories are preferred. If this fails to find the package -- # we then research again, but without NO_CMAKE_PACKAGE_REGISTRY, so any -- # exported build directories will now be detected. -- # -- # To prevent confusion on Windows, we also pass NO_CMAKE_BUILDS_PATH (which -- # is item 5) in [1]), to not preferentially use projects that were built -- # recently with the CMake GUI to ensure that we always prefer an installed -- # version if available. -- # -- # NOTE: We use the NAMES option as glog erroneously uses 'google-glog' as its -- # project name when built with CMake, but exports itself as just 'glog'. -- # On Linux/OS X this does not break detection as the project name is -- # not used as part of the install path for the CMake package files, -- # e.g. /usr/local/lib/cmake/glog, where the <glog> suffix is hardcoded -- # in glog's CMakeLists. However, on Windows the project name *is* -- # part of the install prefix: C:/Program Files/google-glog/[include,lib]. -- # However, by default CMake checks: -- # C:/Program Files/<FIND_PACKAGE_ARGUMENT_NAME='glog'> which does not -- # exist and thus detection fails. Thus we use the NAMES to force the -- # search to use both google-glog & glog. -- # -- # [1] http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package -- find_package(glog QUIET -- NAMES google-glog glog -- NO_MODULE -- NO_CMAKE_PACKAGE_REGISTRY -- NO_CMAKE_BUILDS_PATH) -- if (glog_FOUND) -- message(STATUS "Found installed version of glog: ${glog_DIR}") -- else() -- # Failed to find an installed version of glog, repeat search allowing -- # exported build directories. -- message(STATUS "Failed to find installed glog CMake configuration, " -- "searching for glog build directories exported with CMake.") -- # Again pass NO_CMAKE_BUILDS_PATH, as we know that glog is exported and -- # do not want to treat projects built with the CMake GUI preferentially. -- find_package(glog QUIET -- NAMES google-glog glog -- NO_MODULE -- NO_CMAKE_BUILDS_PATH) -- if (glog_FOUND) -- message(STATUS "Found exported glog build directory: ${glog_DIR}") -- endif(glog_FOUND) -- endif(glog_FOUND) -- -- set(FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION ${glog_FOUND}) -- -- if (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION) -- message(STATUS "Detected glog version: ${glog_VERSION}") -- set(GLOG_FOUND ${glog_FOUND}) -- # glog wraps the include directories into the exported glog::glog target. -- set(GLOG_INCLUDE_DIR "") -- set(GLOG_LIBRARY glog::glog) -- else (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION) -- message(STATUS "Failed to find an installed/exported CMake configuration " -- "for glog, will perform search for installed glog components.") -- endif (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION) --endif(GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION) -- --if (NOT GLOG_FOUND) -- # Either failed to find an exported glog CMake configuration, or user -- # told us not to use one. Perform a manual search for all glog components. -- -- # Handle possible presence of lib prefix for libraries on MSVC, see -- # also GLOG_RESET_FIND_LIBRARY_PREFIX(). -- if (MSVC) -- # Preserve the caller's original values for CMAKE_FIND_LIBRARY_PREFIXES -- # s/t we can set it back before returning. -- set(CALLERS_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}") -- # The empty string in this list is important, it represents the case when -- # the libraries have no prefix (shared libraries / DLLs). -- set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "" "${CMAKE_FIND_LIBRARY_PREFIXES}") -- endif (MSVC) -- -- # Search user-installed locations first, so that we prefer user installs -- # to system installs where both exist. -- list(APPEND GLOG_CHECK_INCLUDE_DIRS -- /usr/local/include -- /usr/local/homebrew/include # Mac OS X -- /opt/local/var/macports/software # Mac OS X. -- /opt/local/include -- /usr/include) -- # Windows (for C:/Program Files prefix). -- list(APPEND GLOG_CHECK_PATH_SUFFIXES -- glog/include -- glog/Include -- Glog/include -- Glog/Include -- google-glog/include # CMake installs with project name prefix. -- google-glog/Include) -- -- list(APPEND GLOG_CHECK_LIBRARY_DIRS -- /usr/local/lib -- /usr/local/homebrew/lib # Mac OS X. -- /opt/local/lib -- /usr/lib) -- # Windows (for C:/Program Files prefix). -- list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES -- glog/lib -- glog/Lib -- Glog/lib -- Glog/Lib -- google-glog/lib # CMake installs with project name prefix. -- google-glog/Lib) -- -- # Search supplied hint directories first if supplied. -- find_path(GLOG_INCLUDE_DIR -- NAMES glog/logging.h -- HINTS ${GLOG_INCLUDE_DIR_HINTS} -- PATHS ${GLOG_CHECK_INCLUDE_DIRS} -- PATH_SUFFIXES ${GLOG_CHECK_PATH_SUFFIXES}) -- if (NOT GLOG_INCLUDE_DIR OR -- NOT EXISTS ${GLOG_INCLUDE_DIR}) -- glog_report_not_found( -- "Could not find glog include directory, set GLOG_INCLUDE_DIR " -- "to directory containing glog/logging.h") -- endif (NOT GLOG_INCLUDE_DIR OR -- NOT EXISTS ${GLOG_INCLUDE_DIR}) -- -- find_library(GLOG_LIBRARY NAMES glog -- HINTS ${GLOG_LIBRARY_DIR_HINTS} -- PATHS ${GLOG_CHECK_LIBRARY_DIRS} -- PATH_SUFFIXES ${GLOG_CHECK_LIBRARY_SUFFIXES}) -- if (NOT GLOG_LIBRARY OR -- NOT EXISTS ${GLOG_LIBRARY}) -- glog_report_not_found( -- "Could not find glog library, set GLOG_LIBRARY " -- "to full path to libglog.") -- endif (NOT GLOG_LIBRARY OR -- NOT EXISTS ${GLOG_LIBRARY}) -- -- # Mark internally as found, then verify. GLOG_REPORT_NOT_FOUND() unsets -- # if called. -- set(GLOG_FOUND TRUE) -- -- # Glog does not seem to provide any record of the version in its -- # source tree, thus cannot extract version. -- -- # Catch case when caller has set GLOG_INCLUDE_DIR in the cache / GUI and -- # thus FIND_[PATH/LIBRARY] are not called, but specified locations are -- # invalid, otherwise we would report the library as found. -- if (GLOG_INCLUDE_DIR AND -- NOT EXISTS ${GLOG_INCLUDE_DIR}/glog/logging.h) -- glog_report_not_found( -- "Caller defined GLOG_INCLUDE_DIR:" -- " ${GLOG_INCLUDE_DIR} does not contain glog/logging.h header.") -- endif (GLOG_INCLUDE_DIR AND -- NOT EXISTS ${GLOG_INCLUDE_DIR}/glog/logging.h) -- # TODO: This regex for glog library is pretty primitive, we use lowercase -- # for comparison to handle Windows using CamelCase library names, could -- # this check be better? -- string(TOLOWER "${GLOG_LIBRARY}" LOWERCASE_GLOG_LIBRARY) -- if (GLOG_LIBRARY AND -- NOT "${LOWERCASE_GLOG_LIBRARY}" MATCHES ".*glog[^/]*") -- glog_report_not_found( -- "Caller defined GLOG_LIBRARY: " -- "${GLOG_LIBRARY} does not match glog.") -- endif (GLOG_LIBRARY AND -- NOT "${LOWERCASE_GLOG_LIBRARY}" MATCHES ".*glog[^/]*") -- -- glog_reset_find_library_prefix() -- --endif(NOT GLOG_FOUND) -- --# Set standard CMake FindPackage variables if found. --if (GLOG_FOUND) -- set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR}) -- set(GLOG_LIBRARIES ${GLOG_LIBRARY}) --endif (GLOG_FOUND) -- --# If we are using an exported CMake glog target, the include directories are --# wrapped into the target itself, and do not have to be (and are not) --# separately specified. In which case, we should not add GLOG_INCLUDE_DIRS --# to the list of required variables in order that glog be reported as found. --if (FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION) -- set(GLOG_REQUIRED_VARIABLES GLOG_LIBRARIES) --else() -- set(GLOG_REQUIRED_VARIABLES GLOG_INCLUDE_DIRS GLOG_LIBRARIES) --endif() -- --# Handle REQUIRED / QUIET optional arguments. --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Glog DEFAULT_MSG -- ${GLOG_REQUIRED_VARIABLES}) -- --# Only mark internal variables as advanced if we found glog, otherwise --# leave them visible in the standard GUI for the user to set manually. --if (GLOG_FOUND) -- mark_as_advanced(FORCE GLOG_INCLUDE_DIR -- GLOG_LIBRARY -- glog_DIR) # Autogenerated by find_package(glog) --endif (GLOG_FOUND) diff --git a/ports/ceres/0004_blas_linux_fix.patch b/ports/ceres/0004_blas_linux_fix.patch new file mode 100644 index 000000000..5fffee5e2 --- /dev/null +++ b/ports/ceres/0004_blas_linux_fix.patch @@ -0,0 +1,22 @@ +diff --git a/internal/ceres/blas.cc b/internal/ceres/blas.cc +index 3ba63bb..071a26e 100644 +--- a/internal/ceres/blas.cc ++++ b/internal/ceres/blas.cc +@@ -33,7 +33,7 @@ + #include "glog/logging.h" + + #ifndef CERES_NO_LAPACK +-extern "C" void dsyrk_(char* uplo, ++extern "C" void dsyrk(char* uplo, + char* trans, + int* n, + int* k, +@@ -64,7 +64,7 @@ void BLAS::SymmetricRankKUpdate(int num_rows, + int k = transpose ? num_rows : num_cols; + int lda = k; + int ldc = n; +- dsyrk_(&uplo, ++ dsyrk(&uplo, + &trans, + &n, + &k, diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL index 3c890ff53..850da31a6 100644 --- a/ports/ceres/CONTROL +++ b/ports/ceres/CONTROL @@ -1,11 +1,11 @@ Source: ceres -Version: 1.14.0-3 -# eigen is always required by CMake, even if it isn't used. +Version: 1.14.0-6 Build-Depends: glog, eigen3 +Homepage: https://github.com/ceres-solver/ceres-solver Description: non-linear optimization package Feature: lapack -Build-Depends: clapack +Build-Depends: clapack (!osx) Description: Use Lapack in Ceres Feature: suitesparse diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 1c52b2d93..66481fc09 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -1,3 +1,5 @@ +include(vcpkg_common_functions) + set(MSVC_USE_STATIC_CRT_VALUE OFF) if(VCPKG_CRT_LINKAGE STREQUAL "static") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -6,7 +8,9 @@ if(VCPKG_CRT_LINKAGE STREQUAL "static") set(MSVC_USE_STATIC_CRT_VALUE ON) endif() -include(vcpkg_common_functions) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(ADDITIONAL_PATCH "0004_blas_linux_fix.patch") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -15,13 +19,18 @@ vcpkg_from_github( SHA512 6dddddf5bd5834332a69add468578ad527e4d94fe85c9751ddf5fe9ad11a34918bdd9c994c49dd6ffc398333d0ac9752ac89aaef1293e2fe0a55524e303d415d HEAD_REF master PATCHES - 0001_add_missing_include_path.patch - 0002_cmakelists_fixes.patch - 0003_remove_unnecessary_cmake_modules.patch - 0004_use_glog_target.patch - 0005_fix_exported_ceres_config.patch + 0001_cmakelists_fixes.patch + 0002_use_glog_target.patch + 0003_fix_exported_ceres_config.patch + ${ADDITIONAL_PATCH} ) +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/FindTBB.cmake) + set(SUITESPARSE OFF) if("suitesparse" IN_LIST FEATURES) set(SUITESPARSE ON) @@ -59,23 +68,21 @@ vcpkg_configure_cmake( -DEIGENSPARSE=${EIGENSPARSE} -DLAPACK=${LAPACK} -DSUITESPARSE=${SUITESPARSE} - -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=ON - -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this. -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE} ) vcpkg_install_cmake() -if(WIN32) - vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib${LIB_SUFFIX}/cmake/Ceres) endif() vcpkg_copy_pdbs() # Changes target search path -if(WIN32) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") 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}") diff --git a/ports/cfitsio/CONTROL b/ports/cfitsio/CONTROL index 7c50b295d..316269f88 100644 --- a/ports/cfitsio/CONTROL +++ b/ports/cfitsio/CONTROL @@ -1,3 +1,4 @@ Source: cfitsio Version: 3.410-2 +Homepage: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c Description: Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index e3131bb20..184d4f221 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,6 +1,7 @@ Source: cgal -Version: 4.14-1 +Version: 4.14-2 Build-Depends: mpfr, mpir, zlib, boost-format, boost-container, boost-iterator, boost-variant, boost-any, boost-unordered, boost-random, boost-foreach, boost-graph, boost-heap, boost-logic, boost-multiprecision +Homepage: https://github.com/CGAL/cgal 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. Feature: qt diff --git a/ports/cgal/cgal_target_fix.patch b/ports/cgal/cgal_target_fix.patch new file mode 100644 index 000000000..2fa5155bb --- /dev/null +++ b/ports/cgal/cgal_target_fix.patch @@ -0,0 +1,49 @@ +From a0bfaee9ebed49fb65c93d7fb00a0c24c1898841 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau <laurent.rineau@cgal.org> +Date: Fri, 10 May 2019 17:31:17 +0200 +Subject: [PATCH 1/2] Consider CGAL as an imported target + +--- + Installation/lib/cmake/CGAL/CGALConfig.cmake | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake +index c2b0aed549d..08d757aad7f 100644 +--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake ++++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake +@@ -116,7 +116,11 @@ include(CGAL_setup_target_dependencies) + foreach(cgal_lib ${CGAL_LIBRARIES}) + set(WITH_${cgal_lib} TRUE) + if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib}) +- add_library(${cgal_lib} INTERFACE) ++ if(CGAL_BUILDING_LIBS) ++ add_library(${cgal_lib} INTERFACE) ++ else() ++ add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL) ++ endif() + if(NOT TARGET CGAL::${cgal_lib}) + add_library(CGAL::${cgal_lib} ALIAS ${cgal_lib}) + endif() + +From c2e8365303b97669fe50ea2427c9943049575be4 Mon Sep 17 00:00:00 2001 +From: Laurent Rineau <laurent.rineau@cgal.org> +Date: Fri, 10 May 2019 17:47:58 +0200 +Subject: [PATCH 2/2] Actually, it can only work with CMake>=3.11 + +--- + Installation/lib/cmake/CGAL/CGALConfig.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake +index 08d757aad7f..8ef95a85c94 100644 +--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake ++++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake +@@ -116,7 +116,7 @@ include(CGAL_setup_target_dependencies) + foreach(cgal_lib ${CGAL_LIBRARIES}) + set(WITH_${cgal_lib} TRUE) + if(${cgal_lib}_FOUND AND NOT TARGET ${cgal_lib}) +- if(CGAL_BUILDING_LIBS) ++ if(CGAL_BUILDING_LIBS OR CMAKE_VERSION VERSION_LESS "3.11") + add_library(${cgal_lib} INTERFACE) + else() + add_library(${cgal_lib} INTERFACE IMPORTED GLOBAL) diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 58199cc54..e152f7b76 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "Cgal's buildsystem uses very long paths and may fail on your system.\n" + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() @@ -13,6 +13,8 @@ vcpkg_from_github( REF releases/CGAL-4.14 SHA512 c70b3ad475f6b2c03ecb540e195b4d26a709205c511b0c705dfddb5b14ef372453ce1d4d49ed342fcd21ba654dea793e91c058afae626276bfb3cfd72bccb382 HEAD_REF master + PATCHES + cgal_target_fix.patch ) set(WITH_CGAL_Qt5 OFF) diff --git a/ports/cgicc/CONTROL b/ports/cgicc/CONTROL index cf25b698d..9e18277a9 100644 --- a/ports/cgicc/CONTROL +++ b/ports/cgicc/CONTROL @@ -1,3 +1,4 @@ Source: cgicc
Version: 3.2.19-1
+Homepage: https://www.gnu.org/software/cgicc/
Description: GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web
diff --git a/ports/cgltf/CONTROL b/ports/cgltf/CONTROL new file mode 100644 index 000000000..4967e5715 --- /dev/null +++ b/ports/cgltf/CONTROL @@ -0,0 +1,3 @@ +Source: cgltf +Version: 2019-04-30 +Description: Single-file glTF 2.0 parser written in C99 diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake new file mode 100644 index 000000000..2d1569196 --- /dev/null +++ b/ports/cgltf/portfile.cmake @@ -0,0 +1,16 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jkuhlmann/cgltf + REF 093ef81bf63ec18ba6d9f61073da8881fb7619b3 + SHA512 8801c13ee98780e845c7d28b27d523af86ab2a49499bbb235ee67a91dfacda3c7fddc9503d91918001a432267f890e82c2204a9c1462c64467034d334b0eadf2 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/cgltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/chaiscript/CONTROL b/ports/chaiscript/CONTROL index 8fbd830d9..fd55e973e 100644 --- a/ports/chaiscript/CONTROL +++ b/ports/chaiscript/CONTROL @@ -1,3 +1,4 @@ Source: chaiscript Version: 6.1.0 +Homepage: https://github.com/ChaiScript/ChaiScript Description: Embedded Scripting Language Designed for C++ diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index 4ad0b3d6e..919391eb6 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,4 @@ Source: chakracore -Version: 1.11.8 +Version: 1.11.9 +Homepage: https://github.com/Microsoft/ChakraCore Description: Core part of the Chakra Javascript engine diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index cfb197560..04b253b15 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore - REF v1.11.8 - SHA512 edfeda3e1ce5aefb0042ffd2b05db512601f1309267eee819b30f407a97acda785d4df5294ef7c1e86579ed86073344fb44a59cd50b0cb014446fbf855620733 + REF v1.11.9 + SHA512 4703e28f04925074bfc2057dcccee0427aacdd48f7b9f715d08a9385e4de9e804e1620cd49e8b3db7cd330d00ecd374bfaa3205dbe1f3cfce51ed0eea439a55e HEAD_REF master ) diff --git a/ports/charls/CONTROL b/ports/charls/CONTROL index 562a6f688..00f6777a4 100644 --- a/ports/charls/CONTROL +++ b/ports/charls/CONTROL @@ -1,3 +1,4 @@ Source: charls Version: 2.0.0-1 +Homepage: https://github.com/team-charls/charls Description: CharLS, a C++ JPEG-LS library implementation. diff --git a/ports/chipmunk/CONTROL b/ports/chipmunk/CONTROL index 64b66067b..0a4d6a62f 100644 --- a/ports/chipmunk/CONTROL +++ b/ports/chipmunk/CONTROL @@ -1,3 +1,4 @@ Source: chipmunk Version: 7.0.2 +Homepage: https://github.com/slembcke/Chipmunk2D Description: A fast and lightweight 2D game physics library.
\ No newline at end of file diff --git a/ports/chmlib/CONTROL b/ports/chmlib/CONTROL index 32c86554e..cde69a41e 100644 --- a/ports/chmlib/CONTROL +++ b/ports/chmlib/CONTROL @@ -1,3 +1,4 @@ Source: chmlib
Version: 0.40-3
+Homepage: https://www.jedrea.com/chmlib/
Description: CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.
diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL index 26237ad3d..93a2e4ee7 100644 --- a/ports/cimg/CONTROL +++ b/ports/cimg/CONTROL @@ -1,3 +1,4 @@ Source: cimg -Version: 2.5.7 +Version: 2.6.2 +Homepage: https://github.com/dtschump/CImg Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake index c0e5a81fc..0d168fa11 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "dtschump/CImg" - REF v.2.5.7 + REF v.2.6.2 HEAD_REF master - SHA512 d74dd4d8996ab11a6c872450b2c3f37d3d6699d06c77894c8943829c305678e459a740688d9fae251b23e34fc264fea3948b77d5c7a6ff1d0e908003bc963b90) + SHA512 6571c646c2d1c007212b3c8cd6794ff1722a0ffc4fcbbe26499cf1e74d3490e893cac5868c5b513602b336b5609316cd7f67c2e1f89b04fe79df5f93b9c6be7a) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL new file mode 100644 index 000000000..7029313e3 --- /dev/null +++ b/ports/cjson/CONTROL @@ -0,0 +1,6 @@ +Source: cjson
+Version: 1.7.10-1
+Description: Ultralightweight JSON parser in ANSI C
+
+Feature: utils
+Description: Enable building the cJSON_Utils library
diff --git a/ports/cjson/fix-install-path.patch b/ports/cjson/fix-install-path.patch new file mode 100644 index 000000000..96a65d996 --- /dev/null +++ b/ports/cjson/fix-install-path.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 033a882..6e2b2e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,7 +149,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson.pc.in" + + install(FILES cJSON.h DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/cjson") + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcjson.pc" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") +-install(TARGETS "${CJSON_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_LIB}") ++install(TARGETS "${CJSON_LIB}" ++ EXPORT "${CJSON_LIB}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" ++) + if (BUILD_SHARED_AND_STATIC_LIBS) + install(TARGETS "${CJSON_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") + endif() +@@ -186,7 +192,13 @@ if(ENABLE_CJSON_UTILS) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/library_config/libcjson_utils.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/libcjson_utils.pc" @ONLY) + +- install(TARGETS "${CJSON_UTILS_LIB}" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" EXPORT "${CJSON_UTILS_LIB}") ++ install(TARGETS "${CJSON_UTILS_LIB}" ++ EXPORT "${CJSON_UTILS_LIB}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}" ++ ) + if (BUILD_SHARED_AND_STATIC_LIBS) + install(TARGETS "${CJSON_UTILS_LIB}-static" DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") + endif() diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake new file mode 100644 index 000000000..7db22d9ae --- /dev/null +++ b/ports/cjson/portfile.cmake @@ -0,0 +1,63 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO DaveGamble/cJSON
+ REF v1.7.10
+ SHA512 f8d7c9fe798b51ec3c69cabe4124d2f6372f0e6d282285e3ca951c58c971a9a520d87550530d750ff7f8055c0b6ff566f237b9af9eb345cf4f4fc4ff8c910740
+ HEAD_REF master
+ PATCHES
+ fix-install-path.patch
+)
+
+if("utils" IN_LIST FEATURES)
+ set(ENABLE_CJSON_UTILS ON)
+else()
+ set(ENABLE_CJSON_UTILS OFF)
+endif()
+
+if(CMAKE_HOST_WIN32)
+ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_PUBLIC_SYMBOLS)
+else()
+ set(ENABLE_PUBLIC_SYMBOLS OFF)
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_SHARED_AND_STATIC_LIBS=OFF
+ -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF
+ -DENABLE_PUBLIC_SYMBOLS=${ENABLE_PUBLIC_SYMBOLS}
+ -DENABLE_TARGET_EXPORT=ON # Export CMake config files
+ -DENABLE_CJSON_UTILS=${ENABLE_CJSON_UTILS}
+ -DENABLE_CJSON_TEST=OFF
+ -DENABLE_FUZZING=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cJSON)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug/include
+ ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+file(READ ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h _contents)
+if(ENABLE_PUBLIC_SYMBOLS)
+ string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "0 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
+ string(REPLACE "defined(CJSON_EXPORT_SYMBOLS)" "0 /* defined(CJSON_EXPORT_SYMBOLS) */" _contents "${_contents}")
+ string(REPLACE "defined(CJSON_IMPORT_SYMBOLS)" "1 /* defined(CJSON_IMPORT_SYMBOLS) */" _contents "${_contents}")
+else()
+ string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "1 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}")
+endif()
+file(WRITE ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h "${_contents}")
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/clapack/CONTROL b/ports/clapack/CONTROL index 1a862a113..2b5d137fc 100644 --- a/ports/clapack/CONTROL +++ b/ports/clapack/CONTROL @@ -1,4 +1,5 @@ Source: clapack -Version: 3.2.1-4 +Version: 3.2.1-9 +Homepage: https://www.netlib.org/clapack Description: CLAPACK (f2c'ed version of LAPACK) Build-Depends: openblas (!osx) diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake new file mode 100644 index 000000000..002218eb8 --- /dev/null +++ b/ports/clapack/FindLAPACK.cmake @@ -0,0 +1,237 @@ +#.rst: +# clapack config for vcpkg +# ------------ +# +# Find the clapack includes and library. +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# This script defines the following variables: +# +# ``CLAPACK_FOUND`` +# True if clapack library found +# +# ``CLAPACK_VERSION`` +# Containing the clapack version tag (manually defined) +# +# ``CLAPACK_INCLUDE_DIR`` +# Location of clapack headers +# +# ``CLAPACK_LIBRARY`` +# List of libraries to link with when using clapack +# +# Result Targets +# ^^^^^^^^^^^^^^ +# +# This script defines the following targets: +# +# ``clapack::clapack`` +# Target to use clapack +# +# Compatibility Variables +# ^^^^^^^^^^^^^^^^^^^^^^^ +# +# This script defines the following variables for compatibility reasons: +# +# ``F2C_FOUND`` +# True if f2c (fortran-to-c wrap layer) library found +# +# ``F2C_INCLUDE_DIR`` +# Location of clapack headers +# +# ``F2C_LIBRARY`` +# Library containing the fortran-to-c wrap layer, necessary for clapack and automatically included when used +# +# ``LAPACK_FOUND`` +# True if clapack library found +# +# ``LAPACK_VERSION`` +# Containing the clapack version tag (manually defined) +# +# ``LAPACK_INCLUDE_DIR`` +# Location of clapack headers +# +# ``LAPACK_LIBRARY`` +# List of libraries to link with when using clapack +# +# Compatibility Targets +# ^^^^^^^^^^^^^^ +# +# This script defines the following targets for compatibility reasons: +# +# ``lapack`` +# Target to use lapack + +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) +include(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake) +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake) + +set(CLAPACK_VERSION "3.2.1") + +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +find_dependency(Threads) + +if(UNIX) + find_library(ADDITIONAL_LAPACK_LIBRARY m) + set(PTHREAD_LINK_NAME "-pthread") +endif() + +if(NOT F2C_LIBRARY) + find_library(F2C_LIBRARY_RELEASE NAMES f2c libf2c) + find_library(F2C_LIBRARY_DEBUG NAMES f2cd libf2cd) + select_library_configurations(F2C) + + #keep a list of "pure" f2c libs, without dependencies + set(oF2C_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE}) + set(oF2C_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG}) + set(oF2C_LIBRARY ${F2C_LIBRARY}) + + list(APPEND F2C_LIBRARY ${ADDITIONAL_LAPACK_LIBRARY}) +endif() + +if(NOT LAPACK_LIBRARY) + find_library(LAPACK_LIBRARY_RELEASE NAMES lapack) + find_library(LAPACK_LIBRARY_DEBUG NAMES lapackd) + + #keep a list of "pure" lapack libs, without dependencies + set(oLAPACK_LIBRARY_RELEASE ${LAPACK_LIBRARY_RELEASE}) + set(oLAPACK_LIBRARY_DEBUG ${LAPACK_LIBRARY_DEBUG}) + select_library_configurations(oLAPACK) + + list(APPEND LAPACK_LIBRARY_RELEASE ${F2C_LIBRARY_RELEASE}) + list(APPEND LAPACK_LIBRARY_DEBUG ${F2C_LIBRARY_DEBUG}) + + find_dependency(BLAS) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_RELEASE) + if(NOT _loc) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_RELEASE) + endif() + set(LAPACK_BLAS_LIBRARY_RELEASE ${_loc}) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_DEBUG) + if(NOT _loc) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_DEBUG) + endif() + set(LAPACK_BLAS_LIBRARY_DEBUG ${_loc}) + select_library_configurations(LAPACK_BLAS) + list(APPEND LAPACK_LIBRARY_RELEASE ${LAPACK_BLAS_LIBRARY_RELEASE}) + list(APPEND LAPACK_LIBRARY_DEBUG ${LAPACK_BLAS_LIBRARY_DEBUG}) + + select_library_configurations(LAPACK) + list(APPEND LAPACK_LIBRARY Threads::Threads) +endif() + +if(NOT F2C_INCLUDE_DIR) + find_path(F2C_INCLUDE_DIR NAMES f2c.h) +endif() + +if(NOT LAPACK_INCLUDE_DIR) + find_path(LAPACK_INCLUDE_DIR NAMES clapack.h) +endif() + +list(APPEND LAPACK_INCLUDE_DIR ${F2C_INCLUDE_DIR}) +set(LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(LAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(CLAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(CLAPACK_INCLUDE_DIRS "${LAPACK_INCLUDE_DIR}" CACHE PATH "" FORCE) +set(F2C_INCLUDE_DIRS "${F2C_INCLUDE_DIR}" CACHE PATH "" FORCE) + +set(LAPACK_DLL_DIR ${LAPACK_INCLUDE_DIR}) +list(TRANSFORM LAPACK_DLL_DIR APPEND "/../bin") +message(STATUS "LAPACK_DLL_DIR: ${LAPACK_DLL_DIR}") + +if(WIN32) + find_file(LAPACK_LIBRARY_RELEASE_DLL NAMES lapack.dll PATHS ${LAPACK_DLL_DIR}) + find_file(LAPACK_LIBRARY_DEBUG_FOLDER NAMES lapackd.dll PATHS ${LAPACK_DLL_DIR}) + find_file(F2C_LIBRARY_RELEASE_DLL NAMES f2c.dll libf2c.dll PATHS ${LAPACK_DLL_DIR}) + find_file(F2C_LIBRARY_DEBUG_DLL NAMES f2cd.dll libf2cd.dll PATHS ${LAPACK_DLL_DIR}) +endif() + +set(LAPACK_BLAS_LIBRARY "${LAPACK_BLAS_LIBRARY}" CACHE STRING "" FORCE) +set(F2C_LIBRARIES "${F2C_LIBRARY}" CACHE STRING "" FORCE) +set(LAPACK_VERSION "${CLAPACK_VERSION}" CACHE STRING "" FORCE) +set(LAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) +set(CLAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) +set(CLAPACK_LIBRARIES "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) + +set(LAPACK_LIBRARY "${LAPACK_LIBRARY}" CACHE STRING "" FORCE) +set(F2C_LIBRARY "${F2C_LIBRARY}" CACHE STRING "" FORCE) +set(LAPACK_LIBRARY_RELEASE "${LAPACK_LIBRARY_RELEASE}" CACHE STRING "" FORCE) +set(LAPACK_LIBRARY_DEBUG "${LAPACK_LIBRARY_DEBUG}" CACHE STRING "" FORCE) +set(F2C_LIBRARY_RELEASE "${F2C_LIBRARY_RELEASE}" CACHE STRING "" FORCE) +set(F2C_LIBRARY_DEBUG "${F2C_LIBRARY_DEBUG}" CACHE STRING "" FORCE) + +find_package_handle_standard_args(CLAPACK DEFAULT_MSG CLAPACK_LIBRARY CLAPACK_INCLUDE_DIR) +mark_as_advanced(CLAPACK_INCLUDE_DIR CLAPACK_LIBRARY) + +find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARY LAPACK_INCLUDE_DIR) +mark_as_advanced(LAPACK_INCLUDE_DIR LAPACK_LIBRARY) + +find_package_handle_standard_args(F2C DEFAULT_MSG F2C_LIBRARY F2C_INCLUDE_DIR) +mark_as_advanced(F2C_INCLUDE_DIR F2C_LIBRARY) + +#TARGETS +if(CLAPACK_FOUND AND NOT TARGET clapack::clapack) + if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") + add_library(clapack::clapack SHARED IMPORTED) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") + set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + else() + add_library(clapack::clapack UNKNOWN IMPORTED) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG}") + set_property(TARGET clapack::clapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(clapack::clapack PROPERTIES + IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + endif() +endif() + +if(CLAPACK_FOUND AND NOT TARGET lapack) + if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") + add_library(lapack SHARED IMPORTED) + set_target_properties(lapack PROPERTIES + IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + INTERFACE_LINK_LIBRARIES "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") + set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(lapack PROPERTIES + IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + else() + add_library(lapack UNKNOWN IMPORTED) + set_target_properties(lapack PROPERTIES + IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + INTERFACE_LINK_LIBRARIES "$<$<NOT:$<CONFIG:DEBUG>>:${oF2C_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${oF2C_LIBRARY_DEBUG}>;$<$<NOT:$<CONFIG:DEBUG>>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$<CONFIG:DEBUG>:${LAPACK_BLAS_LIBRARY_DEBUG}>;$<LINK_ONLY:${ADDITIONAL_LAPACK_LIBRARY}>;$<LINK_ONLY:${PTHREAD_LINK_NAME}>" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + if(EXISTS "${LAPACK_LIBRARY_DEBUG}") + set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(lapack PROPERTIES + IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") + endif() + endif() +endif() diff --git a/ports/clapack/enable_openblas_compat.patch b/ports/clapack/enable_openblas_compat.patch new file mode 100644 index 000000000..319935475 --- /dev/null +++ b/ports/clapack/enable_openblas_compat.patch @@ -0,0 +1,112 @@ +diff --git a/INCLUDE/blaswrap.h b/INCLUDE/blaswrap.h +index 333a17a..fb6750a 100644 +--- a/INCLUDE/blaswrap.h ++++ b/INCLUDE/blaswrap.h +@@ -155,6 +155,107 @@ + #define ctrsm_ f2c_ctrsm + #define ztrsm_ f2c_ztrsm + ++#else ++ ++#define sswap_ sswap ++#define saxpy_ saxpy ++#define sasum_ sasum ++#define isamax_ isamax ++#define scopy_ scopy ++#define sscal_ sscal ++#define sger_ sger ++#define snrm2_ snrm2 ++#define ssymv_ ssymv ++#define sdot_ sdot ++#define saxpy_ saxpy ++#define ssyr2_ ssyr2 ++#define srot_ srot ++#define sgemv_ sgemv ++#define strsv_ strsv ++#define sgemm_ sgemm ++#define strsm_ strsm ++ ++#define dswap_ dswap ++#define daxpy_ daxpy ++#define dasum_ dasum ++#define idamax_ idamax ++#define dcopy_ dcopy ++#define dscal_ dscal ++#define dger_ dger ++#define dnrm2_ dnrm2 ++#define dsymv_ dsymv ++#define ddot_ ddot ++#define dsyr2_ dsyr2 ++#define drot_ drot ++#define dgemv_ dgemv ++#define dtrsv_ dtrsv ++#define dgemm_ dgemm ++#define dtrsm_ dtrsm ++ ++#define cswap_ cswap ++#define caxpy_ caxpy ++#define scasum_ scasum ++#define icamax_ icamax ++#define ccopy_ ccopy ++#define cscal_ cscal ++#define scnrm2_ scnrm2 ++#define cgemv_ cgemv ++#define ctrsv_ ctrsv ++#define cgemm_ cgemm ++#define ctrsm_ ctrsm ++#define cgerc_ cgerc ++#define chemv_ chemv ++#define cher2_ cher2 ++ ++#define zswap_ zswap ++#define zaxpy_ zaxpy ++#define dzasum_ dzasum ++#define izamax_ izamax ++#define zcopy_ zcopy ++#define zscal_ zscal ++#define dznrm2_ dznrm2 ++#define zgemv_ zgemv ++#define ztrsv_ ztrsv ++#define zgemm_ zgemm ++#define ztrsm_ ztrsm ++#define zgerc_ zgerc ++#define zhemv_ zhemv ++#define zher2_ zher2 ++ ++/* LAPACK */ ++#define dlacon_ dlacon ++#define slacon_ slacon ++#define icmax1_ icmax1 ++#define scsum1_ scsum1 ++#define clacon_ clacon ++#define dzsum1_ dzsum1 ++#define izmax1_ izmax1 ++#define zlacon_ zlacon ++ ++/* Fortran interface */ ++#define c_bridge_dgssv_ c_bridge_dgssv ++#define c_fortran_sgssv_ c_fortran_sgssv ++#define c_fortran_dgssv_ c_fortran_dgssv ++#define c_fortran_cgssv_ c_fortran_cgssv ++#define c_fortran_zgssv_ c_fortran_zgssv ++ ++#define cdotc_ cdotc ++#define cdotu_ cdotu ++#define csscal_ csscal ++#define zdscal_ zdscal ++#define zdotc_ zdotc ++#define zdotu_ zdotu ++#define ctrmm_ ctrmm ++#define dtrmm_ dtrmm ++#define strmm_ strmm ++#define ztrmm_ ztrmm ++#define cgeru_ cgeru ++#define zgeru_ zgeru ++#define xerbla_ xerbla ++#define dtrmv_ dtrmv ++#define dsyrk_ dsyrk ++#define zherk_ zherk ++ + #endif /* NO_BLAS_WRAP */ + + #endif /* __BLASWRAP_H */ diff --git a/ports/clapack/fix-lack-library.patch b/ports/clapack/fix-lack-library.patch deleted file mode 100644 index 8e9bd5178..000000000 --- a/ports/clapack/fix-lack-library.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt -index ca1473f..fa54e94 100644 ---- a/F2CLIBS/libf2c/CMakeLists.txt -+++ b/F2CLIBS/libf2c/CMakeLists.txt -@@ -63,3 +63,13 @@ if(UNIX) - target_link_libraries(f2c m) - endif() - set_property(TARGET f2c PROPERTY PREFIX lib) -+install(TARGETS f2c -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ -+install(TARGETS arithchk -+ RUNTIME DESTINATION tools -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ diff --git a/ports/clapack/fix-linux-build.patch b/ports/clapack/fix-linux-build.patch deleted file mode 100644 index 230fa9bf6..000000000 --- a/ports/clapack/fix-linux-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8c53def..9e0e398 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,10 +1,10 @@ - cmake_minimum_required(VERSION 2.6) - project(CLAPACK C) --enable_testing() -+#enable_testing() - include(CTest) - - # BLAS_LIBRARIES --find_package(BLAS REQUIRED) -+find_package(OpenBLAS REQUIRED) - - if(WIN32 AND NOT CYGWIN) - set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) -@@ -14,7 +14,7 @@ else() - set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c) - set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c) - endif() --enable_testing() -+#enable_testing() - option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF) - if(NOT USE_BLAS_WRAP) - # _zrotg_ seems to be missing in the wrap header -@@ -25,7 +25,7 @@ add_subdirectory(F2CLIBS) - - # add_subdirectory(BLAS) - add_subdirectory(SRC) --add_subdirectory(TESTING) -+#add_subdirectory(TESTING) - set(CLAPACK_VERSION 3.2.1) - set(CPACK_PACKAGE_VERSION_MAJOR 3) - set(CPACK_PACKAGE_VERSION_MINOR 2) -@@ -38,6 +38,6 @@ include(CPack) - # ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) - - install(FILES -- ${CMAKE_CURRENT_LIST_DIR}/include/clapack.h -- ${CMAKE_CURRENT_LIST_DIR}/include/f2c.h -- DESTINATION include) -\ No newline at end of file -+ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/clapack.h -+ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/f2c.h -+ DESTINATION include) diff --git a/ports/clapack/lapack.def b/ports/clapack/lapack.def deleted file mode 100644 index e2070d99b..000000000 --- a/ports/clapack/lapack.def +++ /dev/null @@ -1,1453 +0,0 @@ -EXPORTS -sgbbrd_ -sgbcon_ -sgbequ_ -sgbrfs_ -sgbsv_ -sgbsvx_ -sgbtf2_ -sgbtrf_ -sgbtrs_ -sgebak_ -sgebal_ -sgebd2_ -sgebrd_ -sgecon_ -sgeequ_ -sgees_ -sgeesx_ -sgeev_ -sgeevx_ -sgegs_ -sgegv_ -sgehd2_ -sgehrd_ -sgelq2_ -sgelqf_ -sgels_ -sgelsd_ -sgelss_ -sgelsx_ -sgelsy_ -sgeql2_ -sgeqlf_ -sgeqp3_ -sgeqpf_ -sgeqr2_ -sgeqrf_ -sgerfs_ -sgerq2_ -sgerqf_ -sgesc2_ -sgesdd_ -sgesv_ -sgesvd_ -sgesvx_ -sgetc2_ -sgetf2_ -sgetrf_ -sgetri_ -sgetrs_ -sggbak_ -sggbal_ -sgges_ -sggesx_ -sggev_ -sggevx_ -sggglm_ -sgghrd_ -sgglse_ -sggqrf_ -sggrqf_ -sggsvd_ -sggsvp_ -sgtcon_ -sgtrfs_ -sgtsv_ -sgtsvx_ -sgttrf_ -sgttrs_ -sgtts2_ -shgeqz_ -shsein_ -shseqr_ -slabrd_ -slacon_ -slacn2_ -slaein_ -slaexc_ -slag2_ -slags2_ -slagtm_ -slagv2_ -slahqr_ -slahrd_ -slahr2_ -slaic1_ -slaln2_ -slals0_ -slalsa_ -slalsd_ -slangb_ -slange_ -slangt_ -slanhs_ -slansb_ -slansp_ -slansy_ -slantb_ -slantp_ -slantr_ -slanv2_ -slapll_ -slapmt_ -slaqgb_ -slaqge_ -slaqp2_ -slaqps_ -slaqsb_ -slaqsp_ -slaqsy_ -slaqr0_ -slaqr1_ -slaqr2_ -slaqr3_ -slaqr4_ -slaqr5_ -slaqtr_ -slar1v_ -slar2v_ -ilaslr_ -ilaslc_ -slarf_ -slarfb_ -slarfg_ -slarft_ -slarfx_ -slargv_ -slarrv_ -slartv_ -slarfp_ -slarz_ -slarzb_ -slarzt_ -slaswp_ -slasy2_ -slasyf_ -slatbs_ -slatdf_ -slatps_ -slatrd_ -slatrs_ -slatrz_ -slatzm_ -slauu2_ -slauum_ -sopgtr_ -sopmtr_ -sorg2l_ -sorg2r_ -sorgbr_ -sorghr_ -sorgl2_ -sorglq_ -sorgql_ -sorgqr_ -sorgr2_ -sorgrq_ -sorgtr_ -sorm2l_ -sorm2r_ -sormbr_ -sormhr_ -sorml2_ -sormlq_ -sormql_ -sormqr_ -sormr2_ -sormr3_ -sormrq_ -sormrz_ -sormtr_ -spbcon_ -spbequ_ -spbrfs_ -spbstf_ -spbsv_ -spbsvx_ -spbtf2_ -spbtrf_ -spbtrs_ -spocon_ -spoequ_ -sporfs_ -sposv_ -sposvx_ -spotf2_ -spotrf_ -spotri_ -spotrs_ -spstrf_ -spstf2_ -sppcon_ -sppequ_ -spprfs_ -sppsv_ -sppsvx_ -spptrf_ -spptri_ -spptrs_ -sptcon_ -spteqr_ -sptrfs_ -sptsv_ -sptsvx_ -spttrs_ -sptts2_ -srscl_ -ssbev_ -ssbevd_ -ssbevx_ -ssbgst_ -ssbgv_ -ssbgvd_ -ssbgvx_ -ssbtrd_ -sspcon_ -sspev_ -sspevd_ -sspevx_ -sspgst_ -sspgv_ -sspgvd_ -sspgvx_ -ssprfs_ -sspsv_ -sspsvx_ -ssptrd_ -ssptrf_ -ssptri_ -ssptrs_ -sstegr_ -sstein_ -sstev_ -sstevd_ -sstevr_ -sstevx_ -ssycon_ -ssyev_ -ssyevd_ -ssyevr_ -ssyevx_ -ssygs2_ -ssygst_ -ssygv_ -ssygvd_ -ssygvx_ -ssyrfs_ -ssysv_ -ssysvx_ -ssytd2_ -ssytf2_ -ssytrd_ -ssytrf_ -ssytri_ -ssytrs_ -stbcon_ -stbrfs_ -stbtrs_ -stgevc_ -stgex2_ -stgexc_ -stgsen_ -stgsja_ -stgsna_ -stgsy2_ -stgsyl_ -stpcon_ -stprfs_ -stptri_ -stptrs_ -strcon_ -strevc_ -strexc_ -strrfs_ -strsen_ -strsna_ -strsyl_ -strti2_ -strtri_ -strtrs_ -stzrqf_ -stzrzf_ -sstemr_ -slansf_ -spftrf_ -spftri_ -spftrs_ -ssfrk_ -stfsm_ -stftri_ -stfttp_ -stfttr_ -stpttf_ -stpttr_ -strttf_ -strttp_ -sgejsv_ -sgesvj_ -sgsvj0_ -sgsvj1_ -sgeequb_ -ssyequb_ -spoequb_ -sgbequb_ -dgbbrd_ -dgbcon_ -dgbequ_ -dgbrfs_ -dgbsv_ -dgbsvx_ -dgbtf2_ -dgbtrf_ -dgbtrs_ -dgebak_ -dgebal_ -dgebd2_ -dgebrd_ -dgecon_ -dgeequ_ -dgees_ -dgeesx_ -dgeev_ -dgeevx_ -dgegs_ -dgegv_ -dgehd2_ -dgehrd_ -dgelq2_ -dgelqf_ -dgels_ -dgelsd_ -dgelss_ -dgelsx_ -dgelsy_ -dgeql2_ -dgeqlf_ -dgeqp3_ -dgeqpf_ -dgeqr2_ -dgeqrf_ -dgerfs_ -dgerq2_ -dgerqf_ -dgesc2_ -dgesdd_ -dgesv_ -dgesvd_ -dgesvx_ -dgetc2_ -dgetf2_ -dgetrf_ -dgetri_ -dgetrs_ -dggbak_ -dggbal_ -dgges_ -dggesx_ -dggev_ -dggevx_ -dggglm_ -dgghrd_ -dgglse_ -dggqrf_ -dggrqf_ -dggsvd_ -dggsvp_ -dgtcon_ -dgtrfs_ -dgtsv_ -dgtsvx_ -dgttrf_ -dgttrs_ -dgtts2_ -dhgeqz_ -dhsein_ -dhseqr_ -dlabrd_ -dlacon_ -dlacn2_ -dlaein_ -dlaexc_ -dlag2_ -dlags2_ -dlagtm_ -dlagv2_ -dlahqr_ -dlahrd_ -dlahr2_ -dlaic1_ -dlaln2_ -dlals0_ -dlalsa_ -dlalsd_ -dlangb_ -dlange_ -dlangt_ -dlanhs_ -dlansb_ -dlansp_ -dlansy_ -dlantb_ -dlantp_ -dlantr_ -dlanv2_ -dlapll_ -dlapmt_ -dlaqgb_ -dlaqge_ -dlaqp2_ -dlaqps_ -dlaqsb_ -dlaqsp_ -dlaqsy_ -dlaqr0_ -dlaqr1_ -dlaqr2_ -dlaqr3_ -dlaqr4_ -dlaqr5_ -dlaqtr_ -dlar1v_ -dlar2v_ -iladlr_ -iladlc_ -dlarf_ -dlarfb_ -dlarfg_ -dlarft_ -dlarfx_ -dlargv_ -dlarrv_ -dlartv_ -dlarfp_ -dlarz_ -dlarzb_ -dlarzt_ -dlaswp_ -dlasy2_ -dlasyf_ -dlatbs_ -dlatdf_ -dlatps_ -dlatrd_ -dlatrs_ -dlatrz_ -dlatzm_ -dlauu2_ -dlauum_ -dopgtr_ -dopmtr_ -dorg2l_ -dorg2r_ -dorgbr_ -dorghr_ -dorgl2_ -dorglq_ -dorgql_ -dorgqr_ -dorgr2_ -dorgrq_ -dorgtr_ -dorm2l_ -dorm2r_ -dormbr_ -dormhr_ -dorml2_ -dormlq_ -dormql_ -dormqr_ -dormr2_ -dormr3_ -dormrq_ -dormrz_ -dormtr_ -dpbcon_ -dpbequ_ -dpbrfs_ -dpbstf_ -dpbsv_ -dpbsvx_ -dpbtf2_ -dpbtrf_ -dpbtrs_ -dpocon_ -dpoequ_ -dporfs_ -dposv_ -dposvx_ -dpotf2_ -dpotrf_ -dpotri_ -dpotrs_ -dpstrf_ -dpstf2_ -dppcon_ -dppequ_ -dpprfs_ -dppsv_ -dppsvx_ -dpptrf_ -dpptri_ -dpptrs_ -dptcon_ -dpteqr_ -dptrfs_ -dptsv_ -dptsvx_ -dpttrs_ -dptts2_ -drscl_ -dsbev_ -dsbevd_ -dsbevx_ -dsbgst_ -dsbgv_ -dsbgvd_ -dsbgvx_ -dsbtrd_ -dspcon_ -dspev_ -dspevd_ -dspevx_ -dspgst_ -dspgv_ -dspgvd_ -dspgvx_ -dsprfs_ -dspsv_ -dspsvx_ -dsptrd_ -dsptrf_ -dsptri_ -dsptrs_ -dstegr_ -dstein_ -dstev_ -dstevd_ -dstevr_ -dstevx_ -dsycon_ -dsyev_ -dsyevd_ -dsyevr_ -dsyevx_ -dsygs2_ -dsygst_ -dsygv_ -dsygvd_ -dsygvx_ -dsyrfs_ -dsysv_ -dsysvx_ -dsytd2_ -dsytf2_ -dsytrd_ -dsytrf_ -dsytri_ -dsytrs_ -dtbcon_ -dtbrfs_ -dtbtrs_ -dtgevc_ -dtgex2_ -dtgexc_ -dtgsen_ -dtgsja_ -dtgsna_ -dtgsy2_ -dtgsyl_ -dtpcon_ -dtprfs_ -dtptri_ -dtptrs_ -dtrcon_ -dtrevc_ -dtrexc_ -dtrrfs_ -dtrsen_ -dtrsna_ -dtrsyl_ -dtrti2_ -dtrtri_ -dtrtrs_ -dtzrqf_ -dtzrzf_ -dstemr_ -dsgesv_ -dsposv_ -dlag2s_ -slag2d_ -dlat2s_ -dlansf_ -dpftrf_ -dpftri_ -dpftrs_ -dsfrk_ -dtfsm_ -dtftri_ -dtfttp_ -dtfttr_ -dtpttf_ -dtpttr_ -dtrttf_ -dtrttp_ -dgejsv_ -dgesvj_ -dgsvj0_ -dgsvj1_ -dgeequb_ -dsyequb_ -dpoequb_ -dgbequb_ -cbdsqr_ -cgbbrd_ -cgbcon_ -cgbequ_ -cgbrfs_ -cgbsv_ -cgbsvx_ -cgbtf2_ -cgbtrf_ -cgbtrs_ -cgebak_ -cgebal_ -cgebd2_ -cgebrd_ -cgecon_ -cgeequ_ -cgees_ -cgeesx_ -cgeev_ -cgeevx_ -cgegs_ -cgegv_ -cgehd2_ -cgehrd_ -cgelq2_ -cgelqf_ -cgels_ -cgelsd_ -cgelss_ -cgelsx_ -cgelsy_ -cgeql2_ -cgeqlf_ -cgeqp3_ -cgeqpf_ -cgeqr2_ -cgeqrf_ -cgerfs_ -cgerq2_ -cgerqf_ -cgesc2_ -cgesdd_ -cgesv_ -cgesvd_ -cgesvx_ -cgetc2_ -cgetf2_ -cgetrf_ -cgetri_ -cgetrs_ -cggbak_ -cggbal_ -cgges_ -cggesx_ -cggev_ -cggevx_ -cggglm_ -cgghrd_ -cgglse_ -cggqrf_ -cggrqf_ -cggsvd_ -cggsvp_ -cgtcon_ -cgtrfs_ -cgtsv_ -cgtsvx_ -cgttrf_ -cgttrs_ -cgtts2_ -chbev_ -chbevd_ -chbevx_ -chbgst_ -chbgv_ -chbgvd_ -chbgvx_ -chbtrd_ -checon_ -cheev_ -cheevd_ -cheevr_ -cheevx_ -chegs2_ -chegst_ -chegv_ -chegvd_ -chegvx_ -cherfs_ -chesv_ -chesvx_ -chetd2_ -chetf2_ -chetrd_ -chetrf_ -chetri_ -chetrs_ -chgeqz_ -chpcon_ -chpev_ -chpevd_ -chpevx_ -chpgst_ -chpgv_ -chpgvd_ -chpgvx_ -chprfs_ -chpsv_ -chpsvx_ -chptrd_ -chptrf_ -chptri_ -chptrs_ -chsein_ -chseqr_ -clabrd_ -clacgv_ -clacon_ -clacn2_ -clacp2_ -clacpy_ -clacrm_ -clacrt_ -cladiv_ -claed0_ -claed7_ -claed8_ -claein_ -claesy_ -claev2_ -clags2_ -clagtm_ -clahef_ -clahqr_ -clahrd_ -clahr2_ -claic1_ -clals0_ -clalsa_ -clalsd_ -clangb_ -clange_ -clangt_ -clanhb_ -clanhe_ -clanhp_ -clanhs_ -clanht_ -clansb_ -clansp_ -clansy_ -clantb_ -clantp_ -clantr_ -clapll_ -clapmt_ -clarcm_ -claqgb_ -claqge_ -claqhb_ -claqhe_ -claqhp_ -claqp2_ -claqps_ -claqsb_ -claqr0_ -claqr1_ -claqr2_ -claqr3_ -claqr4_ -claqr5_ -claqsp_ -claqsy_ -clar1v_ -clar2v_ -ilaclr_ -ilaclc_ -clarf_ -clarfb_ -clarfg_ -clarft_ -clarfp_ -clarfx_ -clargv_ -clarnv_ -clarrv_ -clartg_ -clartv_ -clarz_ -clarzb_ -clarzt_ -clascl_ -claset_ -clasr_ -classq_ -claswp_ -clasyf_ -clatbs_ -clatdf_ -clatps_ -clatrd_ -clatrs_ -clatrz_ -clatzm_ -clauu2_ -clauum_ -cpbcon_ -cpbequ_ -cpbrfs_ -cpbstf_ -cpbsv_ -cpbsvx_ -cpbtf2_ -cpbtrf_ -cpbtrs_ -cpocon_ -cpoequ_ -cporfs_ -cposv_ -cposvx_ -cpotf2_ -cpotrf_ -cpotri_ -cpotrs_ -cpstrf_ -cpstf2_ -cppcon_ -cppequ_ -cpprfs_ -cppsv_ -cppsvx_ -cpptrf_ -cpptri_ -cpptrs_ -cptcon_ -cpteqr_ -cptrfs_ -cptsv_ -cptsvx_ -cpttrf_ -cpttrs_ -cptts2_ -crot_ -cspcon_ -cspmv_ -cspr_ -csprfs_ -cspsv_ -cspsvx_ -csptrf_ -csptri_ -csptrs_ -csrscl_ -cstedc_ -cstegr_ -cstein_ -csteqr_ -csycon_ -csymv_ -csyr_ -csyrfs_ -csysv_ -csysvx_ -csytf2_ -csytrf_ -csytri_ -csytrs_ -ctbcon_ -ctbrfs_ -ctbtrs_ -ctgevc_ -ctgex2_ -ctgexc_ -ctgsen_ -ctgsja_ -ctgsna_ -ctgsy2_ -ctgsyl_ -ctpcon_ -ctprfs_ -ctptri_ -ctptrs_ -ctrcon_ -ctrevc_ -ctrexc_ -ctrrfs_ -ctrsen_ -ctrsna_ -ctrsyl_ -ctrti2_ -ctrtri_ -ctrtrs_ -ctzrqf_ -ctzrzf_ -cung2l_ -cung2r_ -cungbr_ -cunghr_ -cungl2_ -cunglq_ -cungql_ -cungqr_ -cungr2_ -cungrq_ -cungtr_ -cunm2l_ -cunm2r_ -cunmbr_ -cunmhr_ -cunml2_ -cunmlq_ -cunmql_ -cunmqr_ -cunmr2_ -cunmr3_ -cunmrq_ -cunmrz_ -cunmtr_ -cupgtr_ -cupmtr_ -icmax1_ -scsum1_ -cstemr_ -chfrk_ -ctfttp_ -clanhf_ -cpftrf_ -cpftri_ -cpftrs_ -ctfsm_ -ctftri_ -ctfttr_ -ctpttf_ -ctpttr_ -ctrttf_ -ctrttp_ -cgeequb_ -cgbequb_ -csyequb_ -cpoequb_ -cheequb_ -zbdsqr_ -zgbbrd_ -zgbcon_ -zgbequ_ -zgbrfs_ -zgbsv_ -zgbsvx_ -zgbtf2_ -zgbtrf_ -zgbtrs_ -zgebak_ -zgebal_ -zgebd2_ -zgebrd_ -zgecon_ -zgeequ_ -zgees_ -zgeesx_ -zgeev_ -zgeevx_ -zgegs_ -zgegv_ -zgehd2_ -zgehrd_ -zgelq2_ -zgelqf_ -zgels_ -zgelsd_ -zgelss_ -zgelsx_ -zgelsy_ -zgeql2_ -zgeqlf_ -zgeqp3_ -zgeqpf_ -zgeqr2_ -zgeqrf_ -zgerfs_ -zgerq2_ -zgerqf_ -zgesc2_ -zgesdd_ -zgesv_ -zgesvd_ -zgesvx_ -zgetc2_ -zgetf2_ -zgetrf_ -zgetri_ -zgetrs_ -zggbak_ -zggbal_ -zgges_ -zggesx_ -zggev_ -zggevx_ -zggglm_ -zgghrd_ -zgglse_ -zggqrf_ -zggrqf_ -zggsvd_ -zggsvp_ -zgtcon_ -zgtrfs_ -zgtsv_ -zgtsvx_ -zgttrf_ -zgttrs_ -zgtts2_ -zhbev_ -zhbevd_ -zhbevx_ -zhbgst_ -zhbgv_ -zhbgvd_ -zhbgvx_ -zhbtrd_ -zhecon_ -zheev_ -zheevd_ -zheevr_ -zheevx_ -zhegs2_ -zhegst_ -zhegv_ -zhegvd_ -zhegvx_ -zherfs_ -zhesv_ -zhesvx_ -zhetd2_ -zhetf2_ -zhetrd_ -zhetrf_ -zhetri_ -zhetrs_ -zhgeqz_ -zhpcon_ -zhpev_ -zhpevd_ -zhpevx_ -zhpgst_ -zhpgv_ -zhpgvd_ -zhpgvx_ -zhprfs_ -zhpsv_ -zhpsvx_ -zhptrd_ -zhptrf_ -zhptri_ -zhptrs_ -zhsein_ -zhseqr_ -zlabrd_ -zlacgv_ -zlacon_ -zlacn2_ -zlacp2_ -zlacpy_ -zlacrm_ -zlacrt_ -zladiv_ -zlaed0_ -zlaed7_ -zlaed8_ -zlaein_ -zlaesy_ -zlaev2_ -zlags2_ -zlagtm_ -zlahef_ -zlahqr_ -zlahrd_ -zlahr2_ -zlaic1_ -zlals0_ -zlalsa_ -zlalsd_ -zlangb_ -zlange_ -zlangt_ -zlanhb_ -zlanhe_ -zlanhp_ -zlanhs_ -zlanht_ -zlansb_ -zlansp_ -zlansy_ -zlantb_ -zlantp_ -zlantr_ -zlapll_ -zlapmt_ -zlaqgb_ -zlaqge_ -zlaqhb_ -zlaqhe_ -zlaqhp_ -zlaqp2_ -zlaqps_ -zlaqsb_ -zlaqr0_ -zlaqr1_ -zlaqr2_ -zlaqr3_ -zlaqr4_ -zlaqr5_ -zlaqsp_ -zlaqsy_ -zlar1v_ -zlar2v_ -ilazlr_ -ilazlc_ -zlarcm_ -zlarf_ -zlarfb_ -zlarfg_ -zlarft_ -zlarfp_ -zlarfx_ -zlargv_ -zlarnv_ -zlarrv_ -zlartg_ -zlartv_ -zlarz_ -zlarzb_ -zlarzt_ -zlascl_ -zlaset_ -zlasr_ -zlassq_ -zlaswp_ -zlasyf_ -zlatbs_ -zlatdf_ -zlatps_ -zlatrd_ -zlatrs_ -zlatrz_ -zlatzm_ -zlauu2_ -zlauum_ -zpbcon_ -zpbequ_ -zpbrfs_ -zpbstf_ -zpbsv_ -zpbsvx_ -zpbtf2_ -zpbtrf_ -zpbtrs_ -zpocon_ -zpoequ_ -zporfs_ -zposv_ -zposvx_ -zpotf2_ -zpotrf_ -zpotri_ -zpotrs_ -zpstrf_ -zpstf2_ -zppcon_ -zppequ_ -zpprfs_ -zppsv_ -zppsvx_ -zpptrf_ -zpptri_ -zpptrs_ -zptcon_ -zpteqr_ -zptrfs_ -zptsv_ -zptsvx_ -zpttrf_ -zpttrs_ -zptts2_ -zrot_ -zspcon_ -zspmv_ -zspr_ -zsprfs_ -zspsv_ -zspsvx_ -zsptrf_ -zsptri_ -zsptrs_ -zdrscl_ -zstedc_ -zstegr_ -zstein_ -zsteqr_ -zsycon_ -zsymv_ -zsyr_ -zsyrfs_ -zsysv_ -zsysvx_ -zsytf2_ -zsytrf_ -zsytri_ -zsytrs_ -ztbcon_ -ztbrfs_ -ztbtrs_ -ztgevc_ -ztgex2_ -ztgexc_ -ztgsen_ -ztgsja_ -ztgsna_ -ztgsy2_ -ztgsyl_ -ztpcon_ -ztprfs_ -ztptri_ -ztptrs_ -ztrcon_ -ztrevc_ -ztrexc_ -ztrrfs_ -ztrsen_ -ztrsna_ -ztrsyl_ -ztrti2_ -ztrtri_ -ztrtrs_ -ztzrqf_ -ztzrzf_ -zung2l_ -zung2r_ -zungbr_ -zunghr_ -zungl2_ -zunglq_ -zungql_ -zungqr_ -zungr2_ -zungrq_ -zungtr_ -zunm2l_ -zunm2r_ -zunmbr_ -zunmhr_ -zunml2_ -zunmlq_ -zunmql_ -zunmqr_ -zunmr2_ -zunmr3_ -zunmrq_ -zunmrz_ -zunmtr_ -zupgtr_ -zupmtr_ -izmax1_ -dzsum1_ -zstemr_ -zcgesv_ -zcposv_ -zlag2c_ -clag2z_ -zlat2c_ -zhfrk_ -ztfttp_ -zlanhf_ -zpftrf_ -zpftri_ -zpftrs_ -ztfsm_ -ztftri_ -ztfttr_ -ztpttf_ -ztpttr_ -ztrttf_ -ztrttp_ -zgeequb_ -zgbequb_ -zsyequb_ -zpoequb_ -zheequb_ -sbdsdc_ -sbdsqr_ -sdisna_ -slabad_ -slacpy_ -sladiv_ -slae2_ -slaebz_ -slaed0_ -slaed1_ -slaed2_ -slaed3_ -slaed4_ -slaed5_ -slaed6_ -slaed7_ -slaed8_ -slaed9_ -slaeda_ -slaev2_ -slagtf_ -slagts_ -slamrg_ -slanst_ -slapy2_ -slapy3_ -slarnv_ -slarra_ -slarrb_ -slarrc_ -slarrd_ -slarre_ -slarrf_ -slarrj_ -slarrk_ -slarrr_ -slaneg_ -slartg_ -slaruv_ -slas2_ -slascl_ -slasd0_ -slasd1_ -slasd2_ -slasd3_ -slasd4_ -slasd5_ -slasd6_ -slasd7_ -slasd8_ -slasda_ -slasdq_ -slasdt_ -slaset_ -slasq1_ -slasq2_ -slasq3_ -slasq4_ -slasq5_ -slasq6_ -slasr_ -slasrt_ -slassq_ -slasv2_ -spttrf_ -sstebz_ -sstedc_ -ssteqr_ -ssterf_ -slaisnan_ -sisnan_ -slamch_ -dbdsdc_ -dbdsqr_ -ddisna_ -dlabad_ -dlacpy_ -dladiv_ -dlae2_ -dlaebz_ -dlaed0_ -dlaed1_ -dlaed2_ -dlaed3_ -dlaed4_ -dlaed5_ -dlaed6_ -dlaed7_ -dlaed8_ -dlaed9_ -dlaeda_ -dlaev2_ -dlagtf_ -dlagts_ -dlamrg_ -dlanst_ -dlapy2_ -dlapy3_ -dlarnv_ -dlarra_ -dlarrb_ -dlarrc_ -dlarrd_ -dlarre_ -dlarrf_ -dlarrj_ -dlarrk_ -dlarrr_ -dlaneg_ -dlartg_ -dlaruv_ -dlas2_ -dlascl_ -dlasd0_ -dlasd1_ -dlasd2_ -dlasd3_ -dlasd4_ -dlasd5_ -dlasd6_ -dlasd7_ -dlasd8_ -dlasda_ -dlasdq_ -dlasdt_ -dlaset_ -dlasq1_ -dlasq2_ -dlasq3_ -dlasq4_ -dlasq5_ -dlasq6_ -dlasr_ -dlasrt_ -dlassq_ -dlasv2_ -dpttrf_ -dstebz_ -dstedc_ -dsteqr_ -dsterf_ -dlaisnan_ -disnan_ -dlamch_ -ilaenv_ -ieeeck_ -lsamen_ -iparmq_ -ilaprec_ -ilatrans_ -ilauplo_ -iladiag_ -ilaver_ -lsame_ diff --git a/ports/clapack/link-to-math-lib.patch b/ports/clapack/link-to-math-lib.patch deleted file mode 100644 index c80a8d4ed..000000000 --- a/ports/clapack/link-to-math-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt -index 2bdbd05..ca1473f 100644 ---- a/F2CLIBS/libf2c/CMakeLists.txt -+++ b/F2CLIBS/libf2c/CMakeLists.txt -@@ -59,4 +59,7 @@ endif() - include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c) - include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) - add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) -+if(UNIX) -+ target_link_libraries(f2c m) -+endif() - set_property(TARGET f2c PROPERTY PREFIX lib) diff --git a/ports/clapack/portfile.cmake b/ports/clapack/portfile.cmake index 3c4608848..2845bbdc2 100644 --- a/ports/clapack/portfile.cmake +++ b/ports/clapack/portfile.cmake @@ -1,45 +1,49 @@ include(vcpkg_common_functions) -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "openblas can only be built for x64 currently") +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(WARNING "You do not need this package on macOS, since you already have the Accelerate Framework") + return() endif() -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/clapack-3.2.1-CMAKE) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_download_distfile(ARCHIVE - URLS "http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz" - FILENAME "clapack-3.2.1.tgz" - SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 + URLS "http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz" + FILENAME "clapack-3.2.1.tgz" + SHA512 cf19c710291ddff3f6ead7d86bdfdeaebca21291d9df094bf0a8ef599546b007757fb2dbb19b56511bb53ef7456eac0c73973b9627bf4d02982c856124428b49 ) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(ADDITIONAL_PATCH "enable_openblas_compat.patch") +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - use-other-blas-and-install-include.patch - link-to-math-lib.patch + remove_internal_blas.patch + ${ADDITIONAL_PATCH} ) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch" - ) -endif() - -if(NOT VCPKG_CMAKE_SYSTEM_NAME) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/lapack.def DESTINATION ${SOURCE_PATH}/SRC) -endif() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_install_cmake() +vcpkg_copy_pdbs() + +#TODO: fix the official exported targets, since they are broken (luckily it seems that no-one uses them for now) +vcpkg_fixup_cmake_targets() + +#we install a cmake wrapper since the official FindLAPACK module in cmake does find clapack easily, unfortunately... +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/clapack) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/clapack/COPYING ${CURRENT_PACKAGES_DIR}/share/clapack/copyright) - -vcpkg_copy_pdbs() +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/clapack RENAME copyright) diff --git a/ports/clapack/remove_internal_blas.patch b/ports/clapack/remove_internal_blas.patch new file mode 100644 index 000000000..3b8c59b4c --- /dev/null +++ b/ports/clapack/remove_internal_blas.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 320ccc6..414ac8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,6 @@ + cmake_minimum_required(VERSION 2.6) + project(CLAPACK C) +-enable_testing() +-include(CTest) ++find_package(BLAS REQUIRED) + + if(WIN32 AND NOT CYGWIN) + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) +@@ -11,7 +10,6 @@ else() + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c) + set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c) + endif() +-enable_testing() + option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF) + if(NOT USE_BLAS_WRAP) + # _zrotg_ seems to be missing in the wrap header +@@ -19,16 +17,15 @@ if(NOT USE_BLAS_WRAP) + endif() + include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) + add_subdirectory(F2CLIBS) +-add_subdirectory(BLAS) + add_subdirectory(SRC) +-add_subdirectory(TESTING) + set(CLAPACK_VERSION 3.2.1) +-set(CPACK_PACKAGE_VERSION_MAJOR 3) +-set(CPACK_PACKAGE_VERSION_MINOR 2) +-set(CPACK_PACKAGE_VERSION_PATCH 1) +-include(CPack) +-export(TARGETS f2c blas lapack FILE clapack-targets.cmake) ++export(TARGETS f2c lapack FILE ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-targets.cmake) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in +- ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY) ++ ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config-version.cmake @ONLY) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in +- ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) ++ ${CMAKE_INSTALL_PREFIX}/share/clapack/clapack-config.cmake @ONLY) ++install(FILES ++ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/clapack.h ++ ${CMAKE_CURRENT_LIST_DIR}/INCLUDE/f2c.h ++ DESTINATION include) ++ +diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt +index 43d7b3f..6fa3598 100644 +--- a/F2CLIBS/libf2c/CMakeLists.txt ++++ b/F2CLIBS/libf2c/CMakeLists.txt +@@ -60,3 +60,11 @@ include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c) + include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) + add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) + set_property(TARGET f2c PROPERTY PREFIX lib) ++if(UNIX) ++ target_link_libraries(f2c m) ++endif() ++install(TARGETS f2c ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ +diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt +index ac4cce3..07dc8c7 100644 +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt +@@ -376,5 +376,9 @@ if(BUILD_COMPLEX16) + set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX}) + endif() + add_library(lapack ${ALLOBJ} ${ALLXOBJ}) +-target_link_libraries(lapack blas) ++target_link_libraries(lapack ${BLAS_LIBRARIES} f2c) ++install(TARGETS lapack ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + diff --git a/ports/clapack/use-other-blas-and-install-include.patch b/ports/clapack/use-other-blas-and-install-include.patch deleted file mode 100644 index 0f81e64fe..000000000 --- a/ports/clapack/use-other-blas-and-install-include.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 320ccc6..8c53def 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,9 @@ project(CLAPACK C) - enable_testing() - include(CTest) - -+# BLAS_LIBRARIES -+find_package(BLAS REQUIRED) -+ - if(WIN32 AND NOT CYGWIN) - set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) - set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/windsecnd.c) -@@ -19,7 +22,8 @@ if(NOT USE_BLAS_WRAP) - endif() - include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) - add_subdirectory(F2CLIBS) --add_subdirectory(BLAS) -+ -+# add_subdirectory(BLAS) - add_subdirectory(SRC) - add_subdirectory(TESTING) - set(CLAPACK_VERSION 3.2.1) -@@ -27,8 +31,13 @@ set(CPACK_PACKAGE_VERSION_MAJOR 3) - set(CPACK_PACKAGE_VERSION_MINOR 2) - set(CPACK_PACKAGE_VERSION_PATCH 1) - include(CPack) --export(TARGETS f2c blas lapack FILE clapack-targets.cmake) --configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in -- ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY) --configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in -- ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) -+# export(TARGETS f2c blas lapack FILE clapack-targets.cmake) -+# configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in -+# ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY) -+# configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in -+# ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) -+ -+install(FILES -+ ${CMAKE_CURRENT_LIST_DIR}/include/clapack.h -+ ${CMAKE_CURRENT_LIST_DIR}/include/f2c.h -+ DESTINATION include) -\ No newline at end of file -diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt -index 43d7b3f..2bdbd05 100644 ---- a/F2CLIBS/libf2c/CMakeLists.txt -+++ b/F2CLIBS/libf2c/CMakeLists.txt -@@ -58,5 +58,5 @@ if(WIN32) - endif() - include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c) - include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) --add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) -+add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) - set_property(TARGET f2c PROPERTY PREFIX lib) -diff --git a/INCLUDE/clapack.h b/INCLUDE/clapack.h -index d22da98..5ef0a5b 100644 ---- a/INCLUDE/clapack.h -+++ b/INCLUDE/clapack.h -@@ -3,6 +3,8 @@ - #ifndef __CLAPACK_H - #define __CLAPACK_H - -+#include "f2c.h" -+ - /* Subroutine */ int caxpy_(integer *n, complex *ca, complex *cx, integer * - incx, complex *cy, integer *incy); - -diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt -index ac4cce3..0548c8d 100644 ---- a/SRC/CMakeLists.txt -+++ b/SRC/CMakeLists.txt -@@ -375,6 +375,17 @@ endif() - if(BUILD_COMPLEX16) - set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX}) - endif() --add_library(lapack ${ALLOBJ} ${ALLXOBJ}) --target_link_libraries(lapack blas) -+if(BUILD_SHARED_LIBS AND MSVC) -+ add_library(lapack SHARED ${ALLOBJ} ${ALLXOBJ} ${CMAKE_CURRENT_LIST_DIR}/lapack.def) -+else() -+ add_library(lapack ${ALLOBJ} ${ALLXOBJ}) -+endif(BUILD_SHARED_LIBS AND MSVC) -+ -+ -+target_link_libraries(lapack ${BLAS_LIBRARIES} f2c) -+ -+install(TARGETS lapack -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - -diff --git a/TESTING/MATGEN/CMakeLists.txt b/TESTING/MATGEN/CMakeLists.txt -index b2cb47a..54fa7a8 100644 ---- a/TESTING/MATGEN/CMakeLists.txt -+++ b/TESTING/MATGEN/CMakeLists.txt -@@ -65,5 +65,5 @@ endif() - if(BUILD_COMPLEX16) - set(ALLOBJ $(ZMATGEN) $(DZATGEN)) - endif() --add_library(tmglib ${ALLOBJ} ) -+add_library(tmglib STATIC ${ALLOBJ} ) - diff --git a/ports/clapack/vcpkg-cmake-wrapper.cmake b/ports/clapack/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..aee3e1e08 --- /dev/null +++ b/ports/clapack/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +set(LAPACK_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +if(NOT LAPACK_LIBRARIES) + _find_package(${ARGS}) +endif() + +set(CMAKE_MODULE_PATH ${LAPACK_PREV_MODULE_PATH}) diff --git a/ports/clara/CONTROL b/ports/clara/CONTROL index b471db070..cb0c84df3 100644 --- a/ports/clara/CONTROL +++ b/ports/clara/CONTROL @@ -1,3 +1,4 @@ Source: clara Version: 2019-03-29 +Homepage: https://github.com/philsquared/Clara Description: A simple to use command line parser for C++
\ No newline at end of file diff --git a/ports/clblas/CONTROL b/ports/clblas/CONTROL index 416376579..3837fcbca 100644 --- a/ports/clblas/CONTROL +++ b/ports/clblas/CONTROL @@ -1,4 +1,4 @@ Source: clblas -Version: 2.12-1 +Version: 2.12-2 Build-Depends: opencl Description: clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library. diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake index 9088fc2e9..5619cea8f 100644 --- a/ports/clblas/portfile.cmake +++ b/ports/clblas/portfile.cmake @@ -53,6 +53,6 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vcruntime140d.dll ) -vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") +vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/clfft/CONTROL b/ports/clfft/CONTROL index 0a109ac14..4cc887f47 100644 --- a/ports/clfft/CONTROL +++ b/ports/clfft/CONTROL @@ -1,4 +1,5 @@ Source: clfft -Version: 2.12.2 +Version: 2.12.2-1 Build-Depends: opencl +Homepage: https://github.com/clMathLibraries/clFFT Description: clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library. diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake index 4e314b5d9..6ef4ec6f7 100644 --- a/ports/clfft/portfile.cmake +++ b/ports/clfft/portfile.cmake @@ -32,6 +32,6 @@ file(INSTALL ${CURRENT_PACKAGES_DIR}/share/clfft/copyright ) -vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") +vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/cli/CONTROL b/ports/cli/CONTROL index 13fa3d73b..a7db9c2ed 100644 --- a/ports/cli/CONTROL +++ b/ports/cli/CONTROL @@ -1,4 +1,4 @@ Source: cli -Version: 1.1 +Version: 1.1-1 Description: A library for interactive command line interfaces in modern C++ Build-Depends: boost-asio diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake index 3a340b50f..c83f75dd8 100644 --- a/ports/cli/portfile.cmake +++ b/ports/cli/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/cli REF v1.1.0 - SHA512 a3aeac666567359521d625442f5a03b35ea1e6cf7bd63cdc52dfea20397a1726ce34aeab08ffd7181b9390fb791c56e5aba0260e300329ff327282f1547940c8 + SHA512 a3aeac666567359521d625442f5a03b35ea1e6cf7bd63cdc52dfea20397a1726ce34aeab08ffd7181b9390fb791c56e5aba0260e300329ff327282f1547940c8 HEAD_REF master ) @@ -14,7 +14,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cli TARGET_PATH share/cli) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cli) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cli RENAME copyright) diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL index d15d64155..e478049c1 100644 --- a/ports/cli11/CONTROL +++ b/ports/cli11/CONTROL @@ -1,3 +1,4 @@ Source: cli11 -Version: 1.7.1 -Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. <https://github.com/CLIUtils/CLI11> +Version: 1.8.0 +Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. +Homepage: https://github.com/CLIUtils/CLI11 diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index e00158d70..b1096cbac 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v1.7.1 - SHA512 774ba3828c89ca8f0857a14d9823c11f116667f2fc305e6b2c73ccf3b194b50947821ec14073c618fc644bf6b597f6802cc2337d8a7425de4f42ba5b46e8370f + REF v1.8.0 + SHA512 80071573e3eee524df1ed8cd1fc23c0e197f3ba113db361cb3c2cb843109ddb1c35a65bcb989364bc53d872a80f180e4859f9598da443b870a6260f991705182 HEAD_REF master ) diff --git a/ports/clipp/CONTROL b/ports/clipp/CONTROL new file mode 100644 index 000000000..ed8084936 --- /dev/null +++ b/ports/clipp/CONTROL @@ -0,0 +1,3 @@ +Source: clipp
+Version: 2019-04-30
+Description: command line interfaces for modern C++
\ No newline at end of file diff --git a/ports/clipp/portfile.cmake b/ports/clipp/portfile.cmake new file mode 100644 index 000000000..ff86dbb3f --- /dev/null +++ b/ports/clipp/portfile.cmake @@ -0,0 +1,19 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO "muellan/clipp"
+ REF 2c32b2f1f7cc530b1ec1f62c92f698643bb368db
+ SHA512 4645fafe85a8099ea97b85e939747a12e9b3b92213b5b8207a9c277537377b77b5daebd88a4c090ea89cfff2937a9fc155da6e8b5558574d7129227c28826e1c
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipp RENAME copyright)
diff --git a/ports/clockutils/CONTROL b/ports/clockutils/CONTROL index 5a3325350..c555fd418 100644 --- a/ports/clockutils/CONTROL +++ b/ports/clockutils/CONTROL @@ -1,3 +1,4 @@ Source: clockutils -Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2 +Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3 +Homepage: https://github.com/ClockworkOrigins/clockUtils Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed. diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake index 28a1de440..7511158de 100644 --- a/ports/clockutils/portfile.cmake +++ b/ports/clockutils/portfile.cmake @@ -28,7 +28,6 @@ vcpkg_configure_cmake( -DCLOCKUTILS_BUILD_SHARED=${SHARED_FLAG} ) -vcpkg_build_cmake() vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/clp/CMakeLists.txt b/ports/clp/CMakeLists.txt index 86305aa58..cced65c98 100644 --- a/ports/clp/CMakeLists.txt +++ b/ports/clp/CMakeLists.txt @@ -1,139 +1,121 @@ -cmake_minimum_required(VERSION 3.11)
-
-project(Clp LANGUAGES C CXX)
-
-set(PROJECT_VERSION 1.16.11)
-set(PROJECT_VERSION_MAJOR 1)
-set(PROJECT_VERSION_MINOR 16)
-set(PROJECT_VERSION_PATCH 11)
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-if(MSVC)
- set(
- CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275"
- )
-endif(MSVC)
-if(APPLE)
- set(
- CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions"
- )
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
- CACHE STRING "Minimum OS X deployment version")
-endif(APPLE)
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-# options
-option(BUILD_SHARED_LIBS "" ON)
-
-#
-# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR
-include(GNUInstallDirs)
-
-# Include module with fuction 'write_basic_package_version_file'
-include(CMakePackageConfigHelpers)
-
-# Layout. This works for all platforms: * <prefix>/lib*/cmake/<PROJECT-NAME> *
-# <prefix>/lib*/ * <prefix>/include/
-set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
-# Configuration
-set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
-set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
-set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-set(namespace "Coin::")
-
-# Packages
-find_package(CoinUtils REQUIRED)
-find_package(Osi REQUIRED)
-
-# Add sources
-include_directories(Clp/src/)
-include_directories(Clp/src/OsiClp)
-
-file(GLOB CLP_SOURCES
- Clp/src/*.hpp
- Clp/src/*.cpp
- Clp/src/OsiClp/*.hpp
- Clp/src/OsiClp/*.cpp)
-file(GLOB CLP_REMOVE
- Clp/src/ClpCholeskyMumps.cpp
- Clp/src/ClpCholeskyUfl.cpp
- Clp/src/ClpCholeskyWssmp.cpp
- Clp/src/ClpCholeskyWssmpKKT.cpp
- Clp/src/ClpMain.cpp
- Clp/src/*Abc*.cpp
- Clp/src/ClpCholeskyMumps.hpp
- Clp/src/ClpCholeskyUfl.hpp
- Clp/src/ClpCholeskyWssmp.hpp
- Clp/src/ClpCholeskyWssmpKKT.hpp
- Clp/src/ClpMain.hpp
- Clp/src/*Abc*.hpp
- Clp/src/*Abc*.h)
-list(REMOVE_ITEM CLP_SOURCES ${CLP_REMOVE})
-
-add_library(${PROJECT_NAME} ${CLP_SOURCES})
-
-target_include_directories(${PROJECT_NAME}
- PUBLIC $<INSTALL_INTERFACE:include/coin>)
-target_compile_definitions(${PROJECT_NAME}
- PUBLIC
- -DHAVE_CMATH
- -D_CRT_SECURE_NO_WARNINGS
- -DCOIN_HAS_CLP)
-target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils Coin::Osi)
-
-install(TARGETS ${PROJECT_NAME}
- EXPORT "${TARGETS_EXPORT_NAME}"
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
- INCLUDES
- DESTINATION include)
-
-install(DIRECTORY Clp/src/
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin
- FILES_MATCHING
- PATTERN "*.h"
- PATTERN "*.hpp"
- PATTERN "config_default.h"
- EXCLUDE)
-
-install(DIRECTORY Clp/src/OsiClp/
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin
- FILES_MATCHING
- PATTERN "*.h"
- PATTERN "*.hpp"
- PATTERN "config_default.h"
- EXCLUDE)
-
-#
-# Install Libraries
-#
-# Configure '<PROJECT-NAME>ConfigVersion.cmake' Use: * PROJECT_VERSION
-write_basic_package_version_file("${version_config}"
- COMPATIBILITY SameMajorVersion)
-
-# Configure '<PROJECT-NAME>Config.cmake' Use variables: * TARGETS_EXPORT_NAME *
-# PROJECT_NAME
-configure_package_config_file("Config.cmake.in"
- "${project_config}"
- INSTALL_DESTINATION
- "${config_install_dir}")
-
-# Config * <prefix>/lib/cmake/Foo/FooConfig.cmake *
-# <prefix>/lib/cmake/Foo/FooConfigVersion.cmake
-install(FILES "${project_config}" "${version_config}"
- DESTINATION "${config_install_dir}")
-
-# Config * <prefix>/lib/cmake/Foo/FooTargets.cmake
-install(EXPORT "${TARGETS_EXPORT_NAME}"
- NAMESPACE "${namespace}"
- DESTINATION "${config_install_dir}")
+cmake_minimum_required(VERSION 3.11) + +project(Clp LANGUAGES C CXX) + +set(PROJECT_VERSION 1.16.11) +set(PROJECT_VERSION_MAJOR 1) +set(PROJECT_VERSION_MINOR 16) +set(PROJECT_VERSION_PATCH 11) + +set(CMAKE_CXX_STANDARD 14) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/clp" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() + +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif() + +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif() + +find_package(CoinUtils REQUIRED) +find_package(Osi REQUIRED) + +file(GLOB CLP_SOURCES + Clp/src/*.hpp + Clp/src/*.cpp + Clp/src/OsiClp/*.hpp + Clp/src/OsiClp/*.cpp) +file(GLOB CLP_REMOVE + Clp/src/ClpCholeskyMumps.cpp + Clp/src/ClpCholeskyUfl.cpp + Clp/src/ClpCholeskyWssmp.cpp + Clp/src/ClpCholeskyWssmpKKT.cpp + Clp/src/ClpMain.cpp + Clp/src/*Abc*.cpp + Clp/src/ClpCholeskyMumps.hpp + Clp/src/ClpCholeskyUfl.hpp + Clp/src/ClpCholeskyWssmp.hpp + Clp/src/ClpCholeskyWssmpKKT.hpp + Clp/src/ClpMain.hpp + Clp/src/*Abc*.hpp + Clp/src/*Abc*.h) +list(REMOVE_ITEM CLP_SOURCES ${CLP_REMOVE}) + +add_library(${PROJECT_NAME} ${CLP_SOURCES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC + $<INSTALL_INTERFACE:${RELATIVE_INSTALL_INCLUDE_DIR}> + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Clp/src/> + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Clp/src/OsiClp>) + +if(MSVC) + target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() +target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH) +target_compile_definitions(${PROJECT_NAME} PUBLIC COIN_HAS_CLP) + +target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils Coin::Osi) + +install(DIRECTORY Clp/src/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +install(DIRECTORY Clp/src/OsiClp/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Targets" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +include(CMakePackageConfigHelpers) + +set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake") +set(namespace "Coin::") + +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${INSTALL_CMAKE_DIR}") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${INSTALL_CMAKE_DIR}") + +install(EXPORT "${PROJECT_NAME}Targets" + NAMESPACE "${namespace}" + DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/ports/clp/CONTROL b/ports/clp/CONTROL index e19909f35..adf2036bf 100644 --- a/ports/clp/CONTROL +++ b/ports/clp/CONTROL @@ -1,4 +1,4 @@ -Source: clp
-Version: 1.16.11-1
-Description: Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available.
-Build-Depends: coinutils, osi
+Source: clp +Version: 1.17.2-2 +Description: Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available. +Build-Depends: coinutils, osi diff --git a/ports/clp/Config.cmake.in b/ports/clp/Config.cmake.in index ec01d2e5b..2c12f83f0 100644 --- a/ports/clp/Config.cmake.in +++ b/ports/clp/Config.cmake.in @@ -1,5 +1,5 @@ -
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
-check_required_components("@PROJECT_NAME@")
+ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/ports/clp/portfile.cmake b/ports/clp/portfile.cmake index f43dc295d..945a38199 100644 --- a/ports/clp/portfile.cmake +++ b/ports/clp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO coin-or/Clp - REF releases/1.16.11 - SHA512 4291ab6c4985491c100fab265ebeace88623a691f87890ed7b9240b4b1111fb55043be4e0f226cfa0e565f593f4df4c3661c570a39189f17f48b6f710a10fffe + REF releases/1.17.2 + SHA512 70c44f19fca58c64a745c22b6687f7885dfc88196e1dcb0c3be5b7187ccb541a7e85513eb448dd26a163dd78596c57762f4b103d4027056cf53c5c5a994dc35f ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -19,8 +19,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Clp") -# Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clp RENAME copyright) diff --git a/ports/cmark/CONTROL b/ports/cmark/CONTROL index 580ffedf6..8528ca579 100644 --- a/ports/cmark/CONTROL +++ b/ports/cmark/CONTROL @@ -1,3 +1,3 @@ Source: cmark
-Version: 0.28.3-3
+Version: 0.29.0 Description: CommonMark parsing and rendering library
diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake index a1351839c..da7ac329f 100644 --- a/ports/cmark/portfile.cmake +++ b/ports/cmark/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commonmark/cmark - REF 0.28.3 - SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29 + REF 0.29.0 + SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/rename-shared-lib.patch" diff --git a/ports/coinutils/CMakeLists.txt b/ports/coinutils/CMakeLists.txt index 1a090c94d..643bbec44 100644 --- a/ports/coinutils/CMakeLists.txt +++ b/ports/coinutils/CMakeLists.txt @@ -8,17 +8,28 @@ set(PROJECT_VERSION_MINOR 10) set(PROJECT_VERSION_PATCH 14) set(CMAKE_CXX_STANDARD 14) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake") + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/coinutils" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() if(MSVC) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" ) -endif(MSVC) +endif() + if(APPLE) set( CMAKE_CXX_FLAGS @@ -26,84 +37,59 @@ if(APPLE) ) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") -endif(APPLE) - -set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -# options -option(BUILD_SHARED_LIBS "" ON) - -# -# 设置用于 install 的变量 -# -# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR -include(GNUInstallDirs) +endif() -# Include module with fuction 'write_basic_package_version_file' -include(CMakePackageConfigHelpers) - -# Layout. This works for all platforms: * <prefix>/lib*/cmake/<PROJECT-NAME> * -# <prefix>/lib*/ * <prefix>/include/ -set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") -set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") -# Configuration -set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") -set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") -set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -set(namespace "Coin::") - -# -# Add sources -# -include_directories(CoinUtils/src) +include(CheckIncludeFileCXX) +include(CheckIncludeFile) +check_include_file_cxx("cmath" HAVE_CMATH) +check_include_file_cxx("cfloat" HAVE_CFLOAT) +if(NOT HAVE_CMATH OR NOT HAVE_CFLOAT) + message(FATAL_ERROR "Missing necessary include files, like cmath or cfloat") +endif() file(GLOB UTILS_SOURCES CoinUtils/src/*.hpp CoinUtils/src/*.cpp CoinUtils/src/*.h) + add_library(${PROJECT_NAME} ${UTILS_SOURCES}) -target_include_directories(${PROJECT_NAME} - PUBLIC $<INSTALL_INTERFACE:include/coin>) -target_compile_definitions(${PROJECT_NAME} - PUBLIC - $<INSTALL_INTERFACE:-DHAVE_CMATH> - $<INSTALL_INTERFACE:-D_CRT_SECURE_NO_WARNINGS>) +target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:${RELATIVE_INSTALL_INCLUDE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/CoinUtils/src>) -install(TARGETS ${PROJECT_NAME} - EXPORT "${TARGETS_EXPORT_NAME}" - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - INCLUDES - DESTINATION include) +if(MSVC) + target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() +target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH HAVE_CFLOAT) install(DIRECTORY CoinUtils/src/ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin + DESTINATION ${INSTALL_INCLUDE_DIR} FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") -# -# Install Libraries -# -# Configure '<PROJECT-NAME>ConfigVersion.cmake' Use: * PROJECT_VERSION +install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Targets" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +include(CMakePackageConfigHelpers) + +set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake") +set(namespace "Coin::") + write_basic_package_version_file("${version_config}" COMPATIBILITY SameMajorVersion) -# Configure '<PROJECT-NAME>Config.cmake' Use variables: * TARGETS_EXPORT_NAME * -# PROJECT_NAME configure_package_config_file("Config.cmake.in" "${project_config}" INSTALL_DESTINATION - "${config_install_dir}") + "${INSTALL_CMAKE_DIR}") -# Config * <prefix>/lib/cmake/Foo/FooConfig.cmake * -# <prefix>/lib/cmake/Foo/FooConfigVersion.cmake install(FILES "${project_config}" "${version_config}" - DESTINATION "${config_install_dir}") + DESTINATION "${INSTALL_CMAKE_DIR}") -# Config * <prefix>/lib/cmake/Foo/FooTargets.cmake -install(EXPORT "${TARGETS_EXPORT_NAME}" +install(EXPORT "${PROJECT_NAME}Targets" NAMESPACE "${namespace}" - DESTINATION "${config_install_dir}") + DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/ports/coinutils/CONTROL b/ports/coinutils/CONTROL index f20222532..13db5a937 100644 --- a/ports/coinutils/CONTROL +++ b/ports/coinutils/CONTROL @@ -1,3 +1,3 @@ Source: coinutils -Version: 2.10.14-1 +Version: 2.11.2-2 Description: CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project diff --git a/ports/coinutils/Config.cmake.in b/ports/coinutils/Config.cmake.in index a53c57495..2c12f83f0 100644 --- a/ports/coinutils/Config.cmake.in +++ b/ports/coinutils/Config.cmake.in @@ -1,5 +1,5 @@ @PACKAGE_INIT@ -include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") check_required_components("@PROJECT_NAME@") diff --git a/ports/coinutils/portfile.cmake b/ports/coinutils/portfile.cmake index 7b9a86b85..23a2a673d 100644 --- a/ports/coinutils/portfile.cmake +++ b/ports/coinutils/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO coin-or/CoinUtils - REF releases/2.10.14 - SHA512 2d5108e096f126cf98750a4892ca4d946d0bad41b65f29001c116c5ad15aa4900c3091d163fa16b6a55f0518344c6681ad95bbc6efa431c77aaaaa751494c48b + REF releases/2.11.2 + SHA512 4ffc1458676daffc46f2448c8962156f1f6a14d41f176462ebb695487ae3e96ae159e078f8f28ac5df4cd22544b3f19f09692725976624454d106ad33d31e30b ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -19,10 +19,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/CoinUtils") +vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/coinutils RENAME copyright) diff --git a/ports/collada-dom/CONTROL b/ports/collada-dom/CONTROL index 6625c5a4a..952f4ae50 100644 --- a/ports/collada-dom/CONTROL +++ b/ports/collada-dom/CONTROL @@ -1,4 +1,4 @@ Source: collada-dom
-Version: 2.5.0
+Version: 2.5.0-1
Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.
-Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system
\ No newline at end of file +Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system
diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake index eda714af1..f36d8e4a9 100644 --- a/ports/collada-dom/portfile.cmake +++ b/ports/collada-dom/portfile.cmake @@ -18,11 +18,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/collada_dom-2.5")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/collada_dom-2.5)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION
${CURRENT_PACKAGES_DIR}/share/collada-dom
- RENAME copyright)
\ No newline at end of file + RENAME copyright)
diff --git a/ports/concurrentqueue/CMakeLists.txt b/ports/concurrentqueue/CMakeLists.txt new file mode 100644 index 000000000..99de84178 --- /dev/null +++ b/ports/concurrentqueue/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.5)
+project(concurrentqueue C)
+
+add_library(concurrentqueue INTERFACE)
+
+target_include_directories(concurrentqueue INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
+
+install(TARGETS concurrentqueue
+ EXPORT concurrentqueue
+)
+install(EXPORT concurrentqueue FILE unofficial-concurrentqueue-targets.cmake NAMESPACE unofficial::concurrentqueue:: DESTINATION share/unofficial-concurrentqueue)
diff --git a/ports/concurrentqueue/CONTROL b/ports/concurrentqueue/CONTROL index 2dea27277..34080b423 100644 --- a/ports/concurrentqueue/CONTROL +++ b/ports/concurrentqueue/CONTROL @@ -1,3 +1,3 @@ Source: concurrentqueue -Version: 1.0.0-beta +Version: 1.0.0-beta-dea078c Description: A fast multi-producer, multi-consumer lock-free concurrent queue for C++11 diff --git a/ports/concurrentqueue/portfile.cmake b/ports/concurrentqueue/portfile.cmake index 1d0de7d05..29069c153 100644 --- a/ports/concurrentqueue/portfile.cmake +++ b/ports/concurrentqueue/portfile.cmake @@ -4,11 +4,29 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cameron314/concurrentqueue - REF 1d60c7f3004a87eaa9d9cbd647d66361c868558f - SHA512 4b435843291f4db5be6d3fb3dd33c38a1c3c0a2e2c22910b819f119cfca2867116c5d01dd5e7d302693d467821688aac5dc7334b4a9ef39275e682f1fb99585c + REF dea078cf5b6e742cd67a0d725e36f872feca4de4 + SHA512 edd47bcc025ffab7ac62cea168a9672a20cdbe139267426e97553fa1c796f1547d8414915518ee6be34a68d05e8a8171291f958c5eac0434ea8ba953bff85dbe HEAD_REF master ) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-concurrentqueue TARGET_PATH share/unofficial-concurrentqueue) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +configure_file( + ${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-config.in.cmake + ${CURRENT_PACKAGES_DIR}/share/unofficial-concurrentqueue/unofficial-concurrentqueue-config.cmake + @ONLY +) + file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrentqueue RENAME copyright) file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) diff --git a/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake b/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake new file mode 100644 index 000000000..c3639637a --- /dev/null +++ b/ports/concurrentqueue/unofficial-concurrentqueue-config.in.cmake @@ -0,0 +1,6 @@ +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)
+ include(CMakeFindDependencyMacro)
+ find_dependency(Threads)
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/unofficial-concurrentqueue-targets.cmake)
\ No newline at end of file diff --git a/ports/console-bridge/CONTROL b/ports/console-bridge/CONTROL index 533c63944..47870b72e 100644 --- a/ports/console-bridge/CONTROL +++ b/ports/console-bridge/CONTROL @@ -1,3 +1,4 @@ Source: console-bridge -Version: 0.3.2-3 +Version: 0.3.2-4 +Homepage: https://github.com/ros/console_bridge Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages. diff --git a/ports/console-bridge/portfile.cmake b/ports/console-bridge/portfile.cmake index dc618b4b9..8b99e125b 100644 --- a/ports/console-bridge/portfile.cmake +++ b/ports/console-bridge/portfile.cmake @@ -22,9 +22,9 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake" TARGET_PATH share/console_bridge) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/console_bridge) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/console_bridge/cmake" TARGET_PATH share/console_bridge) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/console_bridge/cmake TARGET_PATH share/console_bridge) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/console_bridge) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/console_bridge) endif() diff --git a/ports/constexpr/CONTROL b/ports/constexpr/CONTROL index 85b3bc0c7..78dc70aa4 100644 --- a/ports/constexpr/CONTROL +++ b/ports/constexpr/CONTROL @@ -1,3 +1,4 @@ Source: constexpr
Version: 1.0-1
+Homepage: https://github.com/elbeno/constexpr
Description: Small MIT License Library of general stdlib functions written as C++11 constexpr functions.
diff --git a/ports/coolprop/CONTROL b/ports/coolprop/CONTROL index 01e67e0df..4f5390ca1 100644 --- a/ports/coolprop/CONTROL +++ b/ports/coolprop/CONTROL @@ -1,4 +1,5 @@ Source: coolprop Version: 6.1.0-4 +Homepage: https://github.com/CoolProp/CoolProp Description: Thermophysical properties for the masses Build-Depends: catch, eigen3, pybind11, if97, fmt, rapidjson, msgpack, refprop-headers diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index db1dd82f9..3cf18ab10 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -1,6 +1,7 @@ Source: corrade Version: 2019.01-1 -Description: C++11/C++14 multiplatform utility library http://magnum.graphics/corrade/ +Description: C++11/C++14 multiplatform utility library +Homepage: https://magnum.graphics/corrade/ Default-Features: interconnect, pluginmanager, testsuite, utility Feature: interconnect diff --git a/ports/cpp-netlib/CONTROL b/ports/cpp-netlib/CONTROL new file mode 100644 index 000000000..9d33aa289 --- /dev/null +++ b/ports/cpp-netlib/CONTROL @@ -0,0 +1,4 @@ +Source: cpp-netlib
+Version: 0.13.0-2
+Build-Depends: boost
+Description: A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library
diff --git a/ports/cpp-netlib/portfile.cmake b/ports/cpp-netlib/portfile.cmake new file mode 100644 index 000000000..abea253d8 --- /dev/null +++ b/ports/cpp-netlib/portfile.cmake @@ -0,0 +1,36 @@ +include(vcpkg_common_functions)
+
+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(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO cpp-netlib/cpp-netlib
+ REF cpp-netlib-0.13.0-final
+ SHA512 1839bf1acb7917acd2957f1008a44ed26a38849afb5843bfa0d5c557dde530afab4183d8d273a87d6416aad2b3a59fdecdef5fbb62bc91ed484486c80a1de5eb
+ HEAD_REF master
+)
+
+ vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DCPP-NETLIB_BUILD_TESTS=off
+ -DCPP-NETLIB_BUILD_EXAMPLES=off
+
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+else()
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cppnetlib)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL index 4030f9ce9..7d8823866 100644 --- a/ports/cpp-redis/CONTROL +++ b/ports/cpp-redis/CONTROL @@ -1,4 +1,5 @@ Source: cpp-redis
Version: 4.3.1-1
Build-Depends: tacopie
+Homepage: https://github.com/Cylix/cpp_redis
Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.
diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL index f33c94ed9..35296edc1 100644 --- a/ports/cppcms/CONTROL +++ b/ports/cppcms/CONTROL @@ -1,4 +1,5 @@ Source: cppcms
-Version: 1.1.0-2
+Version: 1.2.1
+Homepage: https://github.com/artyom-beilis/cppcms
Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development
Build-Depends: icu, pcre, openssl, zlib
diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index c9ccca85b..e6c6cfa2a 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO artyom-beilis/cppcms - REF v1.1.0 - SHA512 cfc77f28ddee05b8a350fff1dbd7c09adcf008b8662d4f977b203dee50b5fadae97df499a655ebb48263a7448e0bdca514c8ac52ea805bf33e48612dabaa69f4 + REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4 + SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df ) vcpkg_find_acquire_program(PYTHON2) @@ -27,5 +27,5 @@ file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(REMOVE ${EXE_FILES}) # Handle copyright -file(COPY ${SOURCE_PATH}/LGPLv3.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/LGPLv3.txt ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright) +file(COPY ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppcms) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppcms/MIT.TXT ${CURRENT_PACKAGES_DIR}/share/cppcms/copyright) diff --git a/ports/cppcodec/CONTROL b/ports/cppcodec/CONTROL new file mode 100644 index 000000000..32f72bf2f --- /dev/null +++ b/ports/cppcodec/CONTROL @@ -0,0 +1,3 @@ +Source: cppcodec
+Version: 0.2
+Description: Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32.
\ No newline at end of file diff --git a/ports/cppcodec/portfile.cmake b/ports/cppcodec/portfile.cmake new file mode 100644 index 000000000..b445f4d47 --- /dev/null +++ b/ports/cppcodec/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO tplgy/cppcodec
+ REF v0.2
+ SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTING=OFF
+
+)
+
+vcpkg_install_cmake()
+
+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/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL index c354edbab..d3f13de82 100644 --- a/ports/cppgraphqlgen/CONTROL +++ b/ports/cppgraphqlgen/CONTROL @@ -1,4 +1,4 @@ Source: cppgraphqlgen
-Version: 3.0.0-pre
+Version: 3.0.0
Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson
Description: C++ GraphQL schema service generator
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 3cd60f9a2..5c92e1a60 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/cppgraphqlgen
- REF 692dcca912ec7383f80bfd2d922ff4e7c1a754b7
- SHA512 8134fba7296a3c1af14fd35bf119e7706498941bf91554bc8c832bdc806b2770759eb20af79f165ebbeb3b4bd4642e74c30ec10f23c1ccd2cb759a0ffc7646bb
+ REF v3.0.0
+ SHA512 26da9b559b7220f44bc1aabd68250a4cf869329a5496ac439f9bc7cea5137e0ef9068dc6e868adf441cd5c212f21dd08f0a21db393eb4c237525961eefd49389
HEAD_REF master
)
diff --git a/ports/cppitertools/CONTROL b/ports/cppitertools/CONTROL new file mode 100644 index 000000000..8c5f387ec --- /dev/null +++ b/ports/cppitertools/CONTROL @@ -0,0 +1,4 @@ +Source: cppitertools
+Version: 2019-04-14-2
+Description: Range-based for loop add-ons inspired by the Python builtins and itertools library
+Build-Depends: boost-optional
diff --git a/ports/cppitertools/portfile.cmake b/ports/cppitertools/portfile.cmake new file mode 100644 index 000000000..f19069a3b --- /dev/null +++ b/ports/cppitertools/portfile.cmake @@ -0,0 +1,20 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO ryanhaining/cppitertools
+ REF 97bfd33cdc268426b20f189c13d3ed88f5e1f4c2
+ SHA512 7b8926cf00b5be17fa89a1d1aea883e60848187bb00d637c40a20f6e11811add4785f2f461e530a6cd557d3be16490799ffcd7ea90bd7b58fdca549c3df03e8c
+ HEAD_REF master
+)
+
+file(GLOB INCLUDE_FILES ${SOURCE_PATH}/*.hpp)
+file(GLOB INCLUDE_INTERNAL_FILES ${SOURCE_PATH}/internal/*.hpp)
+
+file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${INCLUDE_INTERNAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/internal)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index 02fe11dcb..016bad454 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,6 +1,7 @@ Source: cpprestsdk -Version: 2.10.13 -Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows) +Version: 2.10.13-1 +Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), boost-asio (!uwp&!windows) +Homepage: https://github.com/Microsoft/cpprestsdk Description: C++11 JSON, REST, and OAuth library The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services. Default-Features: default-features diff --git a/ports/cppwinrt/CONTROL b/ports/cppwinrt/CONTROL index cd911b99e..df7cff03e 100644 --- a/ports/cppwinrt/CONTROL +++ b/ports/cppwinrt/CONTROL @@ -1,3 +1,4 @@ Source: cppwinrt Version: fall_2017_creators_update_for_vs_15.3-2 +Homepage: https://github.com/Microsoft/cppwinrt Description: C++/WinRT is a standard C++ language projection for the Windows Runtime. diff --git a/ports/cppzmq/CONTROL b/ports/cppzmq/CONTROL index d54de7494..f50dd4103 100644 --- a/ports/cppzmq/CONTROL +++ b/ports/cppzmq/CONTROL @@ -1,4 +1,5 @@ Source: cppzmq Version: 4.3.0-1 Build-Depends: zeromq +Homepage: https://github.com/zeromq/cppzmq Description: lightweight messaging kernel, C++ bindings diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch new file mode 100644 index 000000000..9b9b11352 --- /dev/null +++ b/ports/cpr/001-cpr-config.patch @@ -0,0 +1,94 @@ +diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt
+index a6db5bd..90bec48 100644
+--- a/cpr/CMakeLists.txt
++++ b/cpr/CMakeLists.txt
+@@ -1,47 +1,46 @@
+-message(STATUS "Using CURL_INCLUDE_DIRS: ${CURL_INCLUDE_DIRS}.")
+-include_directories(
+- ${CPR_INCLUDE_DIRS}
+- ${CURL_INCLUDE_DIRS})
+-
+ add_library(${CPR_LIBRARIES}
++ auth.cpp
++ cookies.cpp
++ cprtypes.cpp
++ digest.cpp
++ error.cpp
++ multipart.cpp
++ parameters.cpp
++ payload.cpp
++ proxies.cpp
++ session.cpp
++ timeout.cpp
++ util.cpp
++ ssl_options.cpp
++)
++
++target_link_libraries( ${CPR_LIBRARIES}
++ PUBLIC ${CURL_LIBRARIES}
++)
++
++target_include_directories(${CPR_LIBRARIES}
++ PUBLIC
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
++ $<INSTALL_INTERFACE:include>
++ PRIVATE
++ $<BUILD_INTERFACE:${CURL_INCLUDE_DIRS}>
++)
++
+
+- # Source files
+- auth.cpp
+- cookies.cpp
+- cprtypes.cpp
+- digest.cpp
+- error.cpp
+- multipart.cpp
+- parameters.cpp
+- payload.cpp
+- proxies.cpp
+- session.cpp
+- timeout.cpp
+- util.cpp
+- ssl_options.cpp
++set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
++install(
++ TARGETS ${CPR_LIBRARIES}
++ EXPORT ${TARGETS_EXPORT_NAME}
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib
++)
+
+- # Header files (useful in IDEs)
+- "${CPR_INCLUDE_DIRS}/cpr/api.h"
+- "${CPR_INCLUDE_DIRS}/cpr/auth.h"
+- "${CPR_INCLUDE_DIRS}/cpr/body.h"
+- "${CPR_INCLUDE_DIRS}/cpr/cookies.h"
+- "${CPR_INCLUDE_DIRS}/cpr/cpr.h"
+- "${CPR_INCLUDE_DIRS}/cpr/cprtypes.h"
+- "${CPR_INCLUDE_DIRS}/cpr/curlholder.h"
+- "${CPR_INCLUDE_DIRS}/cpr/defines.h"
+- "${CPR_INCLUDE_DIRS}/cpr/digest.h"
+- "${CPR_INCLUDE_DIRS}/cpr/error.h"
+- "${CPR_INCLUDE_DIRS}/cpr/max_redirects.h"
+- "${CPR_INCLUDE_DIRS}/cpr/multipart.h"
+- "${CPR_INCLUDE_DIRS}/cpr/parameters.h"
+- "${CPR_INCLUDE_DIRS}/cpr/payload.h"
+- "${CPR_INCLUDE_DIRS}/cpr/proxies.h"
+- "${CPR_INCLUDE_DIRS}/cpr/response.h"
+- "${CPR_INCLUDE_DIRS}/cpr/session.h"
+- "${CPR_INCLUDE_DIRS}/cpr/timeout.h"
+- "${CPR_INCLUDE_DIRS}/cpr/util.h"
+- "${CPR_INCLUDE_DIRS}/cpr/ssl_options.h")
++install(
++ EXPORT ${TARGETS_EXPORT_NAME}
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
++)
+
+-message(STATUS "Using CURL_LIBRARIES: ${CURL_LIBRARIES}.")
+-target_link_libraries(${CPR_LIBRARIES}
+- ${CURL_LIBRARIES})
++if (NOT DISABLE_INSTALL_HEADERS)
++ install(DIRECTORY ${CPR_INCLUDE_DIRS}/cpr DESTINATION include)
++endif()
diff --git a/ports/cpr/002_cpr_fixcase.patch b/ports/cpr/002_cpr_fixcase.patch new file mode 100644 index 000000000..4dbc97119 --- /dev/null +++ b/ports/cpr/002_cpr_fixcase.patch @@ -0,0 +1,13 @@ +diff --git a/cpr/error.cpp b/cpr/error.cpp
+index 713cb10..4143f93 100644
+--- a/cpr/error.cpp
++++ b/cpr/error.cpp
+@@ -38,8 +38,6 @@ ErrorCode Error::getErrorCodeForCurlError(std::int32_t curl_code) {
+ return ErrorCode::SSL_LOCAL_CERTIFICATE_ERROR;
+ case CURLE_SSL_CIPHER:
+ return ErrorCode::GENERIC_SSL_ERROR;
+- case CURLE_SSL_CACERT:
+- return ErrorCode::SSL_CACERT_ERROR;
+ case CURLE_USE_SSL_FAILED:
+ return ErrorCode::GENERIC_SSL_ERROR;
+ case CURLE_SSL_ENGINE_INITFAILED:
diff --git a/ports/cpr/CONTROL b/ports/cpr/CONTROL index a8cdbf052..de5c3478f 100644 --- a/ports/cpr/CONTROL +++ b/ports/cpr/CONTROL @@ -1,4 +1,5 @@ Source: cpr -Version: 1.3.0-4 +Version: 1.3.0-7 +Homepage: https://github.com/whoshuu/cpr Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project. Build-Depends: curl[core] diff --git a/ports/cpr/cprConfig.cmake b/ports/cpr/cprConfig.cmake new file mode 100644 index 000000000..501fcd96a --- /dev/null +++ b/ports/cpr/cprConfig.cmake @@ -0,0 +1,27 @@ +####### 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") diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 56e9c6cf4..9e2c40a0d 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF 1.3.0 SHA512 fd08f8a592a5e1fb8dc93158a4850b81575983c08527fb415f65bd9284f93c804c8680d16c548744583cd26b9353a7d4838269cfc59ccb6003da8941f620c273 HEAD_REF master - PATCHES enable-install.patch + PATCHES + 001-cpr-config.patch + 002_cpr_fixcase.patch ) vcpkg_configure_cmake( @@ -23,8 +25,13 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/cprConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/lib/cmake/cpr) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpr) + vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpr) file(RENAME ${CURRENT_PACKAGES_DIR}/share/cpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpr/copyright) diff --git a/ports/crc32c/CONTROL b/ports/crc32c/CONTROL index ada730a7d..764a0f2d8 100644 --- a/ports/crc32c/CONTROL +++ b/ports/crc32c/CONTROL @@ -1,3 +1,4 @@ Source: crc32c -Version: 1.0.6-1 +Version: 1.0.7-1 +Homepage: https://github.com/google/crc32c Description: CRC32C implementation with support for CPU-specific acceleration instructions. diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake index 85883c7e2..a15961f94 100644 --- a/ports/crc32c/portfile.cmake +++ b/ports/crc32c/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/crc32c - REF 1.0.6 - SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b + REF 1.0.7 + SHA512 fe384ea15976b1317b7f6be3a447ae2cf25e0baa80f6c5e1231719a2af8863bc156b3d33156f24eca85504083730937f81fb624311d27e94ba3d2456bf3d34fa HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_export_symbols.patch ) @@ -20,7 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Crc32c") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Crc32c) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/crow/CONTROL b/ports/crow/CONTROL index e2200c813..96efb27bf 100644 --- a/ports/crow/CONTROL +++ b/ports/crow/CONTROL @@ -1,3 +1,4 @@ Source: crow
Version: 0.1-1
+Homepage: https://github.com/ipkn/crow
Description: Very fast and easy to use C++ micro web framework
diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL index e3a5d79de..04c25da70 100644 --- a/ports/cryptopp/CONTROL +++ b/ports/cryptopp/CONTROL @@ -1,3 +1,4 @@ Source: cryptopp -Version: 8.1.0 +Version: 8.1.0-2 +Homepage: https://github.com/weidai11/cryptopp Description: Crypto++ is a free C++ class library of cryptographic schemes. diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index b4f35e7e6..728436d59 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -26,6 +26,14 @@ vcpkg_from_github( file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +# disable assembly on OSX to fix broken build +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(CRYPTOPP_DISABLE_ASM "ON") +else() + set(CRYPTOPP_DISABLE_ASM "OFF") +endif() + + # Dynamic linking should be avoided for Crypto++ to reduce the attack surface, # so generate a static lib for both dynamic and static vcpkg targets. # See also: @@ -40,6 +48,7 @@ vcpkg_configure_cmake( -DBUILD_STATIC=ON -DBUILD_TESTING=OFF -DBUILD_DOCUMENTATION=OFF + -DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM} ) vcpkg_install_cmake() diff --git a/ports/ctemplate/CONTROL b/ports/ctemplate/CONTROL index 1125efc18..d5fadf3ea 100644 --- a/ports/ctemplate/CONTROL +++ b/ports/ctemplate/CONTROL @@ -1,3 +1,4 @@ Source: ctemplate Version: 2017-06-23-44b7c5-3 +Homepage: https://github.com/OlafvdSpek/ctemplate Description: C++ CTemplate system diff --git a/ports/ctre/CONTROL b/ports/ctre/CONTROL index 3351ecf25..1dfd8f094 100644 --- a/ports/ctre/CONTROL +++ b/ports/ctre/CONTROL @@ -1,3 +1,3 @@ Source: ctre -Version: 2.2-1 +Version: 2.6.4 Description: A Compile time PCRE (almost) compatible regular expression matcher diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake index 76a4a7857..d3de402a4 100644 --- a/ports/ctre/portfile.cmake +++ b/ports/ctre/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hanickadot/compile-time-regular-expressions - REF v2.2 - SHA512 f6f18e3e5bc654ff94cd540a3b665615151678541575dfc8d4113c317fba5ea83f57694dc330c174110e6263c9b64a128f2a9234cc626a952e7518c423fda703 + REF v2.6.4 + SHA512 421122787e3220c5c8935e0d80f06b3d9ba953fface3dc7f4a6e1aadf9fa75468394eb0d2b679f263c17f2b849fd191eff9b532c781278d75a9c54a109dd3ecb HEAD_REF master ) diff --git a/ports/cunit/CONTROL b/ports/cunit/CONTROL index 4b43a0159..930494992 100644 --- a/ports/cunit/CONTROL +++ b/ports/cunit/CONTROL @@ -1,3 +1,4 @@ Source: cunit Version: 2.1.3-2 +Homepage: https://sourceforge.net/projects/cunit/ Description: CUnit is a lightweight system for writing, administering, and running unit tests in C. It provides C programmers a basic testing functionality with a flexible variety of user interfaces diff --git a/ports/curl/0001_cmake.patch b/ports/curl/0001_cmake.patch index 7796af413..33ede7b90 100644 --- a/ports/curl/0001_cmake.patch +++ b/ports/curl/0001_cmake.patch @@ -1,28 +1,13 @@ -diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake -index 84822dba7..0d6219425 100644 ---- a/CMake/FindLibSSH2.cmake -+++ b/CMake/FindLibSSH2.cmake -@@ -12,7 +12,7 @@ endif() - find_path(LIBSSH2_INCLUDE_DIR libssh2.h - ) - --find_library(LIBSSH2_LIBRARY NAMES ssh2 -+find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2 - ) - - if(LIBSSH2_INCLUDE_DIR) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e6dbb73f1..1e2ff138e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1144,7 +1144,9 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE) - - endfunction() - --if(WIN32 AND NOT CYGWIN) -+if(MSVC) -+ set(CURL_INSTALL_CMAKE_DIR share/curl) -+elseif(WIN32 AND NOT CYGWIN) - set(CURL_INSTALL_CMAKE_DIR CMake) - else() - set(CURL_INSTALL_CMAKE_DIR lib/cmake/curl) +diff --git a/CMake/FindLibSSH2.cmake b/CMake/FindLibSSH2.cmake
+index 84822db..0d62194 100644
+--- a/CMake/FindLibSSH2.cmake
++++ b/CMake/FindLibSSH2.cmake
+@@ -12,7 +12,7 @@ endif()
+ find_path(LIBSSH2_INCLUDE_DIR libssh2.h
+ )
+
+-find_library(LIBSSH2_LIBRARY NAMES ssh2
++find_library(LIBSSH2_LIBRARY NAMES ssh2 libssh2
+ )
+
+ if(LIBSSH2_INCLUDE_DIR)
diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index 111ca98e8..565903ad2 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -1,92 +1,92 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b73b98..72f6171 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -882,7 +882,9 @@ check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT) - check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME) - - # symbol exists in win32, but function does not. --if(WIN32) -+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ add_definitions(-D_WIN32_WINNT=0x0A00 -DHAVE_STRUCT_POLLFD -D_WINSOCK_DEPRECATED_NO_WARNINGS) -+elseif(WIN32) - if(ENABLE_INET_PTON) - check_function_exists(inet_pton HAVE_INET_PTON) - # _WIN32_WINNT_VISTA (0x0600) -diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c -index 8337c72..41867b2 100644 ---- a/lib/curl_gethostname.c -+++ b/lib/curl_gethostname.c -@@ -21,6 +21,7 @@ - ***************************************************************************/ - - #include "curl_setup.h" -+#include "curl/curl.h" - - #include "curl_gethostname.h" - -@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen) - #ifdef DEBUGBUILD - - /* Override host name when environment variable CURL_GETHOSTNAME is set */ -- const char *force_hostname = getenv("CURL_GETHOSTNAME"); -+ char *force_hostname = curl_getenv("CURL_GETHOSTNAME"); - if(force_hostname) { - strncpy(name, force_hostname, namelen); -+ free(force_hostname); - err = 0; - } - else { -diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c -index e896276..268f0ea 100644 ---- a/lib/curl_ntlm_core.c -+++ b/lib/curl_ntlm_core.c -@@ -743,9 +743,12 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash, - - /* Calculate the timestamp */ - #ifdef DEBUGBUILD -- char *force_timestamp = getenv("CURL_FORCETIME"); -- if(force_timestamp) -+ char *force_timestamp = curl_getenv("CURL_FORCETIME"); -+ if (force_timestamp) -+ { - tw = CURL_OFF_T_C(11644473600) * 10000000; -+ free(force_timestamp); -+ } - else - #endif - tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000; -diff --git a/lib/ftp.c b/lib/ftp.c -index 8042edf..3442df7 100644 ---- a/lib/ftp.c -+++ b/lib/ftp.c -@@ -4260,7 +4260,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn) - /* prevpath is "raw" so we convert the input path before we compare the - strings */ - size_t dlen; -- char *path; -+ char *path = NULL; - CURLcode result = - Curl_urldecode(conn->data, data->state.path, 0, &path, &dlen, TRUE); - if(result) { -diff --git a/lib/rand.c b/lib/rand.c -index 2670af9..0d18d37 100644 ---- a/lib/rand.c -+++ b/lib/rand.c -@@ -44,7 +44,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) - static bool seeded = FALSE; - - #ifdef CURLDEBUG -- char *force_entropy = getenv("CURL_ENTROPY"); -+ char *force_entropy = curl_getenv("CURL_ENTROPY"); - if(force_entropy) { - if(!seeded) { - unsigned int seed = 0; -@@ -58,6 +58,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd) - else - randseed++; - *rnd = randseed; -+ free(force_entropy); - return CURLE_OK; - } - #endif +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 38b7b7d..5b3d33e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -897,7 +897,9 @@ check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT)
+ check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME)
+
+ # symbol exists in win32, but function does not.
+-if(WIN32)
++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++ add_definitions(-D_WIN32_WINNT=0x0A00 -DHAVE_STRUCT_POLLFD -D_WINSOCK_DEPRECATED_NO_WARNINGS)
++elseif(WIN32)
+ if(ENABLE_INET_PTON)
+ check_function_exists(inet_pton HAVE_INET_PTON)
+ # _WIN32_WINNT_VISTA (0x0600)
+diff --git a/lib/curl_gethostname.c b/lib/curl_gethostname.c
+index 8337c72..41867b2 100644
+--- a/lib/curl_gethostname.c
++++ b/lib/curl_gethostname.c
+@@ -21,6 +21,7 @@
+ ***************************************************************************/
+
+ #include "curl_setup.h"
++#include "curl/curl.h"
+
+ #include "curl_gethostname.h"
+
+@@ -64,9 +65,10 @@ int Curl_gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen)
+ #ifdef DEBUGBUILD
+
+ /* Override host name when environment variable CURL_GETHOSTNAME is set */
+- const char *force_hostname = getenv("CURL_GETHOSTNAME");
++ char *force_hostname = curl_getenv("CURL_GETHOSTNAME");
+ if(force_hostname) {
+ strncpy(name, force_hostname, namelen);
++ free(force_hostname);
+ err = 0;
+ }
+ else {
+diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
+index e7060eb..9cd76f7 100644
+--- a/lib/curl_ntlm_core.c
++++ b/lib/curl_ntlm_core.c
+@@ -726,10 +726,11 @@ CURLcode Curl_ntlm_core_mk_ntlmv2_resp(unsigned char *ntlmv2hash,
+
+ /* Calculate the timestamp */
+ #ifdef DEBUGBUILD
+- char *force_timestamp = getenv("CURL_FORCETIME");
+- if(force_timestamp)
++ char *force_timestamp = curl_getenv("CURL_FORCETIME");
++ if(force_timestamp) {
+ tw = CURL_OFF_T_C(11644473600) * 10000000;
+- else
++ free(force_timestamp);
++ }
+ #endif
+ tw = ((curl_off_t)time(NULL) + CURL_OFF_T_C(11644473600)) * 10000000;
+
+diff --git a/lib/ftp.c b/lib/ftp.c
+index 825aaaa..3b96670 100644
+--- a/lib/ftp.c
++++ b/lib/ftp.c
+@@ -4262,7 +4262,7 @@ CURLcode ftp_parse_url_path(struct connectdata *conn)
+ /* prevpath is "raw" so we convert the input path before we compare the
+ strings */
+ size_t dlen;
+- char *path;
++ char *path = NULL;
+ CURLcode result =
+ Curl_urldecode(conn->data, ftp->path, 0, &path, &dlen, TRUE);
+ if(result) {
+diff --git a/lib/rand.c b/lib/rand.c
+index 6ee45fe..b2d712d 100644
+--- a/lib/rand.c
++++ b/lib/rand.c
+@@ -44,7 +44,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
+ static bool seeded = FALSE;
+
+ #ifdef CURLDEBUG
+- char *force_entropy = getenv("CURL_ENTROPY");
++ char *force_entropy = curl_getenv("CURL_ENTROPY");
+ if(force_entropy) {
+ if(!seeded) {
+ unsigned int seed = 0;
+@@ -58,6 +58,7 @@ static CURLcode randit(struct Curl_easy *data, unsigned int *rnd)
+ else
+ randseed++;
+ *rnd = randseed;
++ free(force_entropy);
+ return CURLE_OK;
+ }
+ #endif
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 37d1c89ec..bd7c4b39b 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,6 +1,7 @@ Source: curl -Version: 7.61.1-6 +Version: 7.65.0-2 Build-Depends: zlib +Homepage: https://github.com/curl/curl Description: A library for transferring data with URLs Default-Features: ssl @@ -15,7 +16,7 @@ Build-Depends: nghttp2, curl[ssl] Description: HTTP2 support Feature: ssl -Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx) +Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[sectransp] (osx) Description: Default SSL backend Feature: ssh @@ -34,5 +35,5 @@ Feature: mbedtls Build-Depends: mbedtls Description: SSL support (mbedTLS) -Feature: darwinssl -Description: SSL support (darwinssl) +Feature: sectransp +Description: SSL support (sectransp) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index cbd243641..5366fe88c 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF curl-7_61_1 - SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c + REF curl-7_65_0 + SHA512 436b6b42654c1db2b3f69df410a7f28401a50faf18e74f328a93585c147541e697664b0e9e7df03239fd76c797c1bb4f435f4c668a6b0ad28bdd67e17f786491 HEAD_REF master PATCHES 0001_cmake.patch @@ -40,14 +40,14 @@ if("mbedtls" IN_LIST FEATURES) set(USE_MBEDTLS ON) endif() -set(USE_DARWINSSL OFF) -set(DARWINSSL_OPTIONS) -if("darwinssl" IN_LIST FEATURES) - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - message(FATAL_ERROR "darwinssl is not supported on non-Apple platforms") +set(USE_SECTRANSP OFF) +set(SECTRANSP_OPTIONS) +if("sectransp" IN_LIST FEATURES) + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")) + message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") endif() - set(USE_DARWINSSL ON) - set(DARWINSSL_OPTIONS + set(USE_SECTRANSP ON) + set(SECTRANSP_OPTIONS -DCURL_CA_PATH=none ) endif() @@ -83,16 +83,12 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ) endif() -vcpkg_find_acquire_program(PERL) -get_filename_component(PERL_PATH ${PERL} DIRECTORY) -vcpkg_add_to_path(${PERL_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${UWP_OPTIONS} - ${DARWINSSL_OPTIONS} + ${SECTRANSP_OPTIONS} ${HTTP2_OPTIONS} -DBUILD_TESTING=OFF -DBUILD_CURL_EXE=${BUILD_CURL_EXE} @@ -101,9 +97,10 @@ vcpkg_configure_cmake( -DCMAKE_USE_OPENSSL=${USE_OPENSSL} -DCMAKE_USE_WINSSL=${USE_WINSSL} -DCMAKE_USE_MBEDTLS=${USE_MBEDTLS} - -DCMAKE_USE_DARWINSSL=${USE_DARWINSSL} + -DCMAKE_USE_SECTRANSP=${USE_SECTRANSP} -DCMAKE_USE_LIBSSH2=${USE_LIBSSH2} -DHTTP_ONLY=${USE_HTTP_ONLY} + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON OPTIONS_RELEASE -DBUILD_CURL_EXE=${BUILD_CURL_EXE} OPTIONS_DEBUG @@ -113,10 +110,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/curl) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/curl) +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/CURL) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL) elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/curl) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/curl) + vcpkg_fixup_cmake_targets() +else() + message(FATAL_ERROR "Could not locate the curl config files") endif() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/curl RENAME copyright) @@ -124,9 +123,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # the native CMAKE_EXECUTABLE_SUFFIX does not work in portfiles, so emulate it if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Windows - set(EXECUTABLE_SUFFIX ".exe") + set(EXECUTABLE_SUFFIX ".exe") else() - set(EXECUTABLE_SUFFIX "") + set(EXECUTABLE_SUFFIX "") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}") @@ -135,43 +134,21 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/curl${EXECUTABLE_SUFFIX}") vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/curl) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(READ "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" RELEASE_MODULE) + file(READ "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" RELEASE_MODULE) string(REPLACE "\${_IMPORT_PREFIX}/bin/curl${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/curl/curl${EXECUTABLE_SUFFIX}" RELEASE_MODULE "${RELEASE_MODULE}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/curl-target-release.cmake" "${RELEASE_MODULE}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/CURLTargets-release.cmake" "${RELEASE_MODULE}") endif() endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +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) - # Drop debug suffix, as FindCURL.cmake does not look for it - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d.lib") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib) - # Fixup libcurl-target-debug.cmake to match - file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" DEBUG_MODULE) - string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/libcurl-d.lib" "\${_IMPORT_PREFIX}/debug/lib/libcurl.lib" DEBUG_MODULE "${DEBUG_MODULE}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" "${DEBUG_MODULE}") - endif() else() file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libcurl_imp.lib ${CURRENT_PACKAGES_DIR}/lib/libcurl.lib) - # Fixup libcurl-target-release.cmake to match - file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-release.cmake" RELEASE_MODULE) - string(REPLACE "\${_IMPORT_PREFIX}/lib/libcurl_imp.lib" "\${_IMPORT_PREFIX}/lib/libcurl.lib" RELEASE_MODULE "${RELEASE_MODULE}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-release.cmake" "${RELEASE_MODULE}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl-d_imp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libcurl.lib) - # Fixup libcurl-target-debug.cmake to match - file(READ "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" DEBUG_MODULE) - string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/libcurl-d_imp.lib" "\${_IMPORT_PREFIX}/debug/lib/libcurl.lib" DEBUG_MODULE "${DEBUG_MODULE}") - file(WRITE "${CURRENT_PACKAGES_DIR}/share/curl/libcurl-target-debug.cmake" "${DEBUG_MODULE}") - endif() endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - file(READ ${CURRENT_PACKAGES_DIR}/include/curl/curl.h CURL_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) string(REPLACE "#ifdef CURL_STATICLIB" "#if 1" CURL_H "${CURL_H}") diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL index 265e8d7af..499e039ce 100644 --- a/ports/cutelyst2/CONTROL +++ b/ports/cutelyst2/CONTROL @@ -1,4 +1,4 @@ Source: cutelyst2 -Version: 2.5.2-2 +Version: 2.7.0 Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework Build-Depends: qt5-base diff --git a/ports/cutelyst2/portfile.cmake b/ports/cutelyst2/portfile.cmake index f22cad892..755cc3ed5 100644 --- a/ports/cutelyst2/portfile.cmake +++ b/ports/cutelyst2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cutelyst/cutelyst - REF 7f594d2b2d227e9e6a0474a55906db7d1ee1cd7e - SHA512 de04efd7bd9b07f7b0dd2b014eed93e26f0760ef8e458f8c56dc655977235f237bbc71cfe1c05d6791c2237073497ca4566548327ad01b99b4dbec7c491542c7 + REF v2.7.0 + SHA512 78848d6d4e79149d9e9ae07211875dd212eb046bcdde7cde0bd781ed89d006247b21bc7a37c4e028d0982bb0f69654d469eb37b857dc0d585e9adc79ecd6291d HEAD_REF master ) diff --git a/ports/cxxopts/CONTROL b/ports/cxxopts/CONTROL index 6b3928ce1..1d5664cec 100644 --- a/ports/cxxopts/CONTROL +++ b/ports/cxxopts/CONTROL @@ -1,3 +1,4 @@ Source: cxxopts -Version: 2.1.1 +Version: 2.1.2-1 +Homepage: https://github.com/jarro2783/cxxopts Description: This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options diff --git a/ports/cxxopts/portfile.cmake b/ports/cxxopts/portfile.cmake index 0710eb09b..dd5981e7d 100644 --- a/ports/cxxopts/portfile.cmake +++ b/ports/cxxopts/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jarro2783/cxxopts - REF v2.1.1 - SHA512 1da6ed65c3e0ee3e0beb39a5d0bccf6e32f44bbb37f8e849ada1421f03630981e4ede6d9966284bb642af6e75c71a1c9f7c9262ba9578d183d4514c011cbfa8e + REF v2.1.2 + SHA512 7ee3725995d4d0f78b75d1d87f10290f20529ca4aa430eb8dd1c59d98c6e99c54b54fc545926b59f499d02ae4f75f9064b3b5ebbab3f74031d3638e7a2378440 HEAD_REF master ) @@ -16,7 +16,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cxxopts TARGET_PATH share/cxxopts) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cxxopts) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/darts-clone/CONTROL b/ports/darts-clone/CONTROL index 2d34f86c7..a0bfad433 100644 --- a/ports/darts-clone/CONTROL +++ b/ports/darts-clone/CONTROL @@ -1,3 +1,3 @@ Source: darts-clone
-Version: 1767ab87cffe
+Version: 1767ab87cffe-1
Description: A static double-array trie structure
diff --git a/ports/darts-clone/portfile.cmake b/ports/darts-clone/portfile.cmake index 2979e83b5..d7eb7941c 100644 --- a/ports/darts-clone/portfile.cmake +++ b/ports/darts-clone/portfile.cmake @@ -23,4 +23,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
vcpkg_copy_pdbs()
+file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
+
file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright)
diff --git a/ports/date/CONTROL b/ports/date/CONTROL index 2c8428bf8..93f4b37cd 100644 --- a/ports/date/CONTROL +++ b/ports/date/CONTROL @@ -1,5 +1,6 @@ Source: date -Version: 081e9af +Version: ed0368f +Homepage: https://github.com/HowardHinnant/date Description: A date and time library based on the C++11/14/17 <chrono> header Feature: remote-api diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 1a7fcc663..c82db3330 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(WARNING - "You will need to also install http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml into your install location.\n" + "You will need to also install https://raw.githubusercontent.com/unicode-org/cldr/master/common/supplemental/windowsZones.xml into your install location.\n" "See https://howardhinnant.github.io/date/tz.html" ) endif() @@ -10,8 +10,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HowardHinnant/date - REF 081e9af55b56b8f0a8a43598f5be5469d585e212 - SHA512 2f02ffa8f523acedb34e414b4d82a50561f060366ab237154d84c68bc3f6df7541a8d0a6f655f83a72e8a0e5036f995b28413ed7a3ec607d3d1cf83dd92fa897 + REF ed0368fc75427ef05cefdf19a39b60d7bed2f039 + SHA512 5f6a0d7e094fd1ab7b6a1ea9a96e467138220e9207e2eda68f71b68d6c56759e7470fabdfa920d92876e9c9b466e56ea8102333f407a46bb4cba43a2dfeb5e3a HEAD_REF master ) diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL index ab248db1c..ad087563d 100644 --- a/ports/dcmtk/CONTROL +++ b/ports/dcmtk/CONTROL @@ -1,3 +1,3 @@ Source: dcmtk
-Version: 3.6.3-1
+Version: 3.6.4 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.
diff --git a/ports/dcmtk/dcmtk.patch b/ports/dcmtk/dcmtk.patch index c25a8db7b..cca14e28e 100644 --- a/ports/dcmtk/dcmtk.patch +++ b/ports/dcmtk/dcmtk.patch @@ -1,15 +1,16 @@ -diff --git "a/CMake/dcmtkPrepare.cmake" "b/CMake/dcmtkPrepare.cmake" ---- a/CMake/dcmtkPrepare.cmake 2018-02-05 12:58:13.000000000 -0500 -+++ b/CMake/dcmtkPrepare.cmake 2018-04-25 15:07:12.927851000 -0400 -@@ -192,9 +192,9 @@ +diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake +index e9f77b5..4f7ebe3 100644 +--- a/CMake/dcmtkPrepare.cmake ++++ b/CMake/dcmtkPrepare.cmake +@@ -192,9 +192,9 @@ include(GNUInstallDirs) # CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed # to different installation paths under Unix- and Windows-based systems - IF(UNIX) -- SET(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk") + if(UNIX) +- set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk") + SET(DCMTK_INSTALL_CMKDIR "share/dcmtk") - ELSEIF(WIN32) -- SET(DCMTK_INSTALL_CMKDIR "cmake") + elseif(WIN32) +- set(DCMTK_INSTALL_CMKDIR "cmake") + SET(DCMTK_INSTALL_CMKDIR "share/dcmtk") - ENDIF(UNIX) + endif() #----------------------------------------------------------------------------- diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index d11878a0e..cdf9b73e6 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DCMTK/dcmtk - REF DCMTK-3.6.3 - SHA512 5863d0c05f046075b998bced7c8c71bf8e969dd366f26d48cdf26012ea744ae4a22784a5c3c12e12b0f188e997c93a6890ef0c3c336865ea93f13c45f70b258d + REF 1967b13134308f311e6a827e616958c6a4da5bc9 + SHA512 a63a773e339081720adb0f3260a3b21ee11cde8009b321c3f45eeb40402ff29bd580926fb44f0dd784ba8369e2597933196bdaa324517d91fa5201b11b7504c0 HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch ) diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL index 98c27363a..8c65b2ddf 100644 --- a/ports/devil/CONTROL +++ b/ports/devil/CONTROL @@ -1,6 +1,7 @@ Source: devil Version: 1.8.0-4 Build-Depends: +Homepage: https://github.com/DentonW/DevIL Description: A full featured cross-platform image library Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index e9d17c122..e98f11565 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -1,3 +1,4 @@ Source: dimcli Version: 4.1.0 +Homepage: https://github.com/gknowles/dimcli Description: C++ command line parser toolkit diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL index 9c4de67c2..700756964 100644 --- a/ports/directxmesh/CONTROL +++ b/ports/directxmesh/CONTROL @@ -1,3 +1,4 @@ Source: directxmesh -Version: feb2019-1 -Description: DirectXMesh geometry processing library +Version: apr2019 +Homepage: https://github.com/Microsoft/DirectXMesh +Description: DirectXMesh geometry processing library
\ No newline at end of file diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 0ec9d2b00..53cd44b0c 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh
- REF feb2019
- SHA512 341870f6a66626ec78ac283434e568fd664d3331468ac06554d6403c9b1a34a737895ca3bc8c073a01b983db31cc1e398ef4828a0e794a7382cba04a6cf28f05
+ REF apr2019 + SHA512 a9e0dbf6483633a1727592de7e2fa733de993daff848d9ec2241ce54b67c7d24ed0419058f2f6ce256021dcf7e16d178b62ed9b8c7a1756504ab044f8740be1d
HEAD_REF master
)
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index 383057056..69b6d2ee2 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,3 +1,4 @@ Source: directxtex
-Version: feb2019-1
-Description: DirectXTex texture processing library
+Version: apr2019
+Homepage: https://github.com/Microsoft/DirectXTex
+Description: DirectXTex texture processing library
\ No newline at end of file diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 74e3caf47..94f9b69cb 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTex
- REF feb2019
- SHA512 4eea6fadbcaf1332565034a061c0688fc8ac1c3a25df22b7602f52c0558974e5aaa6aa3104dcfbd2a1718df35272e33a3302f49c0f79f6bee14233bca2532893
+ REF apr2019 + SHA512 3e50c5beb25416a0720614321bb2b712b5677b50989909ca703801080023f8f8ad168bbe4e5dc522500325989a8f6982026d7dc5029ee28d9dcfe35efdd002de
HEAD_REF master
)
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 81f29bd66..469788934 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,3 +1,4 @@ Source: directxtk -Version: feb2019-1 +Version: apr2019 +Homepage: https://github.com/Microsoft/DirectXTK Description: A collection of helper classes for writing DirectX 11.x code in C++. diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index bfa7384fb..245c8a4af 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF feb2019 - SHA512 f9b02eb8288d16eef9ab1fb81edb0c0fa9ee5a3eb4b990fe904306147f28a0bdb0ea8513d628806635b77bbfffd885ffd959efb95598584d9467742b6d31c0b3 + REF apr2019 + SHA512 811ed222c1650d34a8475e44719cca8972a85d96f9ccb10548e1501eb9d28fd8685de90832b517cdcbf21ae8c9160dea69000e8dca06fab745a15a7acc14ba98 HEAD_REF master ) diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index 41ffd54f7..466acece6 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,3 +1,4 @@ Source: directxtk12
Version: dec2016-1
+Homepage: https://github.com/Microsoft/DirectXTK12
Description: A collection of helper classes for writing DirectX 12 code in C++.
diff --git a/ports/dirent/CONTROL b/ports/dirent/CONTROL index 96aab8334..b8444bc98 100644 --- a/ports/dirent/CONTROL +++ b/ports/dirent/CONTROL @@ -1,3 +1,4 @@ Source: dirent -Version: 1.23.1 +Version: 1.23.2 +Homepage: https://github.com/tronkko/dirent Description: Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows. diff --git a/ports/dirent/portfile.cmake b/ports/dirent/portfile.cmake index 70ed405cc..80aab02f0 100644 --- a/ports/dirent/portfile.cmake +++ b/ports/dirent/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tronkko/dirent - REF 1.23.1 - SHA512 13c59f0d225ccc09a2b92a29b41b6644dabdb0b39df7bb528d5ac60dbe71a2770eaa37d3890e0df21065bc798e9cc018e174d34c6697da7da665caafe062bbc2 + REF 1.23.2 + SHA512 e7a991445ee9ca8f1118753df559d28beb283b3c0d25edcfb23dd5322f2bdfeadffe802d0c908bb6d4dfc17bf5ec38bdecfa717319fb4e26682bee0ba0d14c5c HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL index e4d98f524..094c4eaa3 100644 --- a/ports/discord-rpc/CONTROL +++ b/ports/discord-rpc/CONTROL @@ -1,4 +1,5 @@ Source: discord-rpc Version: 3.4.0 +Homepage: https://github.com/discordapp/discord-rpc Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. Build-Depends: rapidjson diff --git a/ports/dlfcn-win32/CONTROL b/ports/dlfcn-win32/CONTROL index c8fd02dce..24af3631f 100644 --- a/ports/dlfcn-win32/CONTROL +++ b/ports/dlfcn-win32/CONTROL @@ -1,3 +1,4 @@ Source: dlfcn-win32 Version: 1.1.1-1 +Homepage: https://github.com/dlfcn-win32/dlfcn-win32 Description: dlfcn-win32 is an implementation of dlfcn for Windows. diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL index 638391c61..2342c5737 100644 --- a/ports/dlib/CONTROL +++ b/ports/dlib/CONTROL @@ -1,6 +1,7 @@ Source: dlib -Version: 19.16-2 -Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas (!osx), clapack +Version: 19.17-1 +Build-Depends: libjpeg-turbo, libpng, sqlite3, fftw3, openblas (!osx), clapack (!osx) +Homepage: https://github.com/davisking/dlib Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ Feature: cuda diff --git a/ports/dlib/find_blas.patch b/ports/dlib/find_blas.patch new file mode 100644 index 000000000..3ea8d30ae --- /dev/null +++ b/ports/dlib/find_blas.patch @@ -0,0 +1,11 @@ +--- a/dlib/cmake_utils/find_blas.cmake ++++ b/dlib/cmake_utils/find_blas.cmake +@@ -414,7 +414,7 @@ + if (lapack_found) + include(CheckFunctionExists) + include(CheckFortranFunctionExists) +- set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries}) ++ set(CMAKE_REQUIRED_LIBRARIES ${lapack_libraries} ${blas_libraries}) + + check_function_exists("sgesv" LAPACK_FOUND_C_UNMANGLED) + check_function_exists("sgesv_" LAPACK_FOUND_C_MANGLED) diff --git a/ports/dlib/force_finding_packages.patch b/ports/dlib/force_finding_packages.patch index a62ccf22d..cd8be1607 100644 --- a/ports/dlib/force_finding_packages.patch +++ b/ports/dlib/force_finding_packages.patch @@ -1,8 +1,6 @@ -diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt -index d8a1362..088168c 100644 --- a/dlib/CMakeLists.txt +++ b/dlib/CMakeLists.txt -@@ -410,68 +410,9 @@ if (NOT TARGET dlib) +@@ -430,70 +430,9 @@ endif() if (DLIB_PNG_SUPPORT) @@ -11,7 +9,7 @@ index d8a1362..088168c 100644 - # Make sure there isn't something wrong with the version of LIBPNG - # installed on this system. Also never link to anything from anaconda - # since it's probably broken. -- if (PNG_FOUND AND NOT ("${PNG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)")) +- if (PNG_FOUND AND NOT ("${PNG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC) - set(CMAKE_REQUIRED_LIBRARIES ${PNG_LIBRARIES}) - CHECK_FUNCTION_EXISTS(png_create_read_struct LIBPNG_IS_GOOD) - endif() @@ -23,6 +21,8 @@ index d8a1362..088168c 100644 - # If we can't find libpng then statically compile it in. - include_directories(external/libpng external/zlib) - set(source_files ${source_files} +- external/libpng/arm/arm_init.c +- external/libpng/arm/filter_neon_intrinsics.c - external/libpng/png.c - external/libpng/pngerror.c - external/libpng/pngget.c @@ -74,7 +74,7 @@ index d8a1362..088168c 100644 set(source_files ${source_files} image_loader/png_loader.cpp image_saver/save_png.cpp -@@ -479,68 +420,8 @@ if (NOT TARGET dlib) +@@ -501,68 +440,8 @@ endif() if (DLIB_JPEG_SUPPORT) @@ -83,7 +83,7 @@ index d8a1362..088168c 100644 - # Make sure there isn't something wrong with the version of libjpeg - # installed on this system. Also don't use the installed libjpeg - # if this is an APPLE system because apparently it's broken (as of 2015/01/01). -- if (JPEG_FOUND AND NOT ("${JPEG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)")) +- if (JPEG_FOUND AND NOT ("${JPEG_INCLUDE_DIR}" MATCHES "(.*)(Ana|ana|mini)conda(.*)") AND NOT BUILDING_PYTHON_IN_MSVC) - set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARY}) - CHECK_FUNCTION_EXISTS(jpeg_read_header LIBJPEG_IS_GOOD) - endif() diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index be4a877cf..114c9b934 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -5,13 +5,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO davisking/dlib - REF v19.16 - SHA512 4e040ef88acff05e1a48e499b813c876b22ad3f989d076bdf19969d01036b62e51a0dff30b70046910ba31dfa1b1c2450a7fad41ae3142b7285ed74b8d584887 + REF v19.17 + SHA512 8574f48d0cc55685d494b3933079c16526fc7cfa3df85a76d51a1f13bebeccf3b6d7247981b53bd1c9e6e664e42245e518cefadf3420be1ab25b5dd6b8d55441 HEAD_REF master PATCHES fix-mac-jpeg.patch fix-sqlite3-fftw-linkage.patch force_finding_packages.patch + find_blas.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/dlib/external/libjpeg) @@ -76,5 +77,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h "${_contents}") # Handle copyright file(COPY ${SOURCE_PATH}/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dlib) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/COPYRIGHT) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/dlib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/dlib/copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL index 2291f0556..e623f8b85 100644 --- a/ports/doctest/CONTROL +++ b/ports/doctest/CONTROL @@ -1,3 +1,4 @@ Source: doctest -Version: 2.3.1 +Version: 2.3.2 +Homepage: https://github.com/onqtam/doctest Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 859e2be99..dbb94990e 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF 2.3.1 - SHA512 b8cb502054e05d6e348fa008b44eb49e7932e0ee15e413953ecfd3092ebc490e5924ee669f22abb85e349033e307e7e19ad44b0c6a98973a8ffe4c7aef9017b2 + REF 2.3.2 + SHA512 316c804d04c51e38ee54edb321c3f6c11e8b45d542add865e930a36430bb2b768c4302ec85a7470d2df7952981432ec4c1da662be46021eff0fa377f5cea85ba HEAD_REF master ) diff --git a/ports/double-conversion/CONTROL b/ports/double-conversion/CONTROL index 7bc0812f2..c6860524d 100644 --- a/ports/double-conversion/CONTROL +++ b/ports/double-conversion/CONTROL @@ -1,3 +1,4 @@ Source: double-conversion
-Version: 3.1.0-2
+Version: 3.1.4
+Homepage: https://github.com/google/double-conversion
Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.
diff --git a/ports/double-conversion/portfile.cmake b/ports/double-conversion/portfile.cmake index e3deba1fe..d7fd15f21 100644 --- a/ports/double-conversion/portfile.cmake +++ b/ports/double-conversion/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/double-conversion - REF 3.1.0 - SHA512 ba797a7203bc7eb8ba697dc758a3341578f0405b5ab42fbd5a22d9fac09d11dd8cb5ed9ff9ff369e8ae9397ec74c04c62fca29d1bc469c6d2ea1a84a6dff9188 + REF v3.1.4 + SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c HEAD_REF master ) diff --git a/ports/draco/CONTROL b/ports/draco/CONTROL index afdeb1e6d..ace5fc650 100644 --- a/ports/draco/CONTROL +++ b/ports/draco/CONTROL @@ -1,4 +1,5 @@ Source: draco
-Version: 1.3.3-2
+Version: 1.3.5
+Homepage: https://github.com/google/draco
Description: A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.
Build-Depends:
diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index 874ea7432..df0b1df22 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -1,30 +1,15 @@ -diff --git a/src/draco/core/symbol_coding_utils.h b/src/draco/core/symbol_coding_utils.h
-index be2183d..eaaca00 100644
---- a/src/draco/core/symbol_coding_utils.h
-+++ b/src/draco/core/symbol_coding_utils.h
-@@ -41,7 +41,9 @@ typename std::make_unsigned<IntTypeT>::type ConvertSignedIntToSymbol(
- if (val >= 0) {
- return static_cast<UnsignedType>(val) << 1;
- }
-- val = -(val + 1); // Map -1 to 0, -2 to -1, etc..
-+ // Map -1 to 0, -2 to -1, etc..
-+ val += 1;
-+ val *= -1;
- UnsignedType ret = static_cast<UnsignedType>(val);
- ret <<= 1;
- ret |= 1;
-diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc
-index 1aa52cc..cfbbdbd 100644
---- a/src/draco/io/parser_utils.cc
-+++ b/src/draco/io/parser_utils.cc
-@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) {
- uint32_t v;
- if (!ParseUnsignedInt(buffer, &v))
- return false;
-- *value = (sign < 0) ? -v : v;
-+ if (sign < 0)
-+ v *= -1;
-+ *value = v;
- return true;
- }
-
+diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc +index 0a22ba1..9862949 100644 +--- a/src/draco/io/parser_utils.cc ++++ b/src/draco/io/parser_utils.cc +@@ -150,7 +150,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { + uint32_t v; + if (!ParseUnsignedInt(buffer, &v)) + return false; +- *value = (sign < 0) ? -v : v; ++ if (sign < 0) ++ v *= -1; ++ *value = v; + return true; + } + diff --git a/ports/draco/fix-uwperror.patch b/ports/draco/fix-uwperror.patch new file mode 100644 index 000000000..ff643103e --- /dev/null +++ b/ports/draco/fix-uwperror.patch @@ -0,0 +1,13 @@ +diff --git a/src/draco/core/bit_utils.h b/src/draco/core/bit_utils.h +index f63cd07..0f6baaf 100644 +--- a/src/draco/core/bit_utils.h ++++ b/src/draco/core/bit_utils.h +@@ -26,6 +26,8 @@ + #include <intrin.h> + #endif // defined(_MSC_VER) + ++#pragma warning(disable:4146) ++ + namespace draco { + + // Returns the number of '1' bits within the input 32 bit integer. diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index 3486134fb..22d332f98 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -5,11 +5,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.3.3 - SHA512 80ed5a623046822f5bb26b2454c8ee8cc93ffe9eb3012e8461cefdfc577b26d69a92ea0f0c5e14f5f48c1ef99f9a7263b01710df376792e74358ae14e49c3897 + REF 1.3.5 + SHA512 f99fcbec60fbd1683d8aacc35ff8ad9ee1c84374132ad4cc8c0f56662f5d33f940f89028cf3e577cde3314fd0766c124f61798121e4127e888f302e9efe1a004 HEAD_REF master PATCHES fix-compile-error-uwp.patch + fix-uwperror.patch ) vcpkg_configure_cmake( diff --git a/ports/duilib/CMakeLists.txt b/ports/duilib/CMakeLists.txt deleted file mode 100644 index 63429eb56..000000000 --- a/ports/duilib/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} Root_src)
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Control Control_src)
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Core Core_src)
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Layout Layout_src)
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Utils Utils_src)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Control)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Core)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Layout)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
-
-set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-add_library(duilib STATIC ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
-
-add_definitions(-DUILIB_EXPORTS)
-target_link_libraries(duilib comctl32)
-set_target_properties(duilib PROPERTIES OUTPUT_NAME "duilib")
\ No newline at end of file diff --git a/ports/duilib/CONTROL b/ports/duilib/CONTROL index d95cb0f58..9154664ea 100644 --- a/ports/duilib/CONTROL +++ b/ports/duilib/CONTROL @@ -1,3 +1,3 @@ Source: duilib
-Version: 2019-4-28
-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.
\ No newline at end of file +Version: 2019-4-28-1
+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.
diff --git a/ports/duilib/enable-static.patch b/ports/duilib/enable-static.patch new file mode 100644 index 000000000..6f069d4a7 --- /dev/null +++ b/ports/duilib/enable-static.patch @@ -0,0 +1,20 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 96b8fe4..99dc314 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -19,8 +19,14 @@ if (MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:.936")
+ endif()
+
++if (BUILD_SHARED_LIBS STREQUAL ON)
++ SET(LINKAGE SHARED)
++else()
++ SET(LINKAGE STATIC)
++endif()
++
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+-add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
++add_library(duilib ${LINKAGE} ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
+
+ add_definitions(-DUILIB_EXPORTS)
+ target_link_libraries(duilib comctl32 gdi32 user32)
diff --git a/ports/duilib/fix-arm-build.patch b/ports/duilib/fix-arm-build.patch new file mode 100644 index 000000000..c4dbd902e --- /dev/null +++ b/ports/duilib/fix-arm-build.patch @@ -0,0 +1,11 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 6a4da5a..4961174 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -18,5 +18,5 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) + add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
+
+ add_definitions(-DUILIB_EXPORTS)
+-target_link_libraries(duilib comctl32)
++target_link_libraries(duilib comctl32 gdi32 user32)
+ set_target_properties(duilib PROPERTIES OUTPUT_NAME "duilib")
diff --git a/ports/duilib/fix-encoding.patch b/ports/duilib/fix-encoding.patch index 82d90664e..cf0947e77 100644 --- a/ports/duilib/fix-encoding.patch +++ b/ports/duilib/fix-encoding.patch @@ -1,374 +1,28 @@ -diff --git a/DuiLib/Control/UIGifAnim-patch.cpp b/DuiLib/Control/UIGifAnim-patch.cpp
-new file mode 100644
-index 0000000..61aa32f
---- /dev/null
-+++ b/DuiLib/Control/UIGifAnim-patch.cpp
-@@ -0,0 +1,368 @@
-+#include "StdAfx.h"
-+#include "UIGifAnim.h"
-+
-+///////////////////////////////////////////////////////////////////////////////////////
-+DECLARE_HANDLE(HZIP); // An HZIP identifies a zip file that has been opened
-+typedef DWORD ZRESULT;
-+typedef struct
-+{
-+ int index; // index of this file within the zip
-+ char name[MAX_PATH]; // filename within the zip
-+ DWORD attr; // attributes, as in GetFileAttributes.
-+ FILETIME atime,ctime,mtime;// access, create, modify filetimes
-+ long comp_size; // sizes of item, compressed and uncompressed. These
-+ long unc_size; // may be -1 if not yet known (e.g. being streamed in)
-+} ZIPENTRY;
-+typedef struct
-+{
-+ int index; // index of this file within the zip
-+ TCHAR name[MAX_PATH]; // filename within the zip
-+ DWORD attr; // attributes, as in GetFileAttributes.
-+ FILETIME atime,ctime,mtime;// access, create, modify filetimes
-+ long comp_size; // sizes of item, compressed and uncompressed. These
-+ long unc_size; // may be -1 if not yet known (e.g. being streamed in)
-+} ZIPENTRYW;
-+#define OpenZip OpenZipU
-+#define CloseZip(hz) CloseZipU(hz)
-+extern HZIP OpenZipU(void *z,unsigned int len,DWORD flags);
-+extern ZRESULT CloseZipU(HZIP hz);
-+#ifdef _UNICODE
-+#define ZIPENTRY ZIPENTRYW
-+#define GetZipItem GetZipItemW
-+#define FindZipItem FindZipItemW
-+#else
-+#define GetZipItem GetZipItemA
-+#define FindZipItem FindZipItemA
-+#endif
-+extern ZRESULT GetZipItemA(HZIP hz, int index, ZIPENTRY *ze);
-+extern ZRESULT GetZipItemW(HZIP hz, int index, ZIPENTRYW *ze);
-+extern ZRESULT FindZipItemA(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRY *ze);
-+extern ZRESULT FindZipItemW(HZIP hz, const TCHAR *name, bool ic, int *index, ZIPENTRYW *ze);
-+extern ZRESULT UnzipItem(HZIP hz, int index, void *dst, unsigned int len, DWORD flags);
-+///////////////////////////////////////////////////////////////////////////////////////
-+
-+namespace DuiLib
-+{
-+
-+ CGifAnimUI::CGifAnimUI(void)
-+ {
-+ m_pGifImage = NULL;
-+ m_pPropertyItem = NULL;
-+ m_nFrameCount = 0;
-+ m_nFramePosition = 0;
-+ m_bIsAutoPlay = true;
-+ m_bIsAutoSize = false;
-+ m_bIsPlaying = false;
-+ m_pStream = NULL;
-+ }
-+
-+
-+ CGifAnimUI::~CGifAnimUI(void)
-+ {
-+ DeleteGif();
-+ m_pManager->KillTimer( this, EVENT_TIEM_ID );
-+
-+ }
-+
-+ LPCTSTR CGifAnimUI::GetClass() const
-+ {
-+ return DUI_CTR_GIFANIM;
-+ }
-+
-+ LPVOID CGifAnimUI::GetInterface( LPCTSTR pstrName )
-+ {
-+ if( _tcscmp(pstrName, DUI_CTR_GIFANIM) == 0 ) return static_cast<CGifAnimUI*>(this);
-+ return CControlUI::GetInterface(pstrName);
-+ }
-+
-+ void CGifAnimUI::DoInit()
-+ {
-+ InitGifImage();
-+ }
-+
-+ bool CGifAnimUI::DoPaint(HDC hDC, const RECT& rcPaint, CControlUI* pStopControl)
-+ {
-+ if ( NULL == m_pGifImage )
-+ {
-+ InitGifImage();
-+ }
-+ DrawFrame( hDC );
-+ return true;
-+ }
-+
-+ void CGifAnimUI::DoEvent( TEventUI& event )
-+ {
-+ if( event.Type == UIEVENT_TIMER )
-+ OnTimer( (UINT_PTR)event.wParam );
-+ }
-+
-+ void CGifAnimUI::SetVisible(bool bVisible /* = true */)
-+ {
-+ CControlUI::SetVisible(bVisible);
-+ if (bVisible)
-+ PlayGif();
-+ else
-+ StopGif();
-+ }
-+
-+ void CGifAnimUI::SetAttribute(LPCTSTR pstrName, LPCTSTR pstrValue)
-+ {
-+ if( _tcscmp(pstrName, _T("bkimage")) == 0 ) SetBkImage(pstrValue);
-+ else if( _tcscmp(pstrName, _T("autoplay")) == 0 ) {
-+ SetAutoPlay(_tcscmp(pstrValue, _T("true")) == 0);
-+ }
-+ else if( _tcscmp(pstrName, _T("autosize")) == 0 ) {
-+ SetAutoSize(_tcscmp(pstrValue, _T("true")) == 0);
-+ }
-+ else
-+ CControlUI::SetAttribute(pstrName, pstrValue);
-+ }
-+
-+ void CGifAnimUI::SetBkImage(LPCTSTR pStrImage)
-+ {
-+ if( m_sBkImage == pStrImage || NULL == pStrImage) return;
-+
-+ m_sBkImage = pStrImage;
-+
-+ StopGif();
-+ DeleteGif();
-+
-+ Invalidate();
-+
-+ }
-+
-+ LPCTSTR CGifAnimUI::GetBkImage()
-+ {
-+ return m_sBkImage.GetData();
-+ }
-+
-+ void CGifAnimUI::SetAutoPlay(bool bIsAuto)
-+ {
-+ m_bIsAutoPlay = bIsAuto;
-+ }
-+
-+ bool CGifAnimUI::IsAutoPlay() const
-+ {
-+ return m_bIsAutoPlay;
-+ }
-+
-+ void CGifAnimUI::SetAutoSize(bool bIsAuto)
-+ {
-+ m_bIsAutoSize = bIsAuto;
-+ }
-+
-+ bool CGifAnimUI::IsAutoSize() const
-+ {
-+ return m_bIsAutoSize;
-+ }
-+
-+ void CGifAnimUI::PlayGif()
-+ {
-+ if (m_bIsPlaying || m_pGifImage == NULL)
-+ {
-+ return;
-+ }
-+
-+ long lPause = ((long*) m_pPropertyItem->value)[m_nFramePosition] * 10;
-+ if ( lPause == 0 ) lPause = 100;
-+ m_pManager->SetTimer( this, EVENT_TIEM_ID, lPause );
-+
-+ m_bIsPlaying = true;
-+ }
-+
-+ void CGifAnimUI::PauseGif()
-+ {
-+ if (!m_bIsPlaying || m_pGifImage == NULL)
-+ {
-+ return;
-+ }
-+
-+ m_pManager->KillTimer(this, EVENT_TIEM_ID);
-+ this->Invalidate();
-+ m_bIsPlaying = false;
-+ }
-+
-+ void CGifAnimUI::StopGif()
-+ {
-+ if (!m_bIsPlaying)
-+ {
-+ return;
-+ }
-+
-+ m_pManager->KillTimer(this, EVENT_TIEM_ID);
-+ m_nFramePosition = 0;
-+ this->Invalidate();
-+ m_bIsPlaying = false;
-+ }
-+
-+ void CGifAnimUI::InitGifImage()
-+ {
-+ m_pGifImage = LoadGifFromFile(GetBkImage());
-+ if ( NULL == m_pGifImage ) return;
-+ UINT nCount = 0;
-+ nCount = m_pGifImage->GetFrameDimensionsCount();
-+ GUID* pDimensionIDs = new GUID[ nCount ];
-+ m_pGifImage->GetFrameDimensionsList( pDimensionIDs, nCount );
-+ m_nFrameCount = m_pGifImage->GetFrameCount( &pDimensionIDs[0] );
-+ int nSize = m_pGifImage->GetPropertyItemSize( PropertyTagFrameDelay );
-+ m_pPropertyItem = (Gdiplus::PropertyItem*) malloc( nSize );
-+ m_pGifImage->GetPropertyItem( PropertyTagFrameDelay, nSize, m_pPropertyItem );
-+ delete[] pDimensionIDs;
-+ pDimensionIDs = NULL;
-+
-+ if (m_bIsAutoSize)
-+ {
-+ SetFixedWidth(m_pGifImage->GetWidth());
-+ SetFixedHeight(m_pGifImage->GetHeight());
-+ }
-+ if (m_bIsAutoPlay && nSize > 0)
-+ {
-+ PlayGif();
-+ }
-+ }
-+
-+ void CGifAnimUI::DeleteGif()
-+ {
-+ if (m_pStream != NULL )
-+ {
-+ m_pStream->Release();
-+ m_pStream = NULL;
-+ }
-+ if ( m_pGifImage != NULL )
-+ {
-+ delete m_pGifImage;
-+ m_pGifImage = NULL;
-+ }
-+
-+ if ( m_pPropertyItem != NULL )
-+ {
-+ free( m_pPropertyItem );
-+ m_pPropertyItem = NULL;
-+ }
-+ m_nFrameCount = 0;
-+ m_nFramePosition = 0;
-+ }
-+
-+ void CGifAnimUI::OnTimer( UINT_PTR idEvent )
-+ {
-+ if ( idEvent != EVENT_TIEM_ID )
-+ return;
-+ m_pManager->KillTimer( this, EVENT_TIEM_ID );
-+ this->Invalidate();
-+
-+ m_nFramePosition = (++m_nFramePosition) % m_nFrameCount;
-+
-+ long lPause = ((long*) m_pPropertyItem->value)[m_nFramePosition] * 10;
-+ if ( lPause == 0 ) lPause = 100;
-+ m_pManager->SetTimer( this, EVENT_TIEM_ID, lPause );
-+ }
-+
-+ void CGifAnimUI::DrawFrame( HDC hDC )
-+ {
-+ if ( NULL == hDC || NULL == m_pGifImage ) return;
-+ GUID pageGuid = Gdiplus::FrameDimensionTime;
-+ Gdiplus::Graphics graphics( hDC );
-+ graphics.DrawImage( m_pGifImage, m_rcItem.left, m_rcItem.top, m_rcItem.right-m_rcItem.left, m_rcItem.bottom-m_rcItem.top );
-+ m_pGifImage->SelectActiveFrame( &pageGuid, m_nFramePosition );
-+ }
-+
-+ Gdiplus::Image* CGifAnimUI::LoadGifFromFile(LPCTSTR pstrGifPath)
-+ {
-+ LPBYTE pData = NULL;
-+ DWORD dwSize = 0;
-+
-+ do
-+ {
-+ CDuiString sFile = CPaintManagerUI::GetResourcePath();
-+ if( CPaintManagerUI::GetResourceZip().IsEmpty() ) {
-+ sFile += pstrGifPath;
-+ HANDLE hFile = ::CreateFile(sFile.GetData(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, \
-+ FILE_ATTRIBUTE_NORMAL, NULL);
-+ if( hFile == INVALID_HANDLE_VALUE ) break;
-+ dwSize = ::GetFileSize(hFile, NULL);
-+ if( dwSize == 0 ) break;
-+
-+ DWORD dwRead = 0;
-+ pData = new BYTE[ dwSize ];
-+ ::ReadFile( hFile, pData, dwSize, &dwRead, NULL );
-+ ::CloseHandle( hFile );
-+
-+ if( dwRead != dwSize ) {
-+ delete[] pData;
-+ pData = NULL;
-+ break;
-+ }
-+ }
-+ else {
-+ sFile += CPaintManagerUI::GetResourceZip();
-+ HZIP hz = NULL;
-+ if( CPaintManagerUI::IsCachedResourceZip() ) hz = (HZIP)CPaintManagerUI::GetResourceZipHandle();
-+ else hz = OpenZip((void*)sFile.GetData(), 0, 2);
-+ if( hz == NULL ) break;
-+ ZIPENTRY ze;
-+ int i;
-+ if( FindZipItem(hz, pstrGifPath, true, &i, &ze) != 0 ) break;
-+ dwSize = ze.unc_size;
-+ if( dwSize == 0 ) break;
-+ pData = new BYTE[ dwSize ];
-+ int res = UnzipItem(hz, i, pData, dwSize, 3);
-+ if( res != 0x00000000 && res != 0x00000600) {
-+ delete[] pData;
-+ pData = NULL;
-+ if( !CPaintManagerUI::IsCachedResourceZip() ) CloseZip(hz);
-+ break;
-+ }
-+ if( !CPaintManagerUI::IsCachedResourceZip() ) CloseZip(hz);
-+ }
-+
-+ } while (0);
-+
-+ while (!pData)
-+ {
-+ HANDLE hFile = ::CreateFile(pstrGifPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, \
-+ FILE_ATTRIBUTE_NORMAL, NULL);
-+ if( hFile == INVALID_HANDLE_VALUE ) break;
-+ dwSize = ::GetFileSize(hFile, NULL);
-+ if( dwSize == 0 ) break;
-+
-+ DWORD dwRead = 0;
-+ pData = new BYTE[ dwSize ];
-+ ::ReadFile( hFile, pData, dwSize, &dwRead, NULL );
-+ ::CloseHandle( hFile );
-+
-+ if( dwRead != dwSize ) {
-+ delete[] pData;
-+ pData = NULL;
-+ }
-+ break;
-+ }
-+ if (!pData)
-+ {
-+ return NULL;
-+ }
-+
-+ Gdiplus::Image* pImage = LoadGifFromMemory(pData, dwSize);
-+ delete[] pData;
-+ return pImage;
-+ }
-+
-+ Gdiplus::Image* CGifAnimUI::LoadGifFromMemory( LPVOID pBuf,size_t dwSize )
-+ {
-+ HGLOBAL hMem = ::GlobalAlloc(GMEM_MOVEABLE, dwSize);
-+ BYTE* pMem = (BYTE*)::GlobalLock(hMem);
-+
-+ memcpy(pMem, pBuf, dwSize);
-+ ::GlobalUnlock(hMem);
-+
-+ ::CreateStreamOnHGlobal(hMem, TRUE, &m_pStream);
-+ Gdiplus::Image *pImg = Gdiplus::Image::FromStream(m_pStream);
-+ if(!pImg || pImg->GetLastStatus() != Gdiplus::Ok)
-+ {
-+ m_pStream->Release();
-+ m_pStream = NULL;
-+ return 0;
-+ }
-+ return pImg;
-+ }
-+
-+}
+diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 4961174..96b8fe4 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -14,6 +14,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Core) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Layout)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
+
++if (MSVC)
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /source-charset:.936")
++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /source-charset:.936")
++endif()
++
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+ add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} ${Root_src})
+
+diff --git a/DuiLib/Control/UIGifAnim.cpp b/DuiLib/Control/UIGifAnim.cpp +index 870c9da..61aa32f 100644 +--- a/DuiLib/Control/UIGifAnim.cpp ++++ b/DuiLib/Control/UIGifAnim.cpp +@@ -319,7 +319,6 @@ namespace DuiLib + + while (!pData) + { +- //读不到图片, 则直接去读取bitmap.m_lpstr指向的路径 + HANDLE hFile = ::CreateFile(pstrGifPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, \ + FILE_ATTRIBUTE_NORMAL, NULL); + if( hFile == INVALID_HANDLE_VALUE ) break; diff --git a/ports/duilib/fix-post-build-errors.patch b/ports/duilib/fix-post-build-errors.patch new file mode 100644 index 000000000..35fa5cc89 --- /dev/null +++ b/ports/duilib/fix-post-build-errors.patch @@ -0,0 +1,11 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 835d430..6a4da5a 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -20,6 +20,3 @@ add_library(duilib SHARED ${Control_src} ${Core_src} ${Layout_src} ${Utils_src} + add_definitions(-DUILIB_EXPORTS)
+ target_link_libraries(duilib comctl32)
+ set_target_properties(duilib PROPERTIES OUTPUT_NAME "duilib")
+-add_custom_command(TARGET duilib POST_BUILD
+- COMMAND ${CMAKE_COMMAND} -E copy_if_different
+- ${PROJECT_BINARY_DIR}/lib/duilib.dll ${PROJECT_SOURCE_DIR}/bin/duilib.dll)
diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake index c62c5dd2f..7e30c9940 100644 --- a/ports/duilib/portfile.cmake +++ b/ports/duilib/portfile.cmake @@ -6,19 +6,13 @@ vcpkg_from_github( REF d7f3a331a0fc6ba48429cd9e5c427570cc73bc35
SHA512 6381cac467d42e4811859411a5fa620e52075622e8fbec38a6ab320c33bc7d6fdddc809c150d6a10cc40c55a651345bda9387432898d24957b6ab0f5c4b5391c
HEAD_REF master
- PATCHES "fix-encoding.patch"
+ PATCHES
+ "fix-post-build-errors.patch"
+ "fix-arm-build.patch"
+ "fix-encoding.patch"
+ "enable-static.patch"
)
-file(REMOVE ${SOURCE_PATH}/DuiLib/Control/UIGifAnim.cpp)
-file(RENAME ${SOURCE_PATH}/DuiLib/Control/UIGifAnim-patch.cpp ${SOURCE_PATH}/DuiLib/Control/UIGifAnim.cpp)
-
-file(INSTALL ${SOURCE_PATH}/DuiLib DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- file(REMOVE ${SOURCE_PATH}/DuiLib/CMakeLists.txt)
- file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/DuiLib)
-endif()
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/DuiLib
PREFER_NINJA
@@ -26,6 +20,8 @@ vcpkg_configure_cmake( vcpkg_build_cmake()
+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)
@@ -39,4 +35,3 @@ else() endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duilib RENAME copyright)
-file(REMOVE_RECURSE ${SOURCE_PATH})
diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL index 3d70426b9..007025398 100644 --- a/ports/duktape/CONTROL +++ b/ports/duktape/CONTROL @@ -1,4 +1,5 @@ Source: duktape
-Version: 2.0.3-5
+Version: 2.3.0
+Homepage: https://github.com/svaarala/duktape
Description: Embeddable Javascript engine with a focus on portability and compact footprint.
Build-Depends:
diff --git a/ports/duktape/portfile.cmake b/ports/duktape/portfile.cmake index 2c28d3a59..ef1476a52 100644 --- a/ports/duktape/portfile.cmake +++ b/ports/duktape/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO svaarala/duktape - REF v2.0.3 - SHA512 6ad189f6f9291cbd7eb7227113302fd0c204018611bb37bf4acd7f6b0eb2a75837dac8fb9fba441a0d76e6f1dbad62e4750a6645f65de31611b089f6922bad26 + REF v2.3.0 + SHA512 dd715eab481b948cf71d3ad16d2544166eb53da0df8936a4ac9c33e1f1277ef6efe542782a4c7f689f6c0c8963d7094749af455ff6a8c59593aa56ebb57e5c6f HEAD_REF master ) @@ -28,7 +28,7 @@ if(NOT EXISTS ${PYTHON2_DIR}/easy_install${EXECUTABLE_SUFFIX}) vcpkg_download_distfile(GET_PIP URLS "https://bootstrap.pypa.io/get-pip.py" FILENAME "tools/python/python2/get-pip.py" - SHA512 fdbcef1037dca7cc914e2304af657ebd08239cd18c3e79786dc25c8ea39957674e012d7ea8ae2c99006e4b61d3a5e24669ac5771dc186697fd9fdb40b6cc07ae + SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad ) execute_process(COMMAND ${PYTHON2_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON2_DIR}/get-pip.py) endif() diff --git a/ports/dx/CONTROL b/ports/dx/CONTROL index 8f901cad3..d5ad97872 100644 --- a/ports/dx/CONTROL +++ b/ports/dx/CONTROL @@ -1,3 +1,4 @@ Source: dx
Version: 1.0.1-1
-Description: A modern C++ library for DirectX programming
+Homepage: https://github.com/sdcb/dx
+Description: A modern C++ library for DirectX programming
\ No newline at end of file diff --git a/ports/dxut/CONTROL b/ports/dxut/CONTROL index e36c9d6f1..600462882 100644 --- a/ports/dxut/CONTROL +++ b/ports/dxut/CONTROL @@ -1,3 +1,4 @@ Source: dxut
Version: 11.14-3
-Description: A "GLUT"-like framework for Direct3D 11.x Win32 desktop applications
+Homepage: https://github.com/Microsoft/DXUT
+Description: A "GLUT"-like framework for Direct3D 11.x Win32 desktop applications
\ No newline at end of file diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL index 1f8e01e57..f7f9c89a3 100644 --- a/ports/eastl/CONTROL +++ b/ports/eastl/CONTROL @@ -1,4 +1,5 @@ Source: eastl
-Version: 3.13.04-1
+Version: 3.13.05-1
+Homepage: https://github.com/electronicarts/EASTL
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.
diff --git a/ports/eastl/fixchar8_t.patch b/ports/eastl/fixchar8_t.patch new file mode 100644 index 000000000..51fcfe69a --- /dev/null +++ b/ports/eastl/fixchar8_t.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/CMake/CommonCppFlags.cmake b/scripts/CMake/CommonCppFlags.cmake
+index 566fbee..4fcca61 100644
+--- a/scripts/CMake/CommonCppFlags.cmake
++++ b/scripts/CMake/CommonCppFlags.cmake
+@@ -54,7 +54,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ message(FATAL_ERROR "Building with a gcc version less than 4.7.3 is not supported.")
+ endif()
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive-")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /W4 /permissive- /Zc:char8_t-")
+ endif()
+
+
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index 0b33ded5b..13cf14a21 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -6,9 +6,10 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO electronicarts/EASTL
- REF 3.13.04
- SHA512 4baa3dcf9fceac44f0c515db8bf50b7040afd5091162199c78bf9a1ab13ae19b4e55bb0bafe56da83a7b375ca0c15ba9c19d003de321ec6e40b489b2fe2561d5
+ REF 3.13.05
+ SHA512 2364554339203c972f10d58ebe8f14fb221a40451f4cd2c3c5acd6891e8580c1a0a5d4ba592c91349d3feca50d9880648bb37358820a1c9552dde3f7af400a82
HEAD_REF master
+ PATCHES fixchar8_t.patch # can be removed after electronicarts/EASTL#274 is resolved
)
vcpkg_configure_cmake(
diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL index ee257603f..0b2aac432 100644 --- a/ports/ebml/CONTROL +++ b/ports/ebml/CONTROL @@ -1,3 +1,4 @@ Source: ebml
-Version: 1.3.7
+Version: 1.3.9
+Homepage: https://github.com/Matroska-Org/libebml
Description: a C++ libary to parse EBML files
diff --git a/ports/ebml/export-endofstreamx.patch b/ports/ebml/export-endofstreamx.patch deleted file mode 100644 index f89035230..000000000 --- a/ports/ebml/export-endofstreamx.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d880a71996ba50c18d2e2d33ce4018b22566d9f4 Mon Sep 17 00:00:00 2001 -From: evpobr <evpobr@gmail.com> -Date: Sat, 17 Feb 2018 12:39:27 +0500 -Subject: [PATCH] Export SafeReadIOCallback::EndOfStreamX class from DLL - ---- - ebml/SafeReadIOCallback.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ebml/SafeReadIOCallback.h b/ebml/SafeReadIOCallback.h -index ea96727..3d9de07 100644 ---- a/ebml/SafeReadIOCallback.h -+++ b/ebml/SafeReadIOCallback.h -@@ -45,7 +45,7 @@ class EBML_DLL_API EbmlBinary; - - class EBML_DLL_API SafeReadIOCallback { - public: -- class EndOfStreamX { -+ class EBML_DLL_API EndOfStreamX { - public: - size_t mMissingBytes; - EndOfStreamX(std::size_t MissingBytes); --- -2.15.1.windows.2 - diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index 3eb8d642d..578e5d5e2 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -1,33 +1,28 @@ -include(vcpkg_common_functions)
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO Matroska-Org/libebml
- REF release-1.3.7
- SHA512 754dee128db2eb6f0ba09962312ddda79f3178238464dd6161cce50bd08fd4193490a48bb537c4e2a388dc339951909a8857617cb30500d76d5689da4f855b47
- HEAD_REF master
- PATCHES export-endofstreamx.patch
-)
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS -DDISABLE_PKGCONFIG=1
-)
-
-vcpkg_install_cmake()
-
-if (WIN32)
- vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-else ()
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ebml)
-endif ()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/ebml RENAME copyright)
+include(vcpkg_common_functions) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} does not currently support UWP") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Matroska-Org/libebml + REF release-1.3.9 + SHA512 3ae22ed491024b276edde9237df0e41a8e5a4e142ec6783c77d5286d7825fb59be62f336d07f7042baac8fc7ac004ad7cc4605754c5801d65547449ea04c287f + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DDISABLE_PKGCONFIG=1 +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EBML) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/ecm/CONTROL b/ports/ecm/CONTROL index 6b8ee2938..075cf894f 100644 --- a/ports/ecm/CONTROL +++ b/ports/ecm/CONTROL @@ -1,3 +1,4 @@ Source: ecm -Version: 5.56.0 +Version: 5.58.0 +Homepage: https://github.com/KDE/extra-cmake-modules Description: Extra CMake Modules (ECM), extra modules and scripts for CMake diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 1ccb9a5fc..8211fb97a 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF v5.56.0 - SHA512 6a65eeaae1974e4bb3b8910875d29cf48ee4d83627aa38179213110aa7e5a058e1721de53eb629baa8e27fd0853a8bbd5aaa2dc001ae4651626d9b7a83c79fa5 + REF v5.58.0 + SHA512 c08408c5842789ce61d17642025edca022bcc0b78aba3d7dc0af5a6973f5f26ebe6f65e6d97e516e64eaf778d4a70397c76a96c45a6ee8bda3f2a9d9fff5966e HEAD_REF master ) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a82e3ba45..3d6136dda 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,4 +1,4 @@ Source: ecsutil
-Version: 1.0.3.1
+Version: 1.0.6.1
Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
Build-Depends: atlmfc
diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cc5a70854..966281a4f 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -28,8 +28,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO EMCECS/ecs-object-client-windows-cpp
- REF v1.0.3.1
- SHA512 0bed2a0296dcb0ea952734feb44a9f35b01d1c6e08dc132cc2d006003df21e5e1a3070ab44f5c9e6986b230c292d62f695f7a06700e7ef8d50efc87f92d5814f
+ REF v1.0.6.1
+ SHA512 4b16b9ce1dbc9f541fe95a40c10678cd2b0192acc94bc3d57e58fbdf37964af84cdc901686555aad1f58d133632b1ad6f57976a5ac71aed1fce2fb44a2d0f8d3
HEAD_REF master
PATCHES NoLibSyms.patch
)
diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL index 3993a35f0..898b9ae71 100644 --- a/ports/eigen3/CONTROL +++ b/ports/eigen3/CONTROL @@ -1,3 +1,4 @@ Source: eigen3 -Version: 3.3.7-1 +Version: 3.3.7-2 +Homepage: https://bitbucket.org/eigen/eigen Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index 31806319f..ef6135373 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "eigen3's buildsystem uses very long paths and may fail on your system.\n" + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() diff --git a/ports/embree2/CONTROL b/ports/embree2/CONTROL index b36aef2fa..0fe3df484 100644 --- a/ports/embree2/CONTROL +++ b/ports/embree2/CONTROL @@ -1,4 +1,5 @@ Source: embree2 -Version: 2.16.4-4 +Version: 2.17.7 +Homepage: https://github.com/embree/embree Description: High Performance Ray Tracing Kernels. Build-Depends: tbb diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake index 914999038..446f379f0 100644 --- a/ports/embree2/portfile.cmake +++ b/ports/embree2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO embree/embree - REF v2.16.4 - SHA512 235f7273044c8971eb7f7ecca5f4556d2e75ec958fc10d8861792fdd889a0e1c115bcf45bf6de7c2c44117032af96cd49a252399a2454627dcb82fd943222a01 + REF v2.17.7 + SHA512 3ea548e5ed85f68dc1f9dfe864711f9b731e0df8a2258257f77db08bbdbe3a9014a626313e3ff41174f3b26f09dc8ff523900119ff4c8465bfff53f621052873 HEAD_REF devel2 ) diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL index 4c7ce74c7..77d06de9b 100644 --- a/ports/embree3/CONTROL +++ b/ports/embree3/CONTROL @@ -1,4 +1,4 @@ Source: embree3 -Version: 3.2.0-3 +Version: 3.5.2 Description: High Performance Ray Tracing Kernels. Build-Depends: tbb diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake index 0d1a6e9d5..142be6cd6 100644 --- a/ports/embree3/portfile.cmake +++ b/ports/embree3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO embree/embree - REF v3.2.0 - SHA512 296617251e4a9a95a5ceec10ce8f23daf180a8a61fd78bc5782dca7d5b15bddaa0b6f352e47d657a366ef9176a730ef2edc42451fbad8071c5ce8fbfb4515e51 + REF v3.5.2 + SHA512 f00403c8bc76428088a38990117245b5b11ac90a2df21fa12c2d5c2e8af45fb3708abb705c612e0d9d7b0cfe4edb51c8b9630b60081b39fcb4370f31ee37acc7 HEAD_REF master ) diff --git a/ports/enet/CONTROL b/ports/enet/CONTROL index f75b49de9..7d2a87bf5 100644 --- a/ports/enet/CONTROL +++ b/ports/enet/CONTROL @@ -1,4 +1,5 @@ Source: enet Version: 1.3.13 +Homepage: https://github.com/lsalzman/enet Description: Reliable UDP networking library diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL index 69c61a22c..024a7617b 100644 --- a/ports/ensmallen/CONTROL +++ b/ports/ensmallen/CONTROL @@ -1,5 +1,5 @@ -Source: ensmallen
-Version: 1.14.2
-Description: A header-only C++ library for mathematical optimization.
-Build-Depends: openblas, clapack, armadillo
-
+Source: ensmallen +Version: 1.15.1 +Description: A header-only C++ library for mathematical optimization. +Build-Depends: openblas (!osx), clapack (!osx), armadillo + diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake index 9fe88613c..edded904a 100644 --- a/ports/ensmallen/portfile.cmake +++ b/ports/ensmallen/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mlpack/ensmallen
- REF ensmallen-1.14.2
- SHA512 8aa8d00d80579c619e417d8fbc17c78c867f916161e3c412c3af24c1b7b9816c9e6faee981931e1591a45db0c797a081d45f1dfc3ea396a610ee2da55232b265
+ REF 8bea8d214b40be3cb42e817328c0791541fbcd6c + SHA512 b075b763c136c1d2d5088c533a8557e3d425da7bcfeb3748063c1e3225e58969eddfc5bd786cb02f29f71ea5e3288327481a0961f64b1d2ff1251a0f59c07779
HEAD_REF master
PATCHES
disable_tests.patch
diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL index 16dbcfc32..9585262b8 100644 --- a/ports/entityx/CONTROL +++ b/ports/entityx/CONTROL @@ -1,3 +1,4 @@ Source: entityx -Version: 1.2.0-3 -Description: EntityX - A fast, type-safe C++ Entity-Component system. <https://github.com/alecthomas/entityx> +Version: 1.3.0-1 +Description: EntityX - A fast, type-safe C++ Entity-Component system. +Homepage: https://github.com/alecthomas/entityx diff --git a/ports/entityx/fix-cmake.patch b/ports/entityx/fix-cmake.patch deleted file mode 100644 index 143cc52b1..000000000 --- a/ports/entityx/fix-cmake.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 87309bf..23f5063 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,7 @@ include(${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
- include(CheckCXXSourceCompiles)
-
- # Default compiler args
-+if(0)
- if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|.*Clang)")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Werror -Wall -Wextra -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=sign-compare -std=c++11")
- set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-@@ -41,6 +42,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
- set(CMAKE_CXX_FLAGS_RELEASE "/Ox -DNDEBUG")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ox /Zi /FS /DEBUG")
- endif()
-+endif()
-
- # if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-shadow -Wno-padded -Wno-missing-noreturn -Wno-global-constructors")
-@@ -156,9 +158,9 @@ endif (ENTITYX_BUILD_TESTING)
-
- configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h.in
-- ${CMAKE_CURRENT_SOURCE_DIR}/entityx/config.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h
- )
--
-+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
- if (NOT WINDOWS OR CYGWIN)
- set(entityx_libs -lentityx)
-@@ -179,6 +181,7 @@ install(
- DESTINATION "include"
- FILES_MATCHING PATTERN "*.h"
- )
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/entityx/config.h DESTINATION include/entityx)
-
- install(
- TARGETS ${install_libs}
diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake index bc6afccc3..b55f5f602 100644 --- a/ports/entityx/portfile.cmake +++ b/ports/entityx/portfile.cmake @@ -5,16 +5,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alecthomas/entityx - REF 1.2.0 - SHA512 682aa302cb4495666aab2c0b39a286f88cb28046bc8b2deb603402105e15e4b9692e32807077abc3f465e42a4e0f34a7e69169bc74fc5579a5c3d0e17b02fdb8 + REF 1.3.0 + SHA512 724a3f421f802e60a1106ff8a69435c9a9da14e35c3e88565bbc17bff3a17f2d9771818aac83320cc4f14de0ec770a66f1eb7cbf4318f43abd516c63e077c07d HEAD_REF master PATCHES - fix-cmake.patch enable-std14.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DENTITYX_BUILD_TESTING=false diff --git a/ports/entt/CONTROL b/ports/entt/CONTROL index 3489f8e78..4ce029aef 100644 --- a/ports/entt/CONTROL +++ b/ports/entt/CONTROL @@ -1,3 +1,4 @@ Source: entt -Version: 2.7.3-1 -Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. <https://github.com/skypjack/entt> +Version: 3.0.0-1 +Description: Gaming meets modern C++ - a fast and reliable entity-component system and much more. +Homepage: https://github.com/skypjack/entt diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index e69ed624f..3aed9147f 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -4,13 +4,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF v2.7.3 - SHA512 ffdb26f43ebf0090eed5de589df4194282e2ab89e5014bfe4acc2670729b86c93ea85e25b4b1e72de975287b8f0aa9e72d89e1cfb649e0a0f4f72838b00e5215 + REF v3.0.0 + SHA512 4c68d202bf00cb3f317bcf6e3c0d281e97718f6e4e198b2e280ec8bbfb7d1493e369ec30d2aea40aec3dbb5715a03bf445d1ea4f033621531e63998800bf2564 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/epsilon/CONTROL b/ports/epsilon/CONTROL index 94f9e1db8..3b740a976 100644 --- a/ports/epsilon/CONTROL +++ b/ports/epsilon/CONTROL @@ -1,3 +1,4 @@ Source: epsilon Version: 0.9.2 +Homepage: https://sourceforge.net/projects/epsilon-project/ Description: EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.
\ No newline at end of file diff --git a/ports/evpp/CONTROL b/ports/evpp/CONTROL index 741a94a22..7c61e4ebd 100644 --- a/ports/evpp/CONTROL +++ b/ports/evpp/CONTROL @@ -1,4 +1,5 @@ Source: evpp Version: 0.7.0 +Homepage: https://github.com/Qihoo360/evpp Description: A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols. Build-Depends: glog, libevent, rapidjson diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL index aa8696107..1868de82d 100644 --- a/ports/exiv2/CONTROL +++ b/ports/exiv2/CONTROL @@ -1,7 +1,8 @@ Source: exiv2 -Version: 0.27 +Version: 0.27.1-1 Build-Depends: zlib, expat, libiconv, gettext -Description: Image metadata library and tools http://www.exiv2.org +Description: Image metadata library and tools +Homepage: https://www.exiv2.org Feature: unicode -Description: Compile with unicode support on windows
\ No newline at end of file +Description: Compile with unicode support on windows diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 96cec76cb..d9e1ecb4d 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -3,14 +3,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF 0.27 - SHA512 ec605db73abcf3cc2df78c1fc3aae5335a51192f660668e39a4f20fc7f372b18c3cec9b704e1c71c356315fd75e791622de1dffe576432ee0fb12bf63a98a423 + REF 0.27.1 + SHA512 1b637138cee019122d98ae3c54e84416ba1a90531b3f541748697c9f1a8faee18699f10cef5a63bf60b8588e8c670925cbac3ad6c82e41160442f8a66380d407 HEAD_REF master PATCHES iconv.patch ) -if(WIN32 AND ("unicode" IN_LIST FEATURES)) +if((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND ("unicode" IN_LIST FEATURES)) set(enable_win_unicode TRUE) elseif() set(enable_win_unicode FALSE) @@ -28,8 +28,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/exiv2/cmake") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/exiv2/cmake) configure_file( ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake @@ -41,11 +40,12 @@ 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) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -# Handle copyright +# Handle copyright file(COPY ${SOURCE_PATH}/ABOUT-NLS DESTINATION ${CURRENT_PACKAGES_DIR}/share/exiv2) file(RENAME ${CURRENT_PACKAGES_DIR}/share/exiv2/ABOUT-NLS ${CURRENT_PACKAGES_DIR}/share/exiv2/copyright) diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL index 4cdb03f6e..f01b5b9e1 100644 --- a/ports/expat/CONTROL +++ b/ports/expat/CONTROL @@ -1,3 +1,4 @@ Source: expat Version: 2.2.6 +Homepage: https://github.com/libexpat/libexpat Description: XML parser library written in C diff --git a/ports/expected-lite/CONTROL b/ports/expected-lite/CONTROL new file mode 100644 index 000000000..315f1d01a --- /dev/null +++ b/ports/expected-lite/CONTROL @@ -0,0 +1,3 @@ +Source: expected-lite
+Version: 0.3.0
+Description: Expected objects in C++11 and later in a single-file header-only library
diff --git a/ports/expected-lite/portfile.cmake b/ports/expected-lite/portfile.cmake new file mode 100644 index 000000000..b8f1ac440 --- /dev/null +++ b/ports/expected-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/expected-lite
+ REF v0.3.0
+ SHA512 b24b58ff7bd6d5f355935854b6b5e67c7e9b2f1b6383ecdd2a1655833f414fd1189a07000b40c45a6df8a8641602c5eca19eb5e8639ac6cfe59e3d94bc102ab3
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DEXPECTED_LITE_OPT_BUILD_TESTS=OFF
+ -DEXPECTED_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL index e2de3bdf3..d55d903ae 100644 --- a/ports/exprtk/CONTROL +++ b/ports/exprtk/CONTROL @@ -1,3 +1,4 @@ Source: exprtk Version: 2019-03-29 +Homepage: https://github.com/ArashPartow/exprtk Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine. diff --git a/ports/fadbad/CONTROL b/ports/fadbad/CONTROL index ebf987962..103890c0e 100644 --- a/ports/fadbad/CONTROL +++ b/ports/fadbad/CONTROL @@ -1,3 +1,4 @@ Source: fadbad Version: 2.1.0 +Homepage: https://www.fadbad.com/ Description: FADBAD++ Templates for Automatic Differentiation diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL index 9076962c7..4d3dc062c 100644 --- a/ports/fastcdr/CONTROL +++ b/ports/fastcdr/CONTROL @@ -1,3 +1,3 @@ Source: fastcdr
-Version: 1.0.6-2
+Version: 1.0.9-1
Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.
diff --git a/ports/fastcdr/install-cmake.patch b/ports/fastcdr/install-cmake.patch index 0eff05063..04296897b 100644 --- a/ports/fastcdr/install-cmake.patch +++ b/ports/fastcdr/install-cmake.patch @@ -1,26 +1,13 @@ diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 46d6f20..5d73ec5 100644
+index 14747c9..65c3ddb 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
-@@ -139,7 +139,12 @@ if(MSVC OR MSVC_IDE)
- set(DIR_EXTENSION "/${MSVC_ARCH}")
- endif()
+@@ -155,7 +155,7 @@ elseif(NOT EPROSIMA_INSTALLER)
+ COMPONENT cmake
+ )
-- install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static
-+ if(BUILD_SHARED_LIBS)
-+ set(PROJECT_TARGETS ${PROJECT_NAME})
-+ else()
-+ set(PROJECT_TARGETS ${PROJECT_NAME}_static)
-+ endif()
-+ install(TARGETS ${PROJECT_TARGETS}
- EXPORT ${PROJECT_NAME}Targets
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}${DIR_EXTENSION}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}
-@@ -147,7 +152,6 @@ if(MSVC OR MSVC_IDE)
- COMPONENT libraries_${MSVC_ARCH}
- )
-
-- export(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_static FILE ${PROJECT_BINARY_DIR}/cmake/config/${PROJECT_NAME}Targets.cmake)
- install(EXPORT ${PROJECT_NAME}Targets
- DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}/${PROJECT_NAME}/cmake
- COMPONENT cmake
+- if(MSVC OR MSVC_IDE)
++ if(MSVC OR MSVC_IDE AND 0)
+ if(TARGET_TYPE STREQUAL "SHARED_LIBRARY")
+ # Install pdb files
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug/
diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake index c3b6967d9..f4f2f81f0 100644 --- a/ports/fastcdr/portfile.cmake +++ b/ports/fastcdr/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eProsima/Fast-CDR
- REF v1.0.6
- SHA512 80861ff6a0283e1398306e081fe70d7d185f980e5714ae51864cae012b8f79719efa24e7f41025b2bfb2052cb2a3098436c75a38407f8f5a331593cb91868fb2
+ REF v1.0.9
+ SHA512 2825e61fc4736c9364fc3130f649798cec11fcb56dc5e202c17731121ad8a2795f0fbf8acb5d8d662181bc470e7a3e95a5027283872714be505bb2562c2e2312
HEAD_REF master
PATCHES install-cmake.patch
)
@@ -19,17 +19,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastcdr/cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastcdr/cmake)
-file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" _contents)
-string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdrTargets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdrTargets.cmake)" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" "${_contents}")
+file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" _contents)
+string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdr-targets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdr-targets.cmake)" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdr-config.cmake" "${_contents}")
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr)
-# always build static and share library default
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(READ ${CURRENT_PACKAGES_DIR}/include/fastcdr/eProsima_auto_link.h EPROSIMA_AUTO_LINK_H)
string(REPLACE "#define EPROSIMA_LIB_PREFIX \"lib\"" "#define EPROSIMA_LIB_PREFIX" EPROSIMA_AUTO_LINK_H "${EPROSIMA_AUTO_LINK_H}")
diff --git a/ports/fastlz/CONTROL b/ports/fastlz/CONTROL index 354b8d5b8..4154ea953 100644 --- a/ports/fastlz/CONTROL +++ b/ports/fastlz/CONTROL @@ -1,3 +1,4 @@ Source: fastlz Version: 1.0-2 +Homepage: https://github.com/ariya/FastLZ Description: A lightning-fast lossless compression library diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL index 58b150645..aaae4f57b 100644 --- a/ports/fcl/CONTROL +++ b/ports/fcl/CONTROL @@ -1,4 +1,5 @@ Source: fcl
-Version: 0.5.0-5
+Version: 0.5.0-6
+Homepage: https://github.com/flexible-collision-library/fcl
Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles
Build-Depends: ccd, octomap
diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index 1bb4e9a15..65ff738d0 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -34,9 +34,9 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/fcl") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fcl) endif() diff --git a/ports/fdk-aac/CONTROL b/ports/fdk-aac/CONTROL index 5da063ee8..c7262f861 100644 --- a/ports/fdk-aac/CONTROL +++ b/ports/fdk-aac/CONTROL @@ -1,3 +1,4 @@ Source: fdk-aac
Version: 2018-07-08-1
+Homepage: https://github.com/mstorsjo/fdk-aac
Description: A standalone library of the Fraunhofer FDK AAC code
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index ce961fa55..4c1565679 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,6 @@ Source: ffmpeg -Version: 4.1-4 +Version: 4.1-8 +Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. 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. @@ -23,6 +24,14 @@ Feature: lzma Build-Depends: liblzma Description: lzma support in ffmpeg +Feature: bzip2 +Build-Depends: bzip2 +Description: bzip2 support in ffmpeg + +Feature: vpx +Build-Depends: libvpx +Description: WebM VP8/VP9 support in ffmpeg + Feature: x264 Build-Depends: x264, ffmpeg[gpl] Description: x264 support in ffmpeg diff --git a/ports/ffmpeg/FindFFMPEG.cmake b/ports/ffmpeg/FindFFMPEG.cmake index f8e65f53a..65ab59e90 100644 --- a/ports/ffmpeg/FindFFMPEG.cmake +++ b/ports/ffmpeg/FindFFMPEG.cmake @@ -1,13 +1,131 @@ -include(FindPackageHandleStandardArgs) - -find_path(FFMPEG_INCLUDE_DIRS NAMES libavcodec/avcodec.h) -unset(FFMPEG_LIBRARIES) -foreach(FFMPEG_SUBLIBRARY avformat avdevice avcodec avutil swscale) - find_library(FFMPEG_lib${FFMPEG_SUBLIBRARY}_LIBRARY NAMES ${FFMPEG_SUBLIBRARY}) - list(APPEND FFMPEG_LIBRARIES ${FFMPEG_lib${FFMPEG_SUBLIBRARY}_LIBRARY}) -endforeach() +# Distributed under the OSI-approved BSD 3-Clause License. +# +#.rst: +# FindFFMPEG +# -------- +# +# Find the FFPMEG libraries +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# The following variables will be defined: +# +# ``FFMPEG_FOUND`` +# True if FFMPEG found on the local system +# +# ``FFMPEG_INCLUDE_DIRS`` +# Location of FFMPEG header files +# +# ``FFMPEG_LIBRARY_DIRS`` +# Location of FFMPEG libraries +# +# ``FFMPEG_LIBRARIES`` +# List of the FFMPEG libraries found +# +# Hints +# ^^^^^ +# +# ``FFMPEG_ROOT`` +# Set this variable to a directory that contains a FFMPEG installation +# +# + +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) +include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake) + +find_dependency(Threads) +#list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS Threads::Threads) +if(UNIX) + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -pthread) +endif() + +# Platform dependent libraries required by FFMPEG +if(WIN32) + if(NOT CYGWIN) + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS wsock32 ws2_32 Secur32) + endif() +else() + list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS m) +endif() + +macro(FFMPEG_FIND varname shortname headername) + if(NOT FFMPEG_${varname}_INCLUDE_DIRS) + find_path(FFMPEG_${varname}_INCLUDE_DIRS NAMES lib${shortname}/${headername} ${headername} PATH_SUFFIXES ffmpeg) + endif() + if(NOT FFMPEG_${varname}_LIBRARY) + find_library(FFMPEG_${varname}_LIBRARY_RELEASE NAMES ${shortname} PATH_SUFFIXES ffmpeg ffmpeg/lib) + get_filename_component(FFMPEG_${varname}_LIBRARY_RELEASE_DIR ${FFMPEG_${varname}_LIBRARY_RELEASE} DIRECTORY) + find_library(FFMPEG_${varname}_LIBRARY_DEBUG NAMES ${shortname}d ${shortname} PATHS debug PATH_SUFFIXES ffmpeg ffmpeg/lib ffmpeg/debug/lib debug/ffmpeg/lib) + get_filename_component(FFMPEG_${varname}_LIBRARY_DEBUG_DIR ${FFMPEG_${varname}_LIBRARY_DEBUG} DIRECTORY) + select_library_configurations(FFMPEG_${varname}) + endif() + if (FFMPEG_${varname}_LIBRARY AND FFMPEG_${varname}_INCLUDE_DIRS) + set(FFMPEG_${varname}_FOUND 1) + list(APPEND FFMPEG_LIBRARY_DIRS ${FFMPEG_${varname}_LIBRARY_RELEASE_DIR} ${FFMPEG_${varname}_LIBRARY_DEBUG_DIR}) + endif() +endmacro(FFMPEG_FIND) + +macro(FFMPEG_FIND_GENEX varname shortname headername) + if(NOT FFMPEG_${varname}_INCLUDE_DIRS) + find_path(FFMPEG_${varname}_INCLUDE_DIRS NAMES lib${shortname}/${headername} ${headername} PATH_SUFFIXES ffmpeg) + endif() + if(NOT FFMPEG_${varname}_LIBRARY) + find_library(FFMPEG_${varname}_LIBRARY_RELEASE NAMES ${shortname} PATH_SUFFIXES ffmpeg ffmpeg/lib) + get_filename_component(FFMPEG_${varname}_LIBRARY_RELEASE_DIR ${FFMPEG_${varname}_LIBRARY_RELEASE} DIRECTORY) + find_library(FFMPEG_${varname}_LIBRARY_DEBUG NAMES ${shortname}d ${shortname} PATHS debug PATH_SUFFIXES ffmpeg ffmpeg/lib ffmpeg/debug/lib debug/ffmpeg/lib) + get_filename_component(FFMPEG_${varname}_LIBRARY_DEBUG_DIR ${FFMPEG_${varname}_LIBRARY_DEBUG} DIRECTORY) + set(FFMPEG_${varname}_LIBRARY "$<$<CONFIG:Debug>:${FFMPEG_${varname}_LIBRARY_DEBUG}>$<$<CONFIG:Release>:${FFMPEG_${varname}_LIBRARY_RELEASE}>" CACHE STRING "") + set(FFMPEG_${varname}_LIBRARIES ${FFMPEG_${varname}_LIBRARY} CACHE STRING "") + endif() + if (FFMPEG_${varname}_LIBRARY AND FFMPEG_${varname}_INCLUDE_DIRS) + set(FFMPEG_${varname}_FOUND 1) + list(APPEND FFMPEG_LIBRARY_DIRS ${FFMPEG_${varname}_LIBRARY_RELEASE_DIR} ${FFMPEG_${varname}_LIBRARY_DEBUG_DIR}) + endif() +endmacro(FFMPEG_FIND) + if(WIN32) - list(APPEND FFMPEG_LIBRARIES wsock32 ws2_32 Secur32) + if(NOT FFMPEG_${varname}_INCLUDE_DIRS) + find_path(FFMPEG_stdint_INCLUDE_DIRS NAMES stdint.h PATH_SUFFIXES ffmpeg) + endif() + if (FFMPEG_stdint_INCLUDE_DIRS) + set(STDINT_OK TRUE) + endif() +else() + set(STDINT_OK TRUE) +endif() + +FFMPEG_FIND(libavcodec avcodec avcodec.h) +FFMPEG_FIND(libavdevice avdevice avdevice.h) +FFMPEG_FIND(libavfilter avfilter avfilter.h) +FFMPEG_FIND(libavformat avformat avformat.h) +FFMPEG_FIND(libavutil avutil avutil.h) +FFMPEG_FIND(libswresample swresample swresample.h) +FFMPEG_FIND(libswscale swscale swscale.h) +FFMPEG_FIND_GENEX(libzlib zlib zlib.h) + +if (FFMPEG_libavcodec_FOUND AND FFMPEG_libavdevice_FOUND AND FFMPEG_libavfilter_FOUND AND FFMPEG_libavformat_FOUND AND FFMPEG_libavutil_FOUND AND FFMPEG_libswresample_FOUND AND FFMPEG_libswscale_FOUND AND FFMPEG_libzlib_FOUND AND STDINT_OK) + list(APPEND FFMPEG_INCLUDE_DIRS ${FFMPEG_libavformat_INCLUDE_DIRS} ${FFMPEG_libavdevice_INCLUDE_DIRS} ${FFMPEG_libavcodec_INCLUDE_DIRS} ${FFMPEG_libavutil_INCLUDE_DIRS} ${FFMPEG_libswscale_INCLUDE_DIRS} ${FFMPEG_stdint_INCLUDE_DIRS}) + list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS) + list(REMOVE_DUPLICATES FFMPEG_LIBRARY_DIRS) + + list(APPEND FFMPEG_LIBRARIES + ${FFMPEG_libavformat_LIBRARY} + ${FFMPEG_libavdevice_LIBRARY} + ${FFMPEG_libavcodec_LIBRARY} + ${FFMPEG_libavutil_LIBRARY} + ${FFMPEG_libswscale_LIBRARY} + ${FFMPEG_libavfilter_LIBRARY} + ${FFMPEG_libswresample_LIBRARY} + ${FFMPEG_libzlib_LIBRARY} + ${FFMPEG_PLATFORM_DEPENDENT_LIBS} + ) + set(FFMPEG_LIBRARY ${FFMPEG_LIBRARIES}) + + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE STRING "") + set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "") + set(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBRARY_DIRS} CACHE STRING "") endif() -find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS) +find_package_handle_standard_args(FFMPEG REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_LIBRARY_DIRS FFMPEG_INCLUDE_DIRS) diff --git a/ports/ffmpeg/fix_libvpx_windows_linking.patch b/ports/ffmpeg/fix_libvpx_windows_linking.patch new file mode 100644 index 000000000..805cd7e78 --- /dev/null +++ b/ports/ffmpeg/fix_libvpx_windows_linking.patch @@ -0,0 +1,55 @@ +diff --git "a/configure" "b/configure" +index c8be177..2fef830 100644 +--- "a/configure" ++++ "b/configure" +@@ -5098,6 +5098,8 @@ case "$arch" in + ;; + esac + ++libvpx_name=vpx ++ + # OS specific + case $target_os in + aix) +@@ -5269,6 +5271,15 @@ case $target_os in + enabled x86_64 && objformat="win64" || objformat="win32" + ranlib=: + enable dos_paths ++ if [ -z "${extra_cflags##*-MDd*}" ]; then ++ libvpx_name=vpxmdd ++ elif [ -z "${extra_cflags##*-MD*}" ]; then ++ libvpx_name=vpxmd ++ elif [ -z "${extra_cflags##*-MTd*}" ]; then ++ libvpx_name=vpxmtd ++ elif [ -z "${extra_cflags##*-MT*}" ]; then ++ libvpx_name=vpxmt ++ fi + ;; + cygwin*) + target_os=cygwin +@@ -6153,21 +6164,21 @@ enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h + enabled libvpx && { + enabled libvpx_vp8_decoder && { + check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || +- check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx || ++ check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name || + die "ERROR: libvpx decoder version must be >=1.4.0"; + } + enabled libvpx_vp8_encoder && { + check_pkg_config libvpx_vp8_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || +- check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx || ++ check_lib libvpx_vp8_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -l$libvpx_name || + die "ERROR: libvpx encoder version must be >=1.4.0"; + } + enabled libvpx_vp9_decoder && { + check_pkg_config libvpx_vp9_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || +- check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs" ++ check_lib libvpx_vp9_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs" + } + enabled libvpx_vp9_encoder && { + check_pkg_config libvpx_vp9_encoder "vpx >= 1.4.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || +- check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs" ++ check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-l$libvpx_name $libm_extralibs" + } + if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then + die "libvpx enabled but no supported decoders found" diff --git a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-1.patch b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-1.patch index 345061c3f..09ee1219f 100644 --- a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-1.patch +++ b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-1.patch @@ -1,5 +1,5 @@ ---- a/cmdutils.c 2017-07-29 19:49:29.000000000 +0200 -+++ b/cmdutils.c 2018-09-02 20:31:42.509408400 +0200 +--- a/fftools/cmdutils.c 2017-07-29 19:49:29.000000000 +0200 ++++ b/fftools/cmdutils.c 2018-09-02 20:31:42.509408400 +0200 @@ -62,6 +62,8 @@ #include <sys/resource.h> #endif diff --git a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch index fc63f1486..69d725e2a 100644 --- a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch +++ b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-2.patch @@ -1,5 +1,5 @@ ---- a/ffmpeg.c 2017-07-29 19:49:29.000000000 +0200 -+++ b/ffmpeg.c 2018-09-02 20:32:27.666725200 +0200 +--- a/fftools/ffmpeg.c 2017-07-29 19:49:29.000000000 +0200 ++++ b/fftools/ffmpeg.c 2018-09-02 20:32:27.666725200 +0200 @@ -23,6 +23,11 @@ * multimedia converter based on the FFmpeg libraries */ diff --git a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-3.patch b/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-3.patch deleted file mode 100644 index 78aa3d2d0..000000000 --- a/ports/ffmpeg/fix_windowsinclude-in-ffmpegexe-3.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/ffmpeg_dxva2.c 2017-07-29 19:49:29.000000000 +0200 -+++ b/ffmpeg_dxva2.c 2018-09-02 20:33:48.248716100 +0200 -@@ -16,12 +16,14 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - --#include <windows.h> -- - #ifdef _WIN32_WINNT - #undef _WIN32_WINNT - #endif - #define _WIN32_WINNT 0x0600 -+#define WIN32_LEAN_AND_MEAN -+ -+#include <windows.h> -+ - #define DXVA2API_USE_BITFIELDS - #define COBJMACROS - diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 786d82ea1..15be7468b 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_extract_source_archive_ex( configure_opencv.patch fix_windowsinclude-in-ffmpegexe-1.patch fix_windowsinclude-in-ffmpegexe-2.patch - fix_windowsinclude-in-ffmpegexe-3.patch + fix_libvpx_windows_linking.patch ) if (${SOURCE_PATH} MATCHES " ") @@ -25,16 +25,28 @@ endif() vcpkg_find_acquire_program(YASM) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) -if (WIN32) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(SEP ";") + #We're assuming that if we're building for Windows we're using MSVC + set(INCLUDE_VAR "INCLUDE") + set(LIB_PATH_VAR "LIB") +else() + set(SEP ":") + set(INCLUDE_VAR "CPATH") + set(LIB_PATH_VAR "LIBRARY_PATH") +endif() + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}") + set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make) else() vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make) endif() - + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) else() set(ENV{PATH} "$ENV{PATH}:${YASM_EXE_PATH}") @@ -42,8 +54,7 @@ else() set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/build_linux.sh) endif() -set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") -set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}") +set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${SEP}$ENV{${INCLUDE_VAR}}") set(_csc_PROJECT_PATH ffmpeg) @@ -84,6 +95,12 @@ else() set(OPTIONS "${OPTIONS} --disable-ffprobe") endif() +if("vpx" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libvpx") +else() + set(OPTIONS "${OPTIONS} --disable-libvpx") +endif() + if("x264" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-libx264") else() @@ -102,34 +119,38 @@ else() set(OPTIONS "${OPTIONS} --disable-lzma") endif() -# bzip2's debug library is named "bz2d", which isn't found by ffmpeg -# if("bzip2" IN_LIST FEATURES) -# set(OPTIONS "${OPTIONS} --enable-bzip2") -# else() -# set(OPTIONS "${OPTIONS} --disable-bzip2") -# endif() +if("bzip2" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-bzlib") +else() + set(OPTIONS "${OPTIONS} --disable-bzlib") +endif() + +set(OPTIONS_CROSS "") + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") + vcpkg_find_acquire_program(GASPREPROCESSOR) + foreach(GAS_PATH ${GASPREPROCESSOR}) + get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) + set(ENV{PATH} "$ENV{PATH};${GAS_ITEM_PATH}") + endforeach(GAS_PATH) +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") +else() + message(FATAL_ERROR "Unsupported architecture") +endif() if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\") - set(OPTIONS "${OPTIONS} --disable-programs --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") + set(OPTIONS "${OPTIONS} --disable-programs") set(OPTIONS "${OPTIONS} --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00") - - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - vcpkg_find_acquire_program(GASPREPROCESSOR) - foreach(GAS_PATH ${GASPREPROCESSOR}) - get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) - set(ENV{PATH} "$ENV{PATH};${GAS_ITEM_PATH}") - endforeach(GAS_PATH) - elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - else() - message(FATAL_ERROR "Unsupported architecture") - endif() + set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") endif() set(OPTIONS_DEBUG "") # Note: --disable-optimizations can't be used due to http://ffmpeg.org/pipermail/libav-user/2013-March/003945.html set(OPTIONS_RELEASE "") +set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}") set(OPTIONS "${OPTIONS} --extra-cflags=-DHAVE_UNISTD_H=0") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -141,7 +162,7 @@ endif() message(STATUS "Building Options: ${OPTIONS}") -if(WIN32) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd") set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MD --extra-cxxflags=-MD") @@ -151,6 +172,9 @@ if(WIN32) endif() endif() +set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}") +set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${SEP}${ENV_LIB_PATH}") + message(STATUS "Building ${_csc_PROJECT_PATH} for Release") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) vcpkg_execute_required_process( @@ -163,6 +187,8 @@ vcpkg_execute_required_process( LOGNAME build-${TARGET_TRIPLET}-rel ) +set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${SEP}${ENV_LIB_PATH}") + message(STATUS "Building ${_csc_PROJECT_PATH} for Debug") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) vcpkg_execute_required_process( @@ -179,6 +205,8 @@ file(GLOB DEF_FILES ${CURRENT_PACKAGES_DIR}/lib/*.def ${CURRENT_PACKAGES_DIR}/de if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") set(LIB_MACHINE_ARG /machine:ARM) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(LIB_MACHINE_ARG /machine:ARM64) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(LIB_MACHINE_ARG /machine:x86) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") @@ -215,8 +243,7 @@ vcpkg_copy_pdbs() # Handle copyright # TODO: Examine build log and confirm that this license matches the build output -file(COPY ${SOURCE_PATH}/COPYING.LGPLv2.1 DESTINATION ${CURRENT_PACKAGES_DIR}/share/ffmpeg) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/ffmpeg/COPYING.LGPLv2.1 ${CURRENT_PACKAGES_DIR}/share/ffmpeg/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LGPLv2.1 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -# Used by OpenCV -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindFFMPEG.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ffmpeg) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindFFMPEG.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..322387565 --- /dev/null +++ b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +if(NOT FFMPEG_LIBRARIES) + _find_package(${ARGS}) +endif() + +set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH}) diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL index 1ff42851f..4d378d8c3 100644 --- a/ports/fftw3/CONTROL +++ b/ports/fftw3/CONTROL @@ -1,5 +1,6 @@ Source: fftw3
-Version: 3.3.8-3
+Version: 3.3.8-6
+Homepage: https://www.fftw.org/
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).
Feature: openmp
diff --git a/ports/fftw3/fix-dynamic.patch b/ports/fftw3/fix-dynamic.patch deleted file mode 100644 index a39d1b968..000000000 --- a/ports/fftw3/fix-dynamic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/fftw3.h 2017-01-15 13:03:24.000000000 +0100 -+++ b/fftw3.h 2017-02-24 04:05:36.051091700 +0100 -@@ -47,6 +47,8 @@ - #ifndef FFTW3_H - #define FFTW3_H - -+#define FFTW_DLL -+ - #include <stdio.h> - - #ifdef __cplusplus diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 17ce37ea2..91f8f34a6 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -1,13 +1,4 @@ include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fftw-3.3.8)
-
-# This can be removed in the next source code update
-if(EXISTS "${SOURCE_PATH}/CMakeLists.txt")
- file(READ "${SOURCE_PATH}/CMakeLists.txt" _contents)
- if("${_contents}" MATCHES "-D_OPENMP -DLIBFFTWF33_EXPORTS /openmp /bigobj")
- file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src)
- endif()
-endif()
vcpkg_download_distfile(ARCHIVE
URLS "http://www.fftw.org/fftw-3.3.8.tar.gz"
@@ -15,14 +6,13 @@ vcpkg_download_distfile(ARCHIVE SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/omp_test.patch
- ${CMAKE_CURRENT_LIST_DIR}/patch_targets.patch
- ${CMAKE_CURRENT_LIST_DIR}/fftw3_arch_fix.patch
+ omp_test.patch
+ patch_targets.patch
+ fftw3_arch_fix.patch
)
if ("openmp" IN_LIST FEATURES)
@@ -68,8 +58,12 @@ else() set(HAVE_THREADS OFF)
endif()
-foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE)
- if(${PRECISION} MATCHES "ENABLE_LONG_DOUBLE")
+set(ENABLE_FLOAT_CMAKE fftw3f)
+set(ENABLE_LONG_DOUBLE_CMAKE fftw3l)
+set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3)
+
+foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
+ if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -77,6 +71,8 @@ foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE) -D${PRECISION}=ON
-DENABLE_OPENMP=${ENABLE_OPENMP}
-DENABLE_THREADS=${HAVE_THREADS}
+ -DWITH_COMBINED_THREADS=${HAVE_THREADS}
+ -DBUILD_TESTS=OFF
)
else()
vcpkg_configure_cmake(
@@ -91,27 +87,29 @@ foreach(PRECISION ENABLE_DEFAULT_PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE) -DHAVE_AVX2=${HAVE_AVX2}
-DHAVE_FMA=${HAVE_FMA}
-DENABLE_THREADS=${HAVE_THREADS}
+ -DWITH_COMBINED_THREADS=${HAVE_THREADS}
+ -DBUILD_TESTS=OFF
)
endif()
vcpkg_install_cmake()
- vcpkg_copy_pdbs()
- file(COPY ${SOURCE_PATH}/api/fftw3.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+ vcpkg_copy_pdbs()
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/${${PRECISION}_CMAKE})
+endforeach()
- if (VCPKG_CRT_LINKAGE STREQUAL dynamic)
- vcpkg_apply_patches(
- SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
- PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/fix-dynamic.patch)
- endif()
+file(READ ${SOURCE_PATH}/api/fftw3.h _contents)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ string(REPLACE "defined(FFTW_DLL)" "0" _contents "${_contents}")
+else()
+ string(REPLACE "defined(FFTW_DLL)" "1" _contents "${_contents}")
+endif()
+file(WRITE ${SOURCE_PATH}/include/fftw3.h "${_contents}")
- # Cleanup
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-endforeach()
+# Cleanup
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fftw3)
diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL index 9456fdb71..ab3acb20e 100644 --- a/ports/fizz/CONTROL +++ b/ports/fizz/CONTROL @@ -1,4 +1,4 @@ Source: fizz
-Version: 2019.01.14.00
+Version: 2019.05.20.00-1
Build-Depends: folly, openssl, libsodium, zlib
Description: a TLS 1.3 implementation by Facebook
diff --git a/ports/fizz/depend-zlib.patch b/ports/fizz/depend-zlib.patch deleted file mode 100644 index 6e574b62e..000000000 --- a/ports/fizz/depend-zlib.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
-index ab3b48f..c84890e 100644
---- a/fizz/CMakeLists.txt
-+++ b/fizz/CMakeLists.txt
-@@ -35,6 +35,7 @@ endif()
-
- find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)
- find_package(OpenSSL REQUIRED)
-+find_package(ZLIB REQUIRED)
- find_package(Glog REQUIRED)
- find_package(Gflags REQUIRED)
- find_package(Libevent REQUIRED)
-@@ -169,6 +170,7 @@ target_link_libraries(fizz
- ${FOLLY_LIBRARIES}
- ${Boost_LIBRARIES}
- ${OPENSSL_LIBRARIES}
-+ ${ZLIB_LIBRARIES}
- # Don't use the sodium target here because it will break clients that
- # consume fizz's exported targets (fizz-targets.cmake) since the sodium
- # target is not exported.
diff --git a/ports/fizz/find-zlib.patch b/ports/fizz/find-zlib.patch new file mode 100644 index 000000000..34e93168e --- /dev/null +++ b/ports/fizz/find-zlib.patch @@ -0,0 +1,14 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
+index 0c95883..52585aa 100644
+--- a/fizz/CMakeLists.txt
++++ b/fizz/CMakeLists.txt
+@@ -86,6 +86,9 @@ else()
+ list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
+ endif()
+
++find_package(ZLIB REQUIRED)
++list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB)
++
+ set(FIZZ_HEADER_DIRS
+ base
+ client
diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index add950fe3..373f1d407 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -5,10 +5,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebookincubator/fizz
- REF v2019.01.14.00
- SHA512 9182e5e6eb795842fdc536adaae9aeae7ddd17a34776bda303015dbac95c95a1ceb42ea77c3b69c1018a9ea33bbd469fd23955ac7efcc2bfcc84e899c89b5981
+ REF 6d26a1be8d7a20d8d89c374ee3dc5c452d18c18d
+ SHA512 bc6aa17a97fdfc53d0a247b876cbd1fea8214608b7e463dcf21e34df65015fe77e617c5a6c6bfa84b87e60e56b6aeb89aa2d8d774f97fc1f76f415869948a48a
HEAD_REF master
- PATCHES depend-zlib.patch
+ PATCHES find-zlib.patch
)
# Prefer installed config files
@@ -23,16 +23,21 @@ vcpkg_configure_cmake( 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_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz)
vcpkg_copy_pdbs()
file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents)
string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake
+"include(CMakeFindDependencyMacro)
+find_dependency(folly CONFIG)
+find_dependency(ZLIB)
+${_contents}")
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index 5fdc23b2e..fd8ecebc1 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,3 +1,5 @@ Source: flann -Version: 1.9.1-9 +Version: jan2019 +Homepage: https://github.com/mariusmuja/flann +Build-Depends: lz4 Description: Fast Library for Approximate Nearest Neighbors diff --git a/ports/flann/export-all-symbols-of-flann-cpp.patch b/ports/flann/export-all-symbols-of-flann-cpp.patch deleted file mode 100644 index 86f172ff3..000000000 --- a/ports/flann/export-all-symbols-of-flann-cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index 49c53f0..b9cf76b 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -52,6 +52,7 @@ set_target_properties(flann_cpp PROPERTIES - VERSION ${FLANN_VERSION} - SOVERSION ${FLANN_SOVERSION} - DEFINE_SYMBOL FLANN_EXPORTS -+ WINDOWS_EXPORT_ALL_SYMBOLS ON - ) - - if (BUILD_CUDA_LIB) diff --git a/ports/flann/fix_targets.patch b/ports/flann/fix_targets.patch new file mode 100644 index 000000000..b9ebe7cb7 --- /dev/null +++ b/ports/flann/fix_targets.patch @@ -0,0 +1,243 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f4b94d2..e55195b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,9 +146,6 @@ if (BUILD_CUDA_LIB) + endif(CUDA_FOUND) + endif(BUILD_CUDA_LIB) + +-find_package(PkgConfig REQUIRED) +-pkg_check_modules(LZ4 REQUIRED liblz4) +- + #set the C/C++ include path to the "include" directory + include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) + +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 6b95a71..2c95b6e 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -3,3 +3,5 @@ + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") + check_required_components("flann") + ++include(CMakeFindDependencyMacro) ++find_dependency(lz4) +diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake +index afe4742..0cf8289 100644 +--- a/cmake/flann_utils.cmake ++++ b/cmake/flann_utils.cmake +@@ -1,8 +1,7 @@ + macro(GET_OS_INFO) + string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME}) +- set(FLANN_LIB_INSTALL_DIR "lib${LIB_SUFFIX}") +- set(FLANN_INCLUDE_INSTALL_DIR +- "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}") ++ set(FLANN_LIB_INSTALL_DIR "lib") ++ set(FLANN_INCLUDE_INSTALL_DIR "include") + endmacro(GET_OS_INFO) + + +@@ -27,7 +26,7 @@ macro(find_hdf5) + set( HDF5_IS_PARALLEL FALSE ) + foreach( _dir ${HDF5_INCLUDE_DIRS} ) + if( EXISTS "${_dir}/H5pubconf.h" ) +- file( STRINGS "${_dir}/H5pubconf.h" ++ file( STRINGS "${_dir}/H5pubconf.h" + HDF5_HAVE_PARALLEL_DEFINE + REGEX "HAVE_PARALLEL 1" ) + if( HDF5_HAVE_PARALLEL_DEFINE ) +@@ -106,7 +105,7 @@ endmacro(flann_add_pyunit) + + macro(flann_download_test_data _name _md5) + string(REPLACE "/" "_" _dataset_name dataset_${_name}) +- ++ + add_custom_target(${_dataset_name} + COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/bin/download_checkmd5.py http://people.cs.ubc.ca/~mariusm/uploads/FLANN/datasets/${_name} ${TEST_OUTPUT_PATH}/${_name} ${_md5} + VERBATIM) +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 3f4655a..918b94a 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -1,9 +1,10 @@ + add_custom_target(examples ALL) + ++find_package(lz4 REQUIRED) + + if (BUILD_C_BINDINGS) + add_executable(flann_example_c flann_example.c) +- target_link_libraries(flann_example_c -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann_example_c lz4::lz4) + target_link_libraries(flann_example_c flann) + set_target_properties(flann_example_c PROPERTIES COMPILE_FLAGS -std=c99) + +@@ -15,7 +16,7 @@ if (HDF5_FOUND) + include_directories(${HDF5_INCLUDE_DIR}) + + add_executable(flann_example_cpp flann_example.cpp) +- target_link_libraries(flann_example_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann_example_cpp lz4::lz4) + target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES} flann_cpp) + if (HDF5_IS_PARALLEL) + target_link_libraries(flann_example_cpp ${MPI_LIBRARIES}) +@@ -27,7 +28,7 @@ if (HDF5_FOUND) + + if (USE_MPI AND HDF5_IS_PARALLEL) + add_executable(flann_example_mpi flann_example_mpi.cpp) +- target_link_libraries(flann_example_mpi -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) ++ target_link_libraries(flann_example_mpi lz4::lz4) + target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) + + add_dependencies(examples flann_example_mpi) +@@ -36,7 +37,3 @@ if (HDF5_FOUND) + else() + message("hdf5 library not found, not compiling flann_example.cpp") + endif() +- +- +- +- +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index b30f3da..1535d37 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -8,12 +8,13 @@ file(GLOB_RECURSE C_SOURCES flann.cpp) + file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp) + file(GLOB_RECURSE CU_SOURCES *.cu) + +-add_library(flann_cpp_s STATIC ${CPP_SOURCES}) +-target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES}) +-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) +- set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC) +-endif() +-set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA) ++find_package(lz4 REQUIRED) ++ ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ ++add_library(flann_cpp STATIC ${CPP_SOURCES}) ++target_link_libraries(flann_cpp PRIVATE lz4::lz4) ++set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) + + if (BUILD_CUDA_LIB) + SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA") +@@ -25,48 +26,11 @@ if (BUILD_CUDA_LIB) + else() + set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" ) + endif() +- cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES}) +- set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) +-endif() +- +-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) +- 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_CUDA_LIB) +- cuda_add_library(flann_cuda SHARED "") +- set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX) +- target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive) +- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) +- # target_link_libraries(flann_cuda cudpp_x86_64) +- endif() +-else() +- add_library(flann_cpp SHARED ${CPP_SOURCES}) +- target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) +- # export lz4 headers, so that MSVC to creates flann_cpp.lib +- set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) +- if (BUILD_CUDA_LIB) +- cuda_add_library(flann_cuda SHARED ${CPP_SOURCES}) +- set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) +- endif() +-endif() +- +-set_target_properties(flann_cpp PROPERTIES +- VERSION ${FLANN_VERSION} +- SOVERSION ${FLANN_SOVERSION} +- DEFINE_SYMBOL FLANN_EXPORTS +-) +- +-if (BUILD_CUDA_LIB) +- set_target_properties(flann_cuda PROPERTIES +- VERSION ${FLANN_VERSION} +- SOVERSION ${FLANN_SOVERSION} +- DEFINE_SYMBOL FLANN_EXPORTS +- ) ++ cuda_add_library(flann_cuda STATIC ${CU_SOURCES}) ++ set_property(TARGET flann_cuda PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) ++ set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) + endif() + +- + 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}) +@@ -80,31 +44,9 @@ endif() + + + if (BUILD_C_BINDINGS) +- add_library(flann_s STATIC ${C_SOURCES}) +- target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) +- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) +- set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC) +- endif() +- set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) +- +- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) +- add_library(flann SHARED "") +- set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) +- target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) +- else() +- add_library(flann SHARED ${C_SOURCES}) +- target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) +- +- if(MINGW AND OPENMP_FOUND) +- target_link_libraries(flann gomp) +- endif() +- endif() +- +- set_target_properties(flann PROPERTIES +- VERSION ${FLANN_VERSION} +- SOVERSION ${FLANN_SOVERSION} +- DEFINE_SYMBOL FLANN_EXPORTS +- ) ++ add_library(flann STATIC ${C_SOURCES}) ++ target_link_libraries(flann PRIVATE lz4::lz4) ++ set_property(TARGET flann PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) + endif() + + if(WIN32) +@@ -118,9 +60,9 @@ endif(WIN32) + + + install ( +- TARGETS flann_cpp flann_cpp_s ++ TARGETS flann_cpp + EXPORT ${targets_export_name} +- INCLUDES DESTINATION include ++ INCLUDES DESTINATION ${FLANN_INCLUDE_INSTALL_DIR} + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} +@@ -128,9 +70,9 @@ install ( + + if (BUILD_CUDA_LIB) + install ( +- TARGETS flann_cuda flann_cuda_s ++ TARGETS flann_cuda + EXPORT ${targets_export_name} +- INCLUDES DESTINATION include ++ INCLUDES DESTINATION ${FLANN_INCLUDE_INSTALL_DIR} + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} +@@ -139,7 +81,7 @@ endif() + + if (BUILD_C_BINDINGS) + install ( +- TARGETS flann flann_s ++ TARGETS flann + EXPORT ${targets_export_name} + INCLUDES DESTINATION include + RUNTIME DESTINATION bin diff --git a/ports/flann/flann-linux.patch b/ports/flann/flann-linux.patch deleted file mode 100644 index da95aa7a2..000000000 --- a/ports/flann/flann-linux.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/cpp/CMakeLists b/src/cpp/CMakeLists.txt -index e6c8ae06..c15a8e90 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -35,7 +35,7 @@ if (BUILD_CUDA_LIB) - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann_cpp SHARED "") -+ add_library(flann_cpp SHARED ${CPP_SOURCES}) - set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) - -@@ -90,7 +90,7 @@ if (BUILD_C_BINDINGS) - set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann SHARED "") -+ add_library(flann SHARED ${C_SOURCES}) - set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) - else() diff --git a/ports/flann/no-write-src-dir.patch b/ports/flann/no-write-src-dir.patch deleted file mode 100644 index c44c869cc..000000000 --- a/ports/flann/no-write-src-dir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index eb84c8a..e6c8ae0 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -2,7 +2,13 @@
-
- add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
-
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h)
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h)
-+include_directories(${CMAKE_CURRENT_BINARY_DIR}/flann)
-+
-+install (
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/flann/config.h
-+ DESTINATION include/flann
-+)
-
- file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c)
- file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c)
diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index f8c6b96d4..17770bd29 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -1,15 +1,17 @@ include(vcpkg_common_functions) +#the port uses inside the CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, which is discouraged by vcpkg. +#Since it's its author choice, we should not disallow it, but unfortunately looks like it's broken, so we block it anyway... +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariusmuja/flann - REF 1.9.1 - SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 + REF aa40936816f4feaa714d3a09f92a495da017d95c + SHA512 f6f2e75f4ce4bc4bc4cc1feab27fe683b8a5f9f5dcea35de4df5136a683b5dff5e68776008821a16ccf1a52a9807cb053c0062deba4fe121948248acd52864ef HEAD_REF master PATCHES - export-all-symbols-of-flann-cpp.patch - no-write-src-dir.patch - flann-linux.patch + fix_targets.patch ) vcpkg_configure_cmake( @@ -21,36 +23,15 @@ vcpkg_configure_cmake( -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF - -DCMAKE_DEBUG_POSTFIX=-gd + -DCMAKE_DEBUG_POSTFIX=d -DHDF5_NO_FIND_PACKAGE_CONFIG_FILE=ON ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(LIB_PREFIX "") - set(LIB_SUFFIX ".lib") -else() - set(LIB_PREFIX "lib") - set(LIB_SUFFIX ".a") -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann-gd${LIB_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp-gd${LIB_SUFFIX}) - - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann${LIB_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_s-gd${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann-gd${LIB_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp${LIB_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp_s-gd${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp-gd${LIB_SUFFIX}) -elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_s-gd${LIB_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${LIB_PREFIX}flann_cpp_s${LIB_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/${LIB_PREFIX}flann_cpp_s-gd${LIB_SUFFIX}) -endif() - # Handle copyright file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann) file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/COPYING ${CURRENT_PACKAGES_DIR}/share/flann/copyright) diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index c0b505eed..3baf26b02 100644 --- a/ports/flatbuffers/CONTROL +++ b/ports/flatbuffers/CONTROL @@ -1,4 +1,5 @@ -Source: flatbuffers
-Version: 1.10.0-1
-Description: Memory Efficient Serialization Library http://google.github.io/flatbuffers/
- 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.
+Source: flatbuffers +Version: 1.11.0-1 +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/ diff --git a/ports/flatbuffers/fix-uwp-build.patch b/ports/flatbuffers/fix-uwp-build.patch new file mode 100644 index 000000000..7d8fe93a3 --- /dev/null +++ b/ports/flatbuffers/fix-uwp-build.patch @@ -0,0 +1,20 @@ +diff --git a/src/util.cpp b/src/util.cpp +index c1bb197..658e116 100644 +--- a/src/util.cpp ++++ b/src/util.cpp +@@ -239,9 +239,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) { + #ifdef _MSC_VER + __pragma(warning(disable : 4996)); // _CRT_SECURE_NO_WARNINGS + #endif ++#if _WIN32_WINNT < 0x0A00 + auto env_str = std::getenv(var_name); + if (!env_str) return false; + if (_value) *_value = std::string(env_str); ++#else ++ //There is no support for environment variables in UWP ++ var_name; // Do nothing ++ *_value = std::string(""); ++#endif + return true; + } + diff --git a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch index 2205f0b37..38e1f12ec 100644 --- a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch +++ b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3388dd..699ea3b 100644 +index 119855a..945085a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -104,7 +104,7 @@ set(FlatBuffers_GRPCTest_SRCS +@@ -155,7 +155,7 @@ set(FlatBuffers_GRPCTest_SRCS # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS}) # source_group(Tests FILES ${FlatBuffers_Tests_SRCS}) @@ -10,4 +10,4 @@ index a3388dd..699ea3b 100644 +if(EXISTS "${CMAKE_TOOLCHAIN_FILE}" AND NOT DEFINED VCPKG_TOOLCHAIN) # do not apply any global settings if the toolchain # is being configured externally - elseif(APPLE) + message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.") diff --git a/ports/flatbuffers/no-werror.patch b/ports/flatbuffers/no-werror.patch index 7c2d548b9..b354e229d 100644 --- a/ports/flatbuffers/no-werror.patch +++ b/ports/flatbuffers/no-werror.patch @@ -1,17 +1,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3388dd..f0626e5 100644 +index 119855a..6269362 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -119,12 +119,16 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) +@@ -172,13 +172,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) "${CMAKE_CXX_FLAGS} -std=c++0x") endif(CYGWIN) set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow") -+ "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow") ++ "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow") + set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast") if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} -faligned-new") + "${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2") endif() + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) + set(CMAKE_CXX_FLAGS @@ -20,4 +21,3 @@ index a3388dd..f0626e5 100644 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter") endif() - diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index e055766b6..c619ac9ee 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -5,12 +5,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/flatbuffers - REF v1.10.0 - SHA512 b8382c8e9a45d6aca83270e93704b9ef2938e4ef9bb5165edbd8f286329e86353037ad6e54a99fd3d70b0c893d06cfd8766e00f05497e69be4b9e6c0506133d2 + REF v1.11.0 + SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/ignore_use_of_cmake_toolchain_file.patch - ${CMAKE_CURRENT_LIST_DIR}/no-werror.patch + ignore_use_of_cmake_toolchain_file.patch + no-werror.patch + fix-uwp-build.patch ) set(OPTIONS) @@ -28,7 +29,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/flatbuffers") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/flatbuffers) file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*) if(flatc_path) diff --git a/ports/flint/CONTROL b/ports/flint/CONTROL index 90797aa29..9b45b6608 100644 --- a/ports/flint/CONTROL +++ b/ports/flint/CONTROL @@ -1,4 +1,5 @@ Source: flint -Version: 2.5.2-2 +Version: 2.5.2-3 +Homepage: https://www.flintlib.org/ Description: Fast Library for Number Theory Build-Depends: mpir, mpfr, pthreads, gettimeofday diff --git a/ports/flint/dll_flint.patch b/ports/flint/dll_flint.patch index 15a6660b2..c8cecb7bf 100644 --- a/ports/flint/dll_flint.patch +++ b/ports/flint/dll_flint.patch @@ -16,7 +16,7 @@ index 3c8edd3..5c861d2 100644 <GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL
@@ -34,7 +34,7 @@ index 3c8edd3..5c861d2 100644 <GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL
@@ -52,7 +52,7 @@ index 3c8edd3..5c861d2 100644 <GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL
@@ -70,7 +70,7 @@ index 3c8edd3..5c861d2 100644 <GenerateDebugInformation>true</GenerateDebugInformation>
<LargeAddressAware>true</LargeAddressAware>
- <AdditionalDependencies>..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>@NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>postbuild $(IntDir) DLL
diff --git a/ports/fltk/CONTROL b/ports/fltk/CONTROL index 90f186ae2..da9d7223a 100644 --- a/ports/fltk/CONTROL +++ b/ports/fltk/CONTROL @@ -1,4 +1,5 @@ Source: fltk
Version: 1.3.4-6
+Homepage: https://www.fltk.org/
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.
Build-Depends: zlib, libpng, libjpeg-turbo
diff --git a/ports/fluidsynth/CONTROL b/ports/fluidsynth/CONTROL index 7fbb29a5b..fc79995bc 100644 --- a/ports/fluidsynth/CONTROL +++ b/ports/fluidsynth/CONTROL @@ -1,4 +1,4 @@ Source: fluidsynth -Version: 1.1.10 +Version: 2.0.5 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. Build-Depends: glib
\ No newline at end of file diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index ed0cf532d..5060faa8e 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -4,8 +4,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fluidsynth-1.1.10) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth - REF v1.1.10 - SHA512 7ff7757baf6dee37f65a4fd214ffab1aa1434cfd1545deb4108fe2e9b0ed19d616880b2740a693b51ade0a4be998a671910b43cae26eb67fb97b16a513752cbc + REF v2.0.5 + SHA512 5344ac889d2927dc2465bae40096d756a9bf9b1100e287ba0621c55ffc76f9cb8fa763f6bc832d701cd0ad2997965cf344f58ae4b3dd445eb3491e3659c093d9 HEAD_REF master ) diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL index aa6b868d5..4037af506 100644 --- a/ports/fmilib/CONTROL +++ b/ports/fmilib/CONTROL @@ -1,3 +1,4 @@ Source: fmilib
Version: 2.0.3-1
-Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. See http://www.fmi-standard.org/
+Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.
+Homepage: https://www.fmi-standard.org/
diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index 5692b7d12..46912d440 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -23,9 +23,9 @@ vcpkg_extract_source_archive(${ARCHIVE}) # Note that if you have configured and built both static and shared library on Windows
# but want to link with the static library compile time define "FMILIB_BUILDING_LIBRARY" must be set.
-if (WIN32 AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if ((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
SET(FMILIB_BUILDING_LIBRARY ON)
-else()
+else()
SET(FMILIB_BUILDING_LIBRARY OFF)
endif()
@@ -33,7 +33,7 @@ endif() # This is only used when generating Microsoft Visual Studio solutions. If the options is on then the library will
# be built against static runtime, otherwise - dynamic runtime (/MD or /MDd). Make sure the client code is using
# matching runtime
-if (WIN32 AND VCPKG_CRT_LINKAGE STREQUAL static)
+if ((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND VCPKG_CRT_LINKAGE STREQUAL static)
SET(FMILIB_BUILD_WITH_STATIC_RTLIB ON)
else()
SET(FMILIB_BUILD_WITH_STATIC_RTLIB OFF)
@@ -42,9 +42,9 @@ endif() # On LINUX position independent code (-fPIC) must be used on all files to be linked into a shared library (.so file).
# On other systems this is not needed (either is default or relocation is done). Set this option to OFF if you
# are building an application on Linux and use static library only
-if (UNIX AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+if ((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
SET(FMILIB_BUILD_FOR_SHARED_LIBS OFF)
-else()
+else()
SET(FMILIB_BUILD_FOR_SHARED_LIBS ON)
endif()
@@ -59,17 +59,17 @@ endif() SET(OPTIONS
-DFMILIB_BUILD_TESTS=OFF
- -DFMILIB_BUILD_STATIC_LIB=${FMILIB_BUILD_STATIC_LIB}
+ -DFMILIB_BUILD_STATIC_LIB=${FMILIB_BUILD_STATIC_LIB}
-DFMILIB_BUILD_SHARED_LIB=${FMILIB_BUILD_SHARED_LIB}
- -DFMILIB_BUILDING_LIBRARY=${FMILIB_BUILDING_LIBRARY}
- -DFMILIB_BUILD_WITH_STATIC_RTLIB=${FMILIB_BUILD_WITH_STATIC_RTLIB}
+ -DFMILIB_BUILDING_LIBRARY=${FMILIB_BUILDING_LIBRARY}
+ -DFMILIB_BUILD_WITH_STATIC_RTLIB=${FMILIB_BUILD_WITH_STATIC_RTLIB}
)
# Reset package dir
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR})
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR})
-if (WIN32)
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v120")
set(GENERATOR "Visual Studio 12 2013")
@@ -109,30 +109,30 @@ foreach(BUILDTYPE "rel" "dbg") # Reset working dir
file(REMOVE_RECURSE ${BUILD_DIR})
- file(MAKE_DIRECTORY ${BUILD_DIR})
+ file(MAKE_DIRECTORY ${BUILD_DIR})
SET(FMILIB_INSTALL_PREFIX ${CURRENT_PACKAGES_DIR})
- if(WIN32)
+ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
SET(OPTIONS ${OPTIONS} -G ${GENERATOR})
- endif()
+ endif()
if(NOT RELEASE_BUILD)
STRING(APPEND FMILIB_INSTALL_PREFIX "/debug")
endif()
# Step 1: Configure
- vcpkg_execute_required_process(COMMAND
- cmake
+ vcpkg_execute_required_process(COMMAND
+ cmake
-DFMILIB_INSTALL_PREFIX=${FMILIB_INSTALL_PREFIX}
- -DFMILIB_DEFAULT_BUILD_TYPE_RELEASE=${RELEASE_BUILD}
+ -DFMILIB_DEFAULT_BUILD_TYPE_RELEASE=${RELEASE_BUILD}
${OPTIONS}
${SOURCE_PATH}
- WORKING_DIRECTORY
+ WORKING_DIRECTORY
${BUILD_DIR}
)
# Step 2: Build
# Custom build - becouse vcpkg_configure_cmake() + vcpkg_install_cmake() fails on Linux for some unknown reason
- if (UNIX)
+ if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
find_program(MAKE make)
if(NOT MAKE)
message(FATAL_ERROR "Could not find make. Please install it through your package manager.")
@@ -144,12 +144,12 @@ foreach(BUILDTYPE "rel" "dbg") else()
SET(CONFIG "Debug")
endif()
- vcpkg_execute_required_process(COMMAND
- cmake
- --build .
- --config ${CONFIG}
- --target "install"
- WORKING_DIRECTORY
+ vcpkg_execute_required_process(COMMAND
+ cmake
+ --build .
+ --config ${CONFIG}
+ --target "install"
+ WORKING_DIRECTORY
${BUILD_DIR}
)
endif()
@@ -159,9 +159,9 @@ foreach(BUILDTYPE "rel" "dbg") # remove /doc folder
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc)
- # Move .dll files (if any) from /lib to /bin
+ # Move .dll files (if any) from /lib to /bin
file(GLOB TMP ${CURRENT_PACKAGES_DIR}/lib/*.dll)
- if (TMP)
+ if (TMP)
file(COPY ${TMP} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE ${TMP})
@@ -175,7 +175,7 @@ foreach(BUILDTYPE "rel" "dbg") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
- # Move .dll files (if any) from /lib to /bin
+ # Move .dll files (if any) from /lib to /bin
file(GLOB TMP ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
if (TMP)
file(COPY ${TMP} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
diff --git a/ports/fmt/CONTROL b/ports/fmt/CONTROL index 79e7804d5..c789e86f8 100644 --- a/ports/fmt/CONTROL +++ b/ports/fmt/CONTROL @@ -1,3 +1,4 @@ Source: fmt -Version: 5.3.0-1 +Version: 5.3.0-2 +Homepage: https://github.com/fmtlib/fmt Description: Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams. diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 228ed7651..f1778d985 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -18,10 +18,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmt RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll) + endif() # Force FMT_SHARED to 1 file(READ ${CURRENT_PACKAGES_DIR}/include/fmt/core.h FMT_CORE_H) @@ -32,12 +34,14 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets() -file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE) -string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE}) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}") -file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE) -string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE}) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake "${FMT_RELEASE_MODULE}") +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE) + string(REPLACE "lib/fmtd.dll" "bin/fmtd.dll" FMT_DEBUG_MODULE ${FMT_DEBUG_MODULE}) + file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake "${FMT_DEBUG_MODULE}") + file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake FMT_RELEASE_MODULE) + string(REPLACE "lib/fmt.dll" "bin/fmt.dll" FMT_RELEASE_MODULE ${FMT_RELEASE_MODULE}) + file(WRITE ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-release.cmake "${FMT_RELEASE_MODULE}") +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index d93759c42..268039ac7 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,7 +1,8 @@ Source: folly -Version: 2019.01.28.00-4 +Version: 2019.05.20.00-1 +Homepage: https://github.com/facebook/folly Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows -Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread +Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr Default-Features: zlib Feature: zlib diff --git a/ports/folly/boost-1.70.patch b/ports/folly/boost-1.70.patch new file mode 100644 index 000000000..97c01116d --- /dev/null +++ b/ports/folly/boost-1.70.patch @@ -0,0 +1,23 @@ +diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
+index d75e012..03019f3 100644
+--- a/folly/portability/PThread.cpp
++++ b/folly/portability/PThread.cpp
+@@ -18,6 +18,9 @@
+
+ #if !FOLLY_HAVE_PTHREAD && _WIN32
+ #include <boost/thread/tss.hpp> // @manual
++#include <boost/thread/exceptions.hpp>
++#include <boost/shared_ptr.hpp>
++#include <boost/thread/thread_only.hpp>
+
+ #include <errno.h>
+
+@@ -684,7 +687,7 @@ int pthread_setspecific(pthread_key_t key, const void* value) {
+ // function, which we don't want to do.
+ boost::detail::set_tss_data(
+ realKey,
+- boost::shared_ptr<boost::detail::tss_cleanup_function>(),
++ 0,0,
+ const_cast<void*>(value),
+ false);
+ return 0;
diff --git a/ports/folly/disable-non-underscore-posix-names.patch b/ports/folly/disable-non-underscore-posix-names.patch new file mode 100644 index 000000000..bbe79481c --- /dev/null +++ b/ports/folly/disable-non-underscore-posix-names.patch @@ -0,0 +1,27 @@ +diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h
+index f7990ca..b22fac5 100644
+--- a/folly/portability/Windows.h
++++ b/folly/portability/Windows.h
+@@ -26,16 +26,12 @@
+ // These have to be this way because we define our own versions
+ // of close(), because the normal Windows versions don't handle
+ // sockets at all.
+-#ifndef __STDC__
+-/* nolint */
+-#define __STDC__ 1
+-#include <direct.h> // @manual nolint
+-#include <io.h> // @manual nolint
+-#undef __STDC__
+-#else
+-#include <direct.h> // @manual nolint
+-#include <io.h> // @manual nolint
+-#endif
++#include <corecrt.h>
++#pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES")
++#define _CRT_INTERNAL_NONSTDC_NAMES 0
++#include <direct.h>
++#include <io.h>
++#pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")
+
+ #if defined(min) || defined(max)
+ #error Windows.h needs to be included by this header, or else NOMINMAX needs \
diff --git a/ports/folly/find-gflags.patch b/ports/folly/find-gflags.patch deleted file mode 100644 index a3e011683..000000000 --- a/ports/folly/find-gflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake -index 437c0cd..5530a35 100644 ---- a/CMake/folly-deps.cmake -+++ b/CMake/folly-deps.cmake -@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) - list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR}) - - set(FOLLY_HAVE_LIBGFLAGS OFF) --find_package(gflags CONFIG QUIET) -+find_package(gflags CONFIG REQUIRED) - if (gflags_FOUND) - message(STATUS "Found gflags from package config") - set(FOLLY_HAVE_LIBGFLAGS ON) diff --git a/ports/folly/missing-include-atomic.patch b/ports/folly/missing-include-atomic.patch new file mode 100644 index 000000000..54c1a4817 --- /dev/null +++ b/ports/folly/missing-include-atomic.patch @@ -0,0 +1,12 @@ +diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp
+index 2891c4c..7c98975 100644
+--- a/folly/portability/PThread.cpp
++++ b/folly/portability/PThread.cpp
+@@ -28,6 +28,7 @@
+ #include <mutex>
+ #include <shared_mutex>
+ #include <thread>
++#include <atomic>
+
+ #include <folly/lang/Assume.h>
+ #include <folly/portability/Windows.h>
diff --git a/ports/folly/no-werror.patch b/ports/folly/no-werror.patch deleted file mode 100644 index 32fbc9494..000000000 --- a/ports/folly/no-werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake -index a9cc2c1..de7d714 100644 ---- a/CMake/FollyCompilerUnix.cmake -+++ b/CMake/FollyCompilerUnix.cmake -@@ -34,7 +34,6 @@ function(apply_folly_compile_options_to_target THETARGET) - -std=${CXX_STD} - -finput-charset=UTF-8 - -fsigned-char -- -Werror - -Wall - -Wno-deprecated - -Wno-deprecated-declarations diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 63ba3c8d8..2317c780e 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -14,13 +14,14 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2019.01.28.00 - SHA512 cdd32d863bd98b31332fbcb25a548407857ffd8e611fb5d243821f43fcf240cb796fb4520dddec5537f398c10492e1ecb03de22f7ec0384b98411e9906f40d09 + REF 354223ec1602913667c52cee1ce0782a82cb0cad + SHA512 53dd401e5fe8aebf35bec7c1b49e45a7abf152ad12f7392f31653f9e644207d0926424948ad2d7974bf3e5eabaa97e3e9113f1318883bfc99b968b3700b19023 HEAD_REF master PATCHES - find-gflags.patch - no-werror.patch - # find-double-conversion.patch + missing-include-atomic.patch + boost-1.70.patch + reorder-glog-gflags.patch + disable-non-underscore-posix-names.patch ) file(COPY @@ -72,17 +73,23 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/folly) +vcpkg_fixup_cmake_targets() # 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/ssleay32.lib;\${_IMPORT_PREFIX}/lib/libeay32.lib" "ZLIB::ZLIB" _contents "${_contents}") -string(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}") +STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}") +STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}") string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$<CONFIG:DEBUG>:-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 +"include(CMakeFindDependencyMacro) +find_dependency(Threads) +find_dependency(glog CONFIG) +${_contents}") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/folly/reorder-glog-gflags.patch b/ports/folly/reorder-glog-gflags.patch new file mode 100644 index 000000000..85fd1d9fb --- /dev/null +++ b/ports/folly/reorder-glog-gflags.patch @@ -0,0 +1,28 @@ +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
+index e0bbcbb..fb45331 100644
+--- a/CMake/folly-deps.cmake
++++ b/CMake/folly-deps.cmake
+@@ -24,6 +24,11 @@ find_package(DoubleConversion MODULE REQUIRED)
+ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
+
++find_package(Glog MODULE)
++set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
++list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
++list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
++
+ find_package(Gflags MODULE)
+ set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
+@@ -31,11 +36,6 @@ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBGFLAGS_LIBRARY})
+ list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
+
+-find_package(Glog MODULE)
+-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
+-list(APPEND FOLLY_LINK_LIBRARIES ${GLOG_LIBRARY})
+-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
+-
+ find_package(LibEvent MODULE REQUIRED)
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index 5d75462c5..fbcc3f536 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,4 +1,5 @@ Source: fontconfig
-Version: 2.12.4-8
+Version: 2.12.4-9
+Homepage: https://www.freedesktop.org/software/fontconfig/front.html
Description: Library for configuring and customizing font access.
Build-Depends: freetype, expat, libiconv, dirent
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 4637f112c..772e741fd 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -36,7 +36,7 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
foreach(HEADER fcfreetype.h fontconfig.h)
file(READ ${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} FC_HEADER)
- if(WIN32)
+ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
string(REPLACE "#define FcPublic" "#define FcPublic __declspec(dllimport)" FC_HEADER "${FC_HEADER}")
else()
string(REPLACE "#define FcPublic" "#define FcPublic __attribute__((visibility(\"default\")))" FC_HEADER "${FC_HEADER}")
diff --git a/ports/forest/CONTROL b/ports/forest/CONTROL index adac34a80..39fda4672 100644 --- a/ports/forest/CONTROL +++ b/ports/forest/CONTROL @@ -1,3 +1,4 @@ Source: forest -Version: 11.0.0 +Version: 12.0.0 +Homepage: https://github.com/xorz57/forest Description: Template library of tree data structures diff --git a/ports/forest/portfile.cmake b/ports/forest/portfile.cmake index fb04e62f6..b142d181e 100644 --- a/ports/forest/portfile.cmake +++ b/ports/forest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xorz57/forest - REF 11.0.0 - SHA512 0af86e19f24297d8397a7981e9a7f4a00c10a08ca18998b2534bdeb37d258d973b56053d8a9cf4b4831099928b1b15af1402ce00930b21727bc25c22715b2adf + REF 12.0.0 + SHA512 c6f7a7ca098755bc6ac2f02048962d9f1d619c2d76671e9bb558524f760c3e28604db21991c2d9ebc90ffdb12ea00708d9a4fee1f4416ee216f3ef1dea0a1b97 HEAD_REF master ) diff --git a/ports/forge/CONTROL b/ports/forge/CONTROL index f4317486e..595f6d2a2 100644 --- a/ports/forge/CONTROL +++ b/ports/forge/CONTROL @@ -1,4 +1,4 @@ Source: forge
-Version: 1.0.3-1
+Version: 1.0.4-1 Description: Helps with high performance visualizations involving OpenGL-CUDA/OpenCL interop.
Build-Depends: glfw3, glm, glbinding, freetype, boost-functional, freeimage, fontconfig (!windows)
diff --git a/ports/forge/fix-static_build.patch b/ports/forge/fix-static_build.patch new file mode 100644 index 000000000..67f498cd8 --- /dev/null +++ b/ports/forge/fix-static_build.patch @@ -0,0 +1,28 @@ +diff --git a/extern/glad/CMakeLists.txt b/extern/glad/CMakeLists.txt +index c8c8d86..27adf86 100644 +--- a/extern/glad/CMakeLists.txt ++++ b/extern/glad/CMakeLists.txt +@@ -2,15 +2,19 @@ add_library(forge_glad_interface INTERFACE) + + target_include_directories(forge_glad_interface + INTERFACE +- ${CMAKE_CURRENT_SOURCE_DIR}/include ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> + ) + + target_sources(forge_glad_interface + INTERFACE +- ${CMAKE_CURRENT_SOURCE_DIR}/src/glad.c ++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/glad.c> + ) + + target_link_libraries(forge_glad_interface + INTERFACE +- ${CMAKE_DL_LIBS} ++ $<BUILD_INTERFACE:${CMAKE_DL_LIBS}> + ) ++ ++if (NOT BUILD_SHARED_LIBS) ++ install(TARGETS forge_glad_interface EXPORT ForgeTargets) ++endif () +\ No newline at end of file diff --git a/ports/forge/forge_targets_fix.patch b/ports/forge/forge_targets_fix.patch deleted file mode 100644 index f2d8371d2..000000000 --- a/ports/forge/forge_targets_fix.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c7236a6..b4b910a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,64 +110,63 @@ install(DIRECTORY include/ - PATTERN "*.h" - PATTERN "*.hpp" - PATTERN ".gitignore" EXCLUDE) --# The Forge version header is generated and thus need to be --# included explicitly -+ - install(FILES ${Forge_BINARY_DIR}/include/fg/version.h - DESTINATION "${FG_INSTALL_INC_DIR}/fg/" - COMPONENT headers) - --install(EXPORT ForgeTargets -- NAMESPACE Forge:: -- DESTINATION ${FG_INSTALL_CMAKE_DIR} -- COMPONENT forge) -- --export(EXPORT ForgeTargets -- NAMESPACE Forge:: -- FILE cmake/ForgeTargets.cmake) -+# install the examples irrespective of the FG_BUILD_EXAMPLES value -+# only the examples source files are installed, so the installation of these -+# source files does not depend on FG_BUILD_EXAMPLES -+# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without -+# building the example executables -+install(DIRECTORY examples/ #NOTE The slash at the end is important -+ DESTINATION ${FG_INSTALL_EXAMPLE_DIR} -+ COMPONENT examples) - - include(CMakePackageConfigHelpers) - write_basic_package_version_file( -- "${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake" -+ "${Forge_BINARY_DIR}/ForgeConfigVersion.cmake" - COMPATIBILITY SameMajorVersion) - --# This config file will be installed so we need to set the install_destination --# path relative to the install path -+ -+# export install config file - set(INCLUDE_DIRS include) - set(CMAKE_DIR ${FG_INSTALL_CMAKE_DIR}) - configure_package_config_file( -- "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" -- "cmake/install/ForgeConfig.cmake" -- INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}" -- PATH_VARS INCLUDE_DIRS CMAKE_DIR) -- --install(FILES ${Forge_BINARY_DIR}/cmake/install/ForgeConfig.cmake -- ${Forge_BINARY_DIR}/cmake/ForgeConfigVersion.cmake -+ "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" -+ "cmake_install/ForgeConfig.cmake" -+ INSTALL_DESTINATION "${FG_INSTALL_CMAKE_DIR}" -+ PATH_VARS INCLUDE_DIRS CMAKE_DIR -+) -+install(FILES ${Forge_BINARY_DIR}/cmake_install/ForgeConfig.cmake -+ ${Forge_BINARY_DIR}/ForgeConfigVersion.cmake - DESTINATION ${FG_INSTALL_CMAKE_DIR} -- COMPONENT cmake) -+ COMPONENT cmake -+) -+install(EXPORT ForgeTargets -+ NAMESPACE Forge:: -+ DESTINATION ${FG_INSTALL_CMAKE_DIR} -+ COMPONENT forge -+) - --# Following file will be used to create the config file for the build directory. --# These config files will be used by the examples to find the Forge --# libraries -+ -+# export build tree targets config file - set(INCLUDE_DIRS "${Forge_SOURCE_DIR}/include" "${Forge_BINARY_DIR}/include") --set(CMAKE_DIR "${Forge_BINARY_DIR}/cmake") -+set(CMAKE_DIR "${Forge_BINARY_DIR}") - configure_package_config_file( -- "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" -- "cmake/ForgeConfig.cmake" -- INSTALL_DESTINATION "${Forge_BINARY_DIR}/cmake" -- PATH_VARS INCLUDE_DIRS CMAKE_DIR -- INSTALL_PREFIX "${Forge_BINARY_DIR}") -+ "${PROJECT_SOURCE_DIR}/CMakeModules/ForgeConfig.cmake.in" -+ "ForgeConfig.cmake" -+ INSTALL_DESTINATION "${Forge_BINARY_DIR}" -+ PATH_VARS INCLUDE_DIRS CMAKE_DIR -+ INSTALL_PREFIX "${Forge_BINARY_DIR}" -+) -+export(EXPORT ForgeTargets -+ NAMESPACE Forge:: -+ FILE ForgeTargets.cmake -+) -+#export(PACKAGE Forge) - --#-------------------------------------------------------------------- --# Install examples --#-------------------------------------------------------------------- --# install the examples irrespective of the FG_BUILD_EXAMPLES value --# only the examples source files are installed, so the installation of these --# source files does not depend on FG_BUILD_EXAMPLES --# when FG_BUILD_EXAMPLES is OFF, the examples source is installed without --# building the example executables --install(DIRECTORY examples/ #NOTE The slash at the end is important -- DESTINATION ${FG_INSTALL_EXAMPLE_DIR} -- COMPONENT examples) - - include(CPackConfig) - -@@ -177,4 +176,4 @@ conditional_directory(FG_BUILD_EXAMPLES examples) - mark_as_advanced( - pkgcfg_lib_FontConfigPkg_freetype - pkgcfg_lib_FontConfigPkg_fontconfig -- ) -+) diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake index cd7c2ca54..24df90dce 100644 --- a/ports/forge/portfile.cmake +++ b/ports/forge/portfile.cmake @@ -4,18 +4,13 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") message(FATAL_ERROR "This port currently only supports x64 architecture")
endif()
-set(PATCHES forge_targets_fix.patch)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
- list(APPEND PATCHES static_build.patch)
-endif()
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO arrayfire/forge
- REF v1.0.3
- SHA512 e1a7688c1c3ab4659401463c5d025917b6e5766129446aefbebe0d580756cd2cc07256ddda9b20899690765220e5467b9209e00476c80ea6a51a1a0c0e9da616
+ REF 650bf611de102a2cc0c32dba7646f8128f0300c8 + SHA512 2093464db0f3a7f0178f65bed37986a4df1117f1d7ad65157d525584490cdf234475f01ed1a2003a9e54bdc3b9e2e450808044a264c2284d67b8c2a353400027
HEAD_REF master
- PATCHES ${PATCHES}
+ PATCHES fix-static_build.patch
)
vcpkg_configure_cmake(
@@ -41,4 +36,4 @@ file(REMOVE_RECURSE ${DLLS}
)
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/.github/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/forge RENAME copyright)
diff --git a/ports/forge/static_build.patch b/ports/forge/static_build.patch deleted file mode 100644 index 387811ce1..000000000 --- a/ports/forge/static_build.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/backend/opengl/CMakeLists.txt b/src/backend/opengl/CMakeLists.txt -index 1aeec1e..52eff05 100755 ---- a/src/backend/opengl/CMakeLists.txt -+++ b/src/backend/opengl/CMakeLists.txt -@@ -142,7 +142,7 @@ install(TARGETS forge - INCLUDES DESTINATION ${FG_INSTALL_INC_DIR}) - - # install dependencies --if (WIN32) -+if (WIN32 AND BUILD_SHARED_LIBS) - if (FG_WITH_FREEIMAGE AND NOT FG_USE_STATIC_FREEIMAGE) - install(FILES $<TARGET_FILE:FreeImage::FreeImage> - DESTINATION ${FG_INSTALL_BIN_DIR} -diff --git a/src/backend/opengl/glfw/CMakeLists.txt b/src/backend/opengl/glfw/CMakeLists.txt -index caf4913..3c8d71c 100644 ---- a/src/backend/opengl/glfw/CMakeLists.txt -+++ b/src/backend/opengl/glfw/CMakeLists.txt -@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS) - install(TARGETS forge_wtk_interface EXPORT ForgeTargets) - endif () - --if (WIN32) -+if (WIN32 AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_FILE:glfw> - DESTINATION ${FG_INSTALL_BIN_DIR} - COMPONENT dependencies) -diff --git a/src/backend/opengl/sdl/CMakeLists.txt b/src/backend/opengl/sdl/CMakeLists.txt -index d8cd312..d55f27d 100644 ---- a/src/backend/opengl/sdl/CMakeLists.txt -+++ b/src/backend/opengl/sdl/CMakeLists.txt -@@ -24,7 +24,7 @@ if (NOT BUILD_SHARED_LIBS) - install(TARGETS forge_wtk_interface EXPORT ForgeTargets) - endif () - --if (WIN32) -+if (WIN32 AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_FILE:SDL2::SDL2> - DESTINATION ${FG_INSTALL_BIN_DIR} - COMPONENT dependencies) diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL index c6f595c2f..1ee44b7f3 100644 --- a/ports/freeglut/CONTROL +++ b/ports/freeglut/CONTROL @@ -1,3 +1,4 @@ Source: freeglut -Version: 3.0.0-5 +Version: 3.0.0-6 +Homepage: https://sourceforge.net/projects/freeglut/ Description: Open source implementation of GLUT with source and binary backwards compatibility. diff --git a/ports/freeglut/macOS_Xquartz.patch b/ports/freeglut/macOS_Xquartz.patch new file mode 100644 index 000000000..423b3b901 --- /dev/null +++ b/ports/freeglut/macOS_Xquartz.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f68b27f..4339858 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -220,6 +220,16 @@ ENDIF() + IF(FREEGLUT_GLES) + ADD_DEFINITIONS(-DFREEGLUT_GLES) + LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) ++ELSEIF(APPLE) ++ # on OSX FindOpenGL uses framework version of OpenGL, but we need X11 version ++ FIND_PATH(GLX_INCLUDE_DIR GL/glx.h ++ PATHS /opt/X11/include /usr/X11/include /usr/X11R6/include) ++ FIND_LIBRARY(OPENGL_gl_LIBRARY GL ++ PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib) ++ FIND_LIBRARY(OPENGL_glu_LIBRARY GLU ++ PATHS /opt/X11/lib /usr/X11/lib /usr/X11R6/lib) ++ LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) ++ INCLUDE_DIRECTORIES(${GLX_INCLUDE_DIR}) + ELSE() + FIND_PACKAGE(OpenGL REQUIRED) + LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 24d022b17..86d691593 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,22 +1,23 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freeglut-3.0.0) vcpkg_download_distfile(ARCHIVE - URLS "https://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/freeglut-3.0.0.tar.gz/download" + URLS "http://downloads.sourceforge.net/project/freeglut/freeglut/3.0.0/freeglut-3.0.0.tar.gz" FILENAME "freeglut-3.0.0.tar.gz" SHA512 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0 ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + use_targets_to_export_x11_dependency.patch + macOS_Xquartz.patch +) if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev") + message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n xrandr\n xi\n xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.") endif() -# disable debug suffix, because FindGLUT.cmake from CMake 3.8 doesn't support it -file(READ ${SOURCE_PATH}/CMakeLists.txt FREEGLUT_CMAKELISTS) -string(REPLACE "SET( CMAKE_DEBUG_POSTFIX \"d\" )" - "\#SET( CMAKE_DEBUG_POSTFIX \"d\" )" FREEGLUT_CMAKELISTS "${FREEGLUT_CMAKELISTS}") -file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${FREEGLUT_CMAKELISTS}") - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(FREEGLUT_STATIC OFF) set(FREEGLUT_DYNAMIC ON) @@ -27,8 +28,10 @@ endif() # Patch header file(READ ${SOURCE_PATH}/include/GL/freeglut_std.h FREEGLUT_STDH) -string(REGEX REPLACE "\"freeglut[_a-z]+.lib\"" +string(REGEX REPLACE "\"freeglut_static.lib\"" "\"freeglut.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") +string(REGEX REPLACE "\"freeglut_staticd.lib\"" + "\"freeglutd.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}") vcpkg_configure_cmake( @@ -46,7 +49,7 @@ vcpkg_install_cmake() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib) endif() endif() @@ -59,3 +62,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/freeglut/COPYING ${CURRENT_PACKAGES_DI vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut) +endif() diff --git a/ports/freeglut/use_targets_to_export_x11_dependency.patch b/ports/freeglut/use_targets_to_export_x11_dependency.patch new file mode 100644 index 000000000..9933efd44 --- /dev/null +++ b/ports/freeglut/use_targets_to_export_x11_dependency.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d3260b..edf034a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,8 +257,6 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC) + INCLUDE(CheckIncludeFiles) + IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) + FIND_PACKAGE(X11 REQUIRED) +- INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) +- LIST(APPEND LIBS ${X11_LIBRARIES}) + IF(X11_Xrandr_FOUND) + SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) + LIST(APPEND LIBS ${X11_Xrandr_LIB}) +@@ -339,9 +337,15 @@ ENDIF() + + IF(FREEGLUT_BUILD_SHARED_LIBS) + ADD_LIBRARY(freeglut SHARED ${FREEGLUT_SRCS}) ++ IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) ++ TARGET_LINK_LIBRARIES(freeglut PRIVATE X11::X11) ++ ENDIF() + ENDIF() + IF(FREEGLUT_BUILD_STATIC_LIBS) + ADD_LIBRARY(freeglut_static STATIC ${FREEGLUT_SRCS}) ++ IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) ++ TARGET_LINK_LIBRARIES(freeglut_static PRIVATE X11::X11) ++ ENDIF() + ENDIF() + + diff --git a/ports/freeglut/vcpkg-cmake-wrapper.cmake b/ports/freeglut/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..5d57ad490 --- /dev/null +++ b/ports/freeglut/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +_find_package(${ARGS})
+if(GLUT_FOUND)
+ find_library(XRANDR_LIBRARY NAMES xrandr Xrandr)
+ if(XRANDR_LIBRARY)
+ list(APPEND GLUT_LIBRARIES ${XRANDR_LIBRARY})
+ if(TARGET GLUT::GLUT)
+ set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${XRANDR_LIBRARY})
+ endif()
+ endif()
+endif()
diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index 60c7f9bd8..af3d1c37f 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -4,9 +4,6 @@ include(GNUInstallDirs) project(FreeImage C CXX) -set(CMAKE_MODULE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/share/JXR" ${CMAKE_MODULE_PATH}) -set(CMAKE_MODULE_PATH "${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/share/OpenEXR" ${CMAKE_MODULE_PATH}) - if(MSVC) add_definitions("-D_CRT_SECURE_NO_WARNINGS") set(CMAKE_CXX_FLAGS "/wd4828 ${CMAKE_CXX_FLAGS}") diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index 51ebbbc69..9d9a006c6 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,4 +1,5 @@ Source: freeimage -Version: 3.18.0-5 +Version: 3.18.0-6 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp[all], libraw, jxrlib, openexr +Homepage: https://sourceforge.net/projects/freeimage/ Description: Support library for graphics image formats diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index f3d9279c3..dc57a5691 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -2,12 +2,28 @@ include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeImage) vcpkg_download_distfile(ARCHIVE - URLS "https://sourceforge.net/projects/freeimage/files/Source%20Distribution/3.18.0/FreeImage3180.zip/download" + URLS "http://downloads.sourceforge.net/freeimage/FreeImage3180.zip" FILENAME "FreeImage3180.zip" SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818 ) -vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/disable-plugins-depending-on-internal-third-party-libraries.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-jpeg.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-jxrlib.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-libtiff.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-openjpeg.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-png-zlib.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-rawlib.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch" + "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch" + "${CMAKE_CURRENT_LIST_DIR}/use-typedef-as-already-declared.patch" +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/FreeImageConfig-static.h DESTINATION ${SOURCE_PATH}) @@ -25,21 +41,6 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibWebP) file(REMOVE_RECURSE ${SOURCE_PATH}/Source/LibRawLite) file(REMOVE_RECURSE ${SOURCE_PATH}/Source/OpenEXR) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-plugins-depending-on-internal-third-party-libraries.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-jpeg.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-jxrlib.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-libtiff.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-openjpeg.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-png-zlib.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-rawlib.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch" - "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/freeimage/use-typedef-as-already-declared.patch b/ports/freeimage/use-typedef-as-already-declared.patch new file mode 100644 index 000000000..80d367bcb --- /dev/null +++ b/ports/freeimage/use-typedef-as-already-declared.patch @@ -0,0 +1,15 @@ +diff --git a/Source/FreeImage.h b/Source/FreeImage.h +index 1fd9c2f..59de277 100644 +--- a/Source/FreeImage.h ++++ b/Source/FreeImage.h +@@ -160,8 +160,8 @@ typedef uint8_t BYTE; + typedef uint16_t WORD; + typedef uint32_t DWORD; + typedef int32_t LONG; +-typedef int64_t INT64; +-typedef uint64_t UINT64; ++typedef long long int INT64; ++typedef long long unsigned int UINT64; + #else + // MS is not C99 ISO compliant + typedef long BOOL; diff --git a/ports/freeopcua/CONTROL b/ports/freeopcua/CONTROL index b6d20b57a..9ff439241 100644 --- a/ports/freeopcua/CONTROL +++ b/ports/freeopcua/CONTROL @@ -1,4 +1,4 @@ Source: freeopcua -Version: 20190125-1 +Version: 20190125-2 Description: OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python. Build-Depends: boost-asio,boost-system,boost-program-options,boost-filesystem,boost-thread,boost-format,boost-foreach,boost-property-tree,boost-date-time diff --git a/ports/freeopcua/boost-1.70.patch b/ports/freeopcua/boost-1.70.patch new file mode 100644 index 000000000..d099af4cc --- /dev/null +++ b/ports/freeopcua/boost-1.70.patch @@ -0,0 +1,29 @@ +diff --git a/src/server/opc_tcp_async.cpp b/src/server/opc_tcp_async.cpp
+index 9c34d72..9e68d9b 100644
+--- a/src/server/opc_tcp_async.cpp
++++ b/src/server/opc_tcp_async.cpp
+@@ -106,7 +106,11 @@ public:
+ */
+ typedef std::promise<void> Promise;
+ Promise promise;
++#if BOOST_VERSION >= 107000
++ boost::asio::post(Socket.get_executor(), bind(&Promise::set_value, &promise));
++#else
+ Socket.get_io_service().post(bind(&Promise::set_value, &promise));
++#endif
+ promise.get_future().wait();
+ }
+
+@@ -372,7 +376,11 @@ void OpcTcpServer::Shutdown()
+ */
+ typedef std::promise<void> Promise;
+ Promise promise;
+- acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
++#if BOOST_VERSION >= 107000
++ boost::asio::post(acceptor.get_executor(), bind(&Promise::set_value, &promise));
++#else
++ acceptor.get_io_service().post(bind(&Promise::set_value, &promise));
++#endif
+ promise.get_future().wait();
+ }
+
diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake index 981dd9383..57ca771ce 100644 --- a/ports/freeopcua/portfile.cmake +++ b/ports/freeopcua/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( uri_facade_win.patch serverObj.patch include_asio_first.patch + boost-1.70.patch ) vcpkg_configure_cmake( diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL index 6a2d5d480..c5c3d657e 100644 --- a/ports/freerdp/CONTROL +++ b/ports/freerdp/CONTROL @@ -1,4 +1,5 @@ Source: freerdp -Version: 2.0.0-rc1~vcpkg1 +Version: 2.0.0-rc4-2 +Homepage: https://github.com/FreeRDP/FreeRDP Description: A free implementation of the Remote Desktop Protocol (RDP) Build-Depends: openssl diff --git a/ports/freerdp/FixGitRevisionDetection.patch b/ports/freerdp/FixGitRevisionDetection.patch deleted file mode 100644 index dd0b33cb5..000000000 --- a/ports/freerdp/FixGitRevisionDetection.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7d0c833dc33135d435c018930949d10cfacead04 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Thu, 11 May 2017 02:56:48 +0300 -Subject: [PATCH] Disable automatic git revision detection - ---- - CMakeLists.txt | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf93d9a05..b62c31cae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -113,12 +113,6 @@ if(CCACHE AND WITH_CCACHE) - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE}) - endif(CCACHE AND WITH_CCACHE) - --include(GetGitRevisionDescription) --git_get_exact_tag(GIT_REVISION --tags --always) -- --if (${GIT_REVISION} STREQUAL "n/a") -- git_rev_parse (GIT_REVISION --short) --endif() - if(CMAKE_CROSSCOMPILING) - SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY) - endif(CMAKE_CROSSCOMPILING) --- -2.11.0.windows.1 - diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index cd27da88c..ca42af8a0 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -1,79 +1,74 @@ include(vcpkg_common_functions) -set(FREERDP_VERSION 2.0.0-rc1) -set(FREERDP_REVISION 2.0.0-rc1) -set(FREERDP_HASH 5d8fd7d6900feac1e42bfc0ebc111524205c3baa093958ced42d03635076ae7d88cd86439a22ff0656bc53f0302daee5a114a4ac26328ae598ee086490926182) - -string(REGEX REPLACE "\\+" "-" FREERDP_VERSION_ESCAPED ${FREERDP_VERSION}) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeRDP-${FREERDP_VERSION_ESCAPED}) - - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP - REF ${FREERDP_REVISION} - SHA512 ${FREERDP_HASH} + REF 2.0.0-rc4 + SHA512 b4a4d4a58d09010bc45fb90cca148dc4421a4cf0cd5caf288aa702212ef081f14fc418b91f1b79ec8631f582c9ebcdd3031d3333b6a892adb29c402492abb649 HEAD_REF master + PATCHES + DontInstallSystemRuntimeLibs.patch ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/DontInstallSystemRuntimeLibs.patch - ${CMAKE_CURRENT_LIST_DIR}/FixGitRevisionDetection.patch -) - -if(VCPKG_CRT_LINKAGE STREQUAL static) +if(VCPKG_CRT_LINKAGE STREQUAL "static") set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static) 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 + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DGIT_REVISION=${FREERDP_VERSION} - ${FREERDP_CRT_LINKAGE}) + OPTIONS + ${FREERDP_CRT_LINKAGE} +) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/bin/freerdp-client2.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp2.dll" "${CURRENT_PACKAGES_DIR}/bin/freerdp2.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr-tools2.dll" "${CURRENT_PACKAGES_DIR}/bin/winpr-tools2.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr2.dll" "${CURRENT_PACKAGES_DIR}/bin/winpr2.dll") - - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp-client2.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp2.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr-tools2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/winpr-tools2.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/winpr2.dll") -endif() - -if(NOT TARGET_TRIPLET MATCHES "uwp") - file(GLOB_RECURSE TOOLS_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(GLOB_RECURSE TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +file(GLOB_RECURSE TOOLS_RELEASE ${CURRENT_PACKAGES_DIR}/bin/*.exe) +if(TOOLS_RELEASE) file(COPY ${TOOLS_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(GLOB_RECURSE TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(REMOVE ${TOOLS_RELEASE} ${TOOLS_DEBUG}) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/bin/freerdp-client2.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freerdp2.dll" "${CURRENT_PACKAGES_DIR}/bin/freerdp2.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr-tools2.dll" "${CURRENT_PACKAGES_DIR}/bin/winpr-tools2.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/winpr2.dll" "${CURRENT_PACKAGES_DIR}/bin/winpr2.dll") + + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp-client2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp-client2.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freerdp2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/freerdp2.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr-tools2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/winpr-tools2.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/winpr2.dll") +else() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE} ${CURRENT_PACKAGES_DIR}/lib/cmake/${PACKAGE}_temp/${PACKAGE}) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE} ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE}) +endforeach() -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/freerdp) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/freerdp/LICENSE ${CURRENT_PACKAGES_DIR}/share/freerdp/copyright) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 TARGET_PATH share/freerdp-client) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 TARGET_PATH share/winpr) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -endif() - -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/share/freerdp/cmake) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/freerdp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/freerdp/LICENSE ${CURRENT_PACKAGES_DIR}/share/freerdp/copyright) diff --git a/ports/freetds/CONTROL b/ports/freetds/CONTROL new file mode 100644 index 000000000..4a7a008bb --- /dev/null +++ b/ports/freetds/CONTROL @@ -0,0 +1,8 @@ +Source: freetds +Version: 1.1.6 +Description: Implementation of the Tabular Data Stream protocol +Default-Features: openssl + +Feature: openssl +Build-Depends: openssl +Description: OpenSSL support diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake new file mode 100644 index 000000000..65b8afde4 --- /dev/null +++ b/ports/freetds/portfile.cmake @@ -0,0 +1,69 @@ +# Common Ambient Variables:
+# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+# TARGET_TRIPLET is the current triplet (x86-windows, etc)
+# PORT is the current port name (zlib, etc)
+# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetds-1.1.6)
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://www.freetds.org/files/stable/freetds-1.1.6.tar.bz2"
+ FILENAME "freetds-1.1.6.tar.bz2"
+ SHA512 160c8638302fd36a3f42d031dbd58525cde899b64d320f6187ce5865ea2c049a1af63be419623e4cd18ccf229dd2ee7ec509bc5721c3371de0f31710dad7470d
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+set(BUILD_freetds_openssl OFF)
+if("openssl" IN_LIST FEATURES)
+ set(BUILD_freetds_openssl ON)
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DWITH_OPENSSL=${BUILD_freetds_openssl}
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql.exe)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freetds)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/freetds/COPYING ${CURRENT_PACKAGES_DIR}/share/freetds/copyright)
diff --git a/ports/freetype-gl/CONTROL b/ports/freetype-gl/CONTROL index c76ba3681..57af93cbc 100644 --- a/ports/freetype-gl/CONTROL +++ b/ports/freetype-gl/CONTROL @@ -1,4 +1,5 @@ Source: freetype-gl Version: 2019-03-29-1 +Homepage: https://github.com/rougier/freetype-gl Description: OpenGL text using one vertex buffer, one texture and FreeType Build-Depends: glew, freetype diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 7e18d1a7c..21b6c59f4 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,4 +1,5 @@ Source: freetype -Version: 2.9.1-1 +Version: 2.9.1-2 Build-Depends: zlib, bzip2, libpng +Homepage: https://www.freetype.org/ Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 73cb6b317..654cff2b9 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -70,7 +70,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") else() #if(VCPKG_BUILD_TYPE STREQUAL "release") file(READ ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config.cmake CONFIG_MODULE) endif() -string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include/freetype" CONFIG_MODULE "${CONFIG_MODULE}") +string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include;\${_IMPORT_PREFIX}/include/freetype" CONFIG_MODULE "${CONFIG_MODULE}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-config.cmake "${CONFIG_MODULE}") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL index 128ef56a0..00f97f562 100644 --- a/ports/freexl/CONTROL +++ b/ports/freexl/CONTROL @@ -1,5 +1,6 @@ Source: freexl Version: 1.0.4-1 +Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet Build-Depends: libiconv diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index ec5dc1553..5b45a17b1 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -5,12 +5,15 @@ vcpkg_from_github( REPO fribidi/fribidi
REF 58c6cb390a9a18c98b2cbaac555d8ea9352a9e4f
SHA512 1ec9c19faa87886786ce1589e2c66cab173b48e34d0e43487becc8606001f21f6ed17d0abd1c322fbbcaeb96a47ed882cad228be2e9beb019020ca2a475fc298
-HEAD_REF master)
+ HEAD_REF master
+)
-vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}
+vcpkg_configure_meson(
+ SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-Ddocs=false
- --backend=ninja)
+ --backend=ninja
+)
vcpkg_install_meson()
vcpkg_copy_pdbs()
@@ -28,4 +31,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif()
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright)
diff --git a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch b/ports/ftgl/0001-fix-building-DLL-on-Windows.patch deleted file mode 100644 index e9b8c52a5..000000000 --- a/ports/ftgl/0001-fix-building-DLL-on-Windows.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b56270d28a59297518e91f85333a2e1a7fecdc9e Mon Sep 17 00:00:00 2001 -From: Juha Sointusalo <juha.sointusalo@gmail.com> -Date: Thu, 13 Dec 2018 21:38:23 +0200 -Subject: [PATCH] fix building DLL on Windows - -Without FTGL_LIBRARY all symbols are declared to be imported instead of -exported and linking the library fails. ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d6c5a57..6b230ce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,6 +27,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE) - OPTION(BUILD_SHARED_LIBS "Build Shared Libraries" ON) - IF(BUILD_SHARED_LIBS) - SET(LIB_TYPE SHARED) -+ ADD_DEFINITIONS(-DFTGL_LIBRARY) - ELSE(BUILD_SHARED_LIBS) - SET(LIB_TYPE STATIC) - ADD_DEFINITIONS(-D FTGL_LIBRARY_STATIC) --- -2.18.0.windows.1 - diff --git a/ports/ftgl/CONTROL b/ports/ftgl/CONTROL index 2abfa8778..b8e652144 100644 --- a/ports/ftgl/CONTROL +++ b/ports/ftgl/CONTROL @@ -1,5 +1,5 @@ Source: ftgl
-Version: 2.3.1
+Version: 2.4.0-1 Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.
Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.
FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering.
diff --git a/ports/ftgl/Fix-headersFilePath.patch b/ports/ftgl/Fix-headersFilePath.patch new file mode 100644 index 000000000..f3459352a --- /dev/null +++ b/ports/ftgl/Fix-headersFilePath.patch @@ -0,0 +1,23 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 693e49f..c47ff3c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,9 +1,5 @@ +- +- +- + INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/cmake) + +- + ADD_DEFINITIONS(-DPACKAGE_VERSION="${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}") + + IF(WIN32) +@@ -26,7 +22,7 @@ SET(libftgl_la_SOURCES + FTGlyphContainer.h + FTInternals.h + FTLibrary.cpp +- FTLibrary.h ++ FTGL/FTLibrary.h + FTList.h + FTPoint.cpp + FTSize.cpp diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake index a8878af0f..65df89b20 100644 --- a/ports/ftgl/portfile.cmake +++ b/ports/ftgl/portfile.cmake @@ -1,12 +1,13 @@ include(vcpkg_common_functions)
+vcpkg_find_acquire_program(DOXYGEN)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO frankheckenbach/ftgl
- REF 2.3.1
- SHA512 4c3c92e79371aa9048a0de6c27bd008036be19fe6179bce472f36ced359026aaeaa5b63c83f90ffc1d425dd2e587479efc700dc1082c2ed0189d16ea87838c9a
+ REF 483639219095ad080538e07ceb5996de901d4e74 + SHA512 d5bf95db8db6a5c9f710bd274cb9bb82e3e67569e8f3ec55b36e068636a09252e6f191e36d8279e61b5d12408c065ce51829fc38d4d7afe5bda724752d2f084f
HEAD_REF master
- PATCHES "0001-fix-building-DLL-on-Windows.patch"
+ PATCHES Fix-headersFilePath.patch
)
vcpkg_configure_cmake(
diff --git a/ports/fuzzylite/CONTROL b/ports/fuzzylite/CONTROL index 422a8af2e..4749c1423 100644 --- a/ports/fuzzylite/CONTROL +++ b/ports/fuzzylite/CONTROL @@ -1,3 +1,4 @@ Source: fuzzylite -Version: 6.0-1 +Version: 6.0-2 +Homepage: https://github.com/fuzzylite/fuzzylite Description: A fuzzy logic control library in C++ diff --git a/ports/fuzzylite/portfile.cmake b/ports/fuzzylite/portfile.cmake index 976ca66de..c4b70a72f 100644 --- a/ports/fuzzylite/portfile.cmake +++ b/ports/fuzzylite/portfile.cmake @@ -30,7 +30,6 @@ vcpkg_configure_cmake( -DFL_BUILD_TESTS=OFF ) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/g2o/CONTROL b/ports/g2o/CONTROL index 57999aece..0e6b43f7d 100644 --- a/ports/g2o/CONTROL +++ b/ports/g2o/CONTROL @@ -1,4 +1,5 @@ Source: g2o -Version: 20170730_git-4 -Build-Depends: suitesparse, eigen3, clapack, ceres -Description: g2o: A General Framework for Graph Optimization http://openslam.org/g2o.html +Version: 20170730_git-5 +Build-Depends: suitesparse, eigen3, clapack (!osx), ceres +Description: g2o: A General Framework for Graph Optimization +Homepage: https://openslam.org/g2o.html diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake index 6d09b8a8c..312bbc8e8 100644 --- a/ports/g2o/portfile.cmake +++ b/ports/g2o/portfile.cmake @@ -24,7 +24,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() if(VCPKG_USE_HEAD_VERSION) - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/g2o") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g2o) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/g3log/CONTROL b/ports/g3log/CONTROL new file mode 100644 index 000000000..717166079 --- /dev/null +++ b/ports/g3log/CONTROL @@ -0,0 +1,3 @@ +Source: g3log
+Version: 2019-05-14-1
+Description: Asynchronous logger with Dynamic Sinks
diff --git a/ports/g3log/portfile.cmake b/ports/g3log/portfile.cmake new file mode 100644 index 000000000..f07ae0b1c --- /dev/null +++ b/ports/g3log/portfile.cmake @@ -0,0 +1,41 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO KjellKod/g3log
+ REF 376c417ad170228fa6d1b9994a6e07a2ac143a51
+ SHA512 fd442b895f0be2489d2be099b1faca5c964f1a3880e3867726efb5f5a17192fbf2c2d60cf118e1b68bea73cf328f0b16c0265ec0f0c0fbbb1f62f68a994f5b86
+ HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" G3_SHARED_LIB)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" G3_SHARED_RUNTIME)
+
+# https://github.com/KjellKod/g3log#prerequisites
+set(VERSION "1.3.2-95")
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DG3_SHARED_LIB=${G3_SHARED_LIB} # Options.cmake
+ -DG3_SHARED_RUNTIME=${G3_SHARED_RUNTIME} # Options.cmake
+ -DADD_FATAL_EXAMPLE=OFF
+ -DADD_G3LOG_BENCH_PERFORMANCE=OFF
+ -DADD_G3LOG_UNIT_TEST=OFF
+ -DVERSION=${VERSION}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g3logger TARGET_PATH share/g3logger)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME g3logger)
diff --git a/ports/gainput/CONTROL b/ports/gainput/CONTROL index 29ac472c5..65b347dee 100644 --- a/ports/gainput/CONTROL +++ b/ports/gainput/CONTROL @@ -1,3 +1,4 @@ Source: gainput Version: 1.0.0-1 +Homepage: https://github.com/jkuhlmann/gainput Description: Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers diff --git a/ports/gcem/CONTROL b/ports/gcem/CONTROL index b3c280cd7..095da5e8e 100644 --- a/ports/gcem/CONTROL +++ b/ports/gcem/CONTROL @@ -1,3 +1,3 @@ Source: gcem -Version: 1.8.1 +Version: 1.12.0 Description: A C++ compile-time math library using generalized constant expressions diff --git a/ports/gcem/portfile.cmake b/ports/gcem/portfile.cmake index 4a13af1c2..3d27f4dcd 100644 --- a/ports/gcem/portfile.cmake +++ b/ports/gcem/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kthohr/gcem - REF v1.8.1 - SHA512 dd82a917822ffdfb3f224599340d2a0499e47db8d469d9febf3d37cd796fae3c8186a4fc05cc727d3ef82655359166caafbb5ddee3b79ba7becf1a53cce20e4a + REF v1.12.0 + SHA512 cb28dce44e8aac2a4369bc1dd796243f0f9ff25bdd2effcff198b6e4ad1161ed4d33d2fdc7aca0ca9b538c769c1ae36ebfd7fcfbefd289bb1a62cdbea1957f74 HEAD_REF master ) diff --git a/ports/gdal/0003-Fix-std-fabs.patch b/ports/gdal/0003-Fix-std-fabs.patch new file mode 100644 index 000000000..4a6ba7cb3 --- /dev/null +++ b/ports/gdal/0003-Fix-std-fabs.patch @@ -0,0 +1,10 @@ +--- a/ogrlinestring.cpp Fri Dec 14 22:34:20 2018 ++++ b/ogrlinestring.cpp Wed Mar 27 11:00:00 2019 +@@ -34,6 +34,7 @@ + #include <cstdlib> + #include <algorithm> + #include <limits> ++#include <cmath> + + CPL_CVSID("$Id: ogrlinestring.cpp 61153d33d7f055c3442ff728adbfa8e09582464b 2019-03-10 14:23:51 +0100 Even Rouault $") + diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL index 9169b8344..5df9a7fa2 100644 --- a/ports/gdal/CONTROL +++ b/ports/gdal/CONTROL @@ -1,7 +1,8 @@ Source: gdal -Version: 2.4.1-1 +Version: 2.4.1-5 +Homepage: https://gdal.org/ Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data. -Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5 +Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib Feature: mysql-libmariadb Build-Depends: libmariadb diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index b62faf149..61609d3d3 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -47,259 +47,362 @@ foreach(BUILD_TYPE IN LISTS BUILD_TYPES) ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-debug-crt-flags.patch ) endif() + vcpkg_apply_patches( + SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-${GDAL_VERSION_STR}/ogr + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-std-fabs.patch + ) endforeach() +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + # Check build system first + find_program(NMAKE nmake REQUIRED) + + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal" NATIVE_DATA_DIR) + file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal/html" NATIVE_HTML_DIR) + + # Setup proj4 libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PROJ_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/proj.lib" PROJ_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" PROJ_LIBRARY_DBG) + + # Setup libpng libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG) + + # Setup zlib libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" ZLIB_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ZLIB_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ZLIB_LIBRARY_DBG) + + # Setup geos libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG) + else() + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG) + endif() -find_program(NMAKE nmake REQUIRED) - -file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) -file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal" NATIVE_DATA_DIR) -file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/gdal/html" NATIVE_HTML_DIR) - -# Setup proj4 libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PROJ_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/proj.lib" PROJ_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" PROJ_LIBRARY_DBG) - -# Setup libpng libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG) + # Setup expat libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/expat.lib" EXPAT_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib" EXPAT_LIBRARY_DBG) + + # Setup curl libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CURL_INCLUDE_DIR) + if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" CURL_LIBRARY_REL) + elseif(EXISTS "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl_imp.lib" CURL_LIBRARY_REL) + endif() + if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d.lib" CURL_LIBRARY_DBG) + elseif(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl-d_imp.lib" CURL_LIBRARY_DBG) + endif() -# Setup geos libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libgeos.lib" GEOS_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib" GEOS_LIBRARY_DBG) -else() - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib" GEOS_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib" GEOS_LIBRARY_DBG) -endif() + # Setup sqlite3 libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" SQLITE_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" SQLITE_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" SQLITE_LIBRARY_DBG) + + # Setup PostgreSQL libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PGSQL_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" PGSQL_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.lib" PGSQL_LIBRARY_DBG) + + # Setup OpenJPEG libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OPENJPEG_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" OPENJPEG_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" OPENJPEG_LIBRARY_DBG) + + # Setup WebP libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" WEBP_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/webp.lib" WEBP_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" WEBP_LIBRARY_DBG) + + # Setup libxml2 libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XML2_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" XML2_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" XML2_LIBRARY_DBG) + + # Setup liblzma libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LZMA_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" LZMA_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib" LZMA_LIBRARY_DBG) + + if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) + # Setup MySQL libraries + include path + if("mysql-libmysql" IN_LIST FEATURES) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" MYSQL_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" MYSQL_LIBRARY_DBG) + endif() + + if("mysql-libmariadb" IN_LIST FEATURES) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib" MYSQL_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib" MYSQL_LIBRARY_DBG) + endif() + + 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() -# Setup expat libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" EXPAT_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/expat.lib" EXPAT_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/expat.lib" EXPAT_LIBRARY_DBG) - -# Setup curl libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" CURL_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libcurl.lib" CURL_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcurl.lib" CURL_LIBRARY_DBG) - -# Setup sqlite3 libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" SQLITE_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib" SQLITE_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib" SQLITE_LIBRARY_DBG) - -# Setup PostgreSQL libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PGSQL_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpq.lib" PGSQL_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpqd.lib" PGSQL_LIBRARY_DBG) - -# Setup OpenJPEG libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OPENJPEG_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/openjp2.lib" OPENJPEG_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/openjp2.lib" OPENJPEG_LIBRARY_DBG) - -# Setup WebP libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" WEBP_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/webp.lib" WEBP_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" WEBP_LIBRARY_DBG) - -# Setup libxml2 libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" XML2_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" XML2_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" XML2_LIBRARY_DBG) - -# Setup liblzma libraries + include path -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" LZMA_INCLUDE_DIR) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/lzma.lib" LZMA_LIBRARY_REL) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib" LZMA_LIBRARY_DBG) - -if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - # Setup MySQL libraries + include path - if("mysql-libmysql" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib" MYSQL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib" MYSQL_LIBRARY_DBG) - endif() + if ("libspatialite" IN_LIST FEATURES) + # Setup spatialite libraries + include path + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/spatialite" SPATIALITE_INCLUDE_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib" SPATIALITE_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" SPATIALITE_LIBRARY_DBG) + set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") + endif() - if("mysql-libmariadb" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/mysql" MYSQL_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libmariadb.lib" MYSQL_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libmariadb.lib" MYSQL_LIBRARY_DBG) - endif() + list(APPEND NMAKE_OPTIONS + GDAL_HOME=${NATIVE_PACKAGES_DIR} + 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 + ) - 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() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND NMAKE_OPTIONS WIN64=YES) + endif() -if ("libspatialite" IN_LIST FEATURES) - # Setup spatialite libraries + include path - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include/spatialite" SPATIALITE_INCLUDE_DIR) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/spatialite.lib" SPATIALITE_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/spatialite.lib" SPATIALITE_LIBRARY_DBG) - set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") -endif() + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND NMAKE_OPTIONS PROJ_FLAGS=-DPROJ_STATIC) + list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB) + else() + # Enables PDBs for release and debug builds + list(APPEND NMAKE_OPTIONS WITH_PDB=1) + endif() -list(APPEND NMAKE_OPTIONS - GDAL_HOME=${NATIVE_PACKAGES_DIR} - 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} - MSVC_VER=1900 -) + if (VCPKG_CRT_LINKAGE STREQUAL static) + set(LINKAGE_FLAGS "/MT") + else() + set(LINKAGE_FLAGS "/MD") + endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - list(APPEND NMAKE_OPTIONS WIN64=YES) -endif() + list(APPEND NMAKE_OPTIONS_REL + ${NMAKE_OPTIONS} + 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} + ZLIB_LIB=${ZLIB_LIBRARY_REL} + ) + if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Static Build does not like PG_LIB + list(APPEND NMAKE_OPTIONS_REL PG_LIB=${PGSQL_LIBRARY_REL}) + endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - list(APPEND NMAKE_OPTIONS PROJ_FLAGS=-DPROJ_STATIC) - list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB) -else() - # Enables PDBs for release and debug builds - list(APPEND NMAKE_OPTIONS WITH_PDB=1) -endif() + list(APPEND NMAKE_OPTIONS_DBG + ${NMAKE_OPTIONS} + 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} + ZLIB_LIB=${ZLIB_LIBRARY_DBG} + DEBUG=1 + ) + if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Static Build does not like PG_LIB + list(APPEND NMAKE_OPTIONS_DBG PG_LIB=${PGSQL_LIBRARY_DBG}) + endif() + # Begin build process + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + ################ + # Release build + ################ + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND ${NMAKE} -f makefile.vc + "${NMAKE_OPTIONS_REL}" + WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + LOGNAME nmake-build-${TARGET_TRIPLET}-release + ) + message(STATUS "Building ${TARGET_TRIPLET}-rel done") + endif() -if (VCPKG_CRT_LINKAGE STREQUAL static) - set(LINKAGE_FLAGS "/MT") -else() - set(LINKAGE_FLAGS "/MD") -endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + ################ + # Debug build + ################ + + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND ${NMAKE} /G -f makefile.vc + "${NMAKE_OPTIONS_DBG}" + WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + LOGNAME nmake-build-${TARGET_TRIPLET}-debug + ) + message(STATUS "Building ${TARGET_TRIPLET}-dbg done") + endif() -list(APPEND NMAKE_OPTIONS_REL - ${NMAKE_OPTIONS} - 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} -) -if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # Static Build does not like PG_LIB - list(APPEND NMAKE_OPTIONS_REL PG_LIB=${PGSQL_LIBRARY_REL}) -endif() + message(STATUS "Packaging ${TARGET_TRIPLET}") -list(APPEND NMAKE_OPTIONS_DBG - ${NMAKE_OPTIONS} - 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} - DEBUG=1 -) -if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # Static Build does not like PG_LIB - list(APPEND NMAKE_OPTIONS_DBG PG_LIB=${PGSQL_LIBRARY_DBG}) -endif() + if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html) + endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - ################ - # Release build - ################ - message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${NMAKE} -f makefile.vc "${NMAKE_OPTIONS_REL}" + "install" + "devinstall" WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME nmake-build-${TARGET_TRIPLET}-release + LOGNAME nmake-install-${TARGET_TRIPLET} ) - message(STATUS "Building ${TARGET_TRIPLET}-rel done") -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - ################ - # Debug build - ################ - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${NMAKE} /G -f makefile.vc - "${NMAKE_OPTIONS_DBG}" - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - LOGNAME nmake-build-${TARGET_TRIPLET}-debug - ) - message(STATUS "Building ${TARGET_TRIPLET}-dbg done") -endif() - -message(STATUS "Packaging ${TARGET_TRIPLET}") + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib) -if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html) -endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(COPY ${SOURCE_PATH_RELEASE}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() -vcpkg_execute_required_process( - COMMAND ${NMAKE} -f makefile.vc - "${NMAKE_OPTIONS_REL}" - "install" - "devinstall" - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - LOGNAME nmake-install-${TARGET_TRIPLET} -) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) + endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib) + else() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY ${SOURCE_PATH_RELEASE}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - endif() + set(GDAL_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/gdal) + file(MAKE_DIRECTORY ${GDAL_TOOL_PATH}) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${SOURCE_PATH_DEBUG}/gdal.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) - endif() + file(GLOB GDAL_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) + file(COPY ${GDAL_TOOLS} DESTINATION ${GDAL_TOOL_PATH}) + file(REMOVE_RECURSE ${GDAL_TOOLS}) -else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) - set(GDAL_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/gdal) - file(MAKE_DIRECTORY ${GDAL_TOOL_PATH}) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(COPY ${SOURCE_PATH_DEBUG}/gdal${GDAL_VERSION_LIB}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) + endif() + endif() - file(GLOB GDAL_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(COPY ${GDAL_TOOLS} DESTINATION ${GDAL_TOOL_PATH}) - file(REMOVE_RECURSE ${GDAL_TOOLS}) + # Copy over PDBs + vcpkg_copy_pdbs() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) +elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") # Build in UNIX + # Check build system first + find_program(MAKE make) + if (NOT MAKE) + message(FATAL_ERROR "MAKE not found") + endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib) + ################ + # Release build + ################ + message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + set(OUT_PATH_RELEASE ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-release) + file(MAKE_DIRECTORY ${OUT_PATH_RELEASE}) + vcpkg_execute_required_process( + COMMAND "${SOURCE_PATH_RELEASE}/configure" --prefix=${OUT_PATH_RELEASE} + WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + LOGNAME config-${TARGET_TRIPLET}-rel + ) + + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND make + WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + LOGNAME make-build-${TARGET_TRIPLET}-release + ) + + message(STATUS "Installing ${TARGET_TRIPLET}-rel") + vcpkg_execute_required_process( + COMMAND make install + WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + LOGNAME make-install-${TARGET_TRIPLET}-release + ) + + file(REMOVE_RECURSE ${OUT_PATH_RELEASE}/lib/gdalplugins) + file(COPY ${OUT_PATH_RELEASE}/lib/pkgconfig DESTINATION ${OUT_PATH_RELEASE}/share/gdal) + file(REMOVE_RECURSE ${OUT_PATH_RELEASE}/lib/pkgconfig) + file(COPY ${OUT_PATH_RELEASE}/lib DESTINATION ${CURRENT_PACKAGES_DIR}) + file(COPY ${OUT_PATH_RELEASE}/include DESTINATION ${CURRENT_PACKAGES_DIR}) + file(COPY ${OUT_PATH_RELEASE}/share DESTINATION ${CURRENT_PACKAGES_DIR}) + message(STATUS "Installing ${TARGET_TRIPLET}-rel done") endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${SOURCE_PATH_DEBUG}/gdal${GDAL_VERSION_LIB}.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib) + ################ + # Debug build + ################ + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + set(OUT_PATH_DEBUG ${SOURCE_PATH_RELEASE}/../../make-build-${TARGET_TRIPLET}-debug) + file(MAKE_DIRECTORY ${OUT_PATH_DEBUG}) + vcpkg_execute_required_process( + COMMAND "${SOURCE_PATH_DEBUG}/configure" --prefix=${OUT_PATH_DEBUG} + WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + LOGNAME config-${TARGET_TRIPLET}-debug + ) + + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND make + WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + LOGNAME make-build-${TARGET_TRIPLET}-debug + ) + + message(STATUS "Installing ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND make -j install + WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + LOGNAME make-install-${TARGET_TRIPLET}-debug + ) + + file(REMOVE_RECURSE ${OUT_PATH_DEBUG}/lib/gdalplugins) + file(REMOVE_RECURSE ${OUT_PATH_DEBUG}/lib/pkgconfig) + file(COPY ${OUT_PATH_DEBUG}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) + message(STATUS "Installing ${TARGET_TRIPLET}-dbg done") endif() +else() # Other build system + message(FATAL_ERROR "Unsupport build system.") endif() -# Copy over PDBs -vcpkg_copy_pdbs() - # Handle copyright configure_file(${SOURCE_PATH_RELEASE}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/gdal/copyright COPYONLY) diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL new file mode 100644 index 000000000..32a962eb4 --- /dev/null +++ b/ports/gdcm/CONTROL @@ -0,0 +1,4 @@ +Source: gdcm +Version: 3.0.0-3 +Description: Grassroots DICOM library +Build-Depends: zlib, expat, openjpeg diff --git a/ports/gdcm/fix-share-path.patch b/ports/gdcm/fix-share-path.patch new file mode 100644 index 000000000..931094681 --- /dev/null +++ b/ports/gdcm/fix-share-path.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6ac16ab..842d833 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -246,15 +246,15 @@ if(NOT GDCM_INSTALL_LIB_DIR)
+ endif()
+
+ if(NOT GDCM_INSTALL_DATA_DIR)
+- set(GDCM_INSTALL_DATA_DIR "share/${subdir}")
++ set(GDCM_INSTALL_DATA_DIR "share/${projectname}")
+ endif()
+
+ if(NOT GDCM_INSTALL_INCLUDE_DIR)
+- set(GDCM_INSTALL_INCLUDE_DIR "include/${subdir}")
++ set(GDCM_INSTALL_INCLUDE_DIR "include/${projectname}")
+ endif()
+
+ if(NOT GDCM_INSTALL_DOC_DIR)
+- set(GDCM_INSTALL_DOC_DIR "share/doc/${subdir}")
++ set(GDCM_INSTALL_DOC_DIR "share/doc/${projectname}")
+ endif()
+
+ if(NOT GDCM_INSTALL_MAN_DIR)
+@@ -262,7 +262,7 @@ if(NOT GDCM_INSTALL_MAN_DIR)
+ endif()
+
+ if(NOT GDCM_INSTALL_PACKAGE_DIR)
+- set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${subdir}
++ set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${projectname}
+ CACHE INTERNAL "")
+ endif()
+
diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake new file mode 100644 index 000000000..36a3e0e1f --- /dev/null +++ b/ports/gdcm/portfile.cmake @@ -0,0 +1,50 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO malaterre/GDCM + REF v3.0.0 + SHA512 2ac076dd49011234f4431ffe67fcba84a1ca9042ec5fc4dfc8aed2ed16bec5f499fa7aa666e5630796afc266ce76741d931cca333534b55fdc477e25a9189d33 + HEAD_REF master + PATCHES + use-openjpeg-config.patch + fix-share-path.patch +) + +file(REMOVE ${SOURCE_PATH}/CMake/FindOpenJPEG.cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) +else() + set(VCPKG_BUILD_SHARED_LIBS OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF + -DGDCM_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS} + -DGDCM_INSTALL_INCLUDE_DIR=include + -DGDCM_USE_SYSTEM_EXPAT=ON + -DGDCM_USE_SYSTEM_ZLIB=ON + -DGDCM_USE_SYSTEM_OPENJPEG=ON + -DGDCM_BUILD_TESTING=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm RENAME copyright) diff --git a/ports/gdcm/use-openjpeg-config.patch b/ports/gdcm/use-openjpeg-config.patch new file mode 100644 index 000000000..ff64bb1c2 --- /dev/null +++ b/ports/gdcm/use-openjpeg-config.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f82bfd2..a062170 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -375,7 +375,10 @@ else() + endif() + + if(GDCM_USE_SYSTEM_OPENJPEG) +- find_package(OpenJPEG 2.0.0 REQUIRED) ++ find_package(OpenJPEG REQUIRED) ++ if(OPENJPEG_MAJOR_VERSION VERSION_LESS 2) ++ message( FATAL_ERROR "You need at least OpenJPEG 2") ++ endif() + set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES}) + else() + set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2) diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL index baabd1df1..e7f43b160 100644 --- a/ports/gdcm2/CONTROL +++ b/ports/gdcm2/CONTROL @@ -1,4 +1,5 @@ Source: gdcm2 -Version: 2.8.9 -Description: Grassroots DICOM library -Build-Depends: zlib, expat, openjpeg +Version: deprecated +Homepage: https://github.com/malaterre/GDCM +Description: This port was renamed to gdcm. The gdcm2 name is deprecated. +Build-Depends: gdcm
\ No newline at end of file diff --git a/ports/gdcm2/find-openjpeg.patch b/ports/gdcm2/find-openjpeg.patch deleted file mode 100644 index c3fff18f5..000000000 --- a/ports/gdcm2/find-openjpeg.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/CMake/FindOpenJPEG.cmake -+++ b/CMake/FindOpenJPEG.cmake -@@ -20,14 +20,38 @@ - - # Try with pkg-config first - find_package(PkgConfig) --pkg_check_modules(OPENJPEG libopenjp2) -+if (PKG_CONFIG_FOUND) -+ pkg_check_modules(OPENJPEG libopenjp2) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(OpenJPEG REQUIRED_VARS -+ OPENJPEG_LIBRARIES -+ OPENJPEG_INCLUDE_DIRS -+ VERSION_VAR OPENJPEG_VERSION -+ ) -+endif() - --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(OpenJPEG REQUIRED_VARS -- OPENJPEG_LIBRARIES -- OPENJPEG_INCLUDE_DIRS -- VERSION_VAR OPENJPEG_VERSION --) -+find_path(OPENJPEG_INCLUDE_DIR NAMES openjpeg.h) -+find_library(OPENJPEG_LIBRARY NAMES openjp2) -+if (OPENJPEG_LIBRARY) -+ string(FIND ${OPENJPEG_LIBRARY} debug _debug_substrpos) -+ if (_debug_substrpos EQUAL -1) -+ set(OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY}) -+ string(REPLACE "/lib" "/debug/lib" OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY_RELEASE}) -+ else() -+ set(OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY}) -+ string(REPLACE "/debug/lib" "/lib" OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY_DEBUG}) -+ endif() -+ set(OPENJPEG_LIBRARY optimized ${OPENJPEG_LIBRARY_RELEASE} debug ${OPENJPEG_LIBRARY_DEBUG}) -+ set(OPENJPEG_FOUND TRUE) -+endif() -+ -+if (OPENJPEG_FOUND) -+ set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY}) -+ set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR}) -+ message(STATUS "Found OPENJPEG library ${OPENJPEG_LIBRARIES}") -+else() -+ message(FATAL_ERROR "NOT found OPENJPEG") -+endif() - - mark_as_advanced( - OPENJPEG_LIBRARIES diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake index bc44a0a97..0015715fb 100644 --- a/ports/gdcm2/portfile.cmake +++ b/ports/gdcm2/portfile.cmake @@ -1,46 +1 @@ -include(vcpkg_common_functions) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO malaterre/GDCM - REF v2.8.9 - SHA512 3c80503de6df8fe2589849ae9334d11e3cb033701450e1d7ea2781d122d1c8c1fc205fefc358d0ad1b9c5199c838e1c7c1bb34949da1c73cc8ae174b72e7e70c - HEAD_REF master - PATCHES find-openjpeg.patch -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(GDCM_BUILD_SHARED_LIBS ON) -else() - set(GDCM_BUILD_SHARED_LIBS OFF) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF - -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS} - -DGDCM_INSTALL_INCLUDE_DIR=include - -DGDCM_USE_SYSTEM_EXPAT=ON - -DGDCM_USE_SYSTEM_ZLIB=ON - -DGDCM_USE_SYSTEM_OPENJPEG=ON - -DGDCM_BUILD_TESTING=OFF -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm-2.8 TARGET_PATH share/gdcm) - -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() - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm2 RENAME copyright) - -vcpkg_copy_pdbs() +set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file diff --git a/ports/gdk-pixbuf/CMakeLists.txt b/ports/gdk-pixbuf/CMakeLists.txt index 0d56b7fad..04524cb4f 100644 --- a/ports/gdk-pixbuf/CMakeLists.txt +++ b/ports/gdk-pixbuf/CMakeLists.txt @@ -9,20 +9,19 @@ set(GLIB_LIB_VERSION 2.0) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) +find_package(unofficial-glib CONFIG REQUIRED) find_path(GLIB_INCLUDE_DIR glib.h) -find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_VERSION}) -find_library(GLIB_GIO_LIBRARY gio-${GLIB_LIB_VERSION}) -find_library(GLIB_GOBJECT_LIBRARY gobject-${GLIB_LIB_VERSION}) -find_library(GLIB_GMODULE_LIBRARY gmodule-${GLIB_LIB_VERSION}) -set(GLIB_LIBRARIES ${GLIB_GLIB_LIBRARY} ${GLIB_GOBJECT_LIBRARY} ${GLIB_GMODULE_LIBRARY} ${GLIB_GIO_LIBRARY}) -find_path(LIBINTL_INCLUDE_DIR libintl.h) -find_library(LIBINTL_LIBRARY NAMES libintl intl) - -configure_file(./config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY) +if(WIN32) + find_package(unofficial-gettext CONFIG REQUIRED) + find_path(LIBINTL_INCLUDE_DIR libintl.h) + configure_file(${CMAKE_SOURCE_DIR}/config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY) +else() + configure_file(${CMAKE_SOURCE_DIR}/config.h.linux ${CMAKE_SOURCE_DIR}/config.h COPYONLY) +endif() include_directories(. ./gdk-pixbuf) -add_library(gdk-pixbuf +set(SOURCES gdk-pixbuf/gdk-pixbuf.c gdk-pixbuf/gdk-pixbuf-animation.c gdk-pixbuf/gdk-pixbuf-data.c @@ -46,6 +45,9 @@ add_library(gdk-pixbuf gdk-pixbuf/io-xpm.c gdk-pixbuf/io-xbm.c gdk-pixbuf/pixops/pixops.c +) +if(WIN32) + list(APPEND SOURCES gdk-pixbuf/io-gdip-animation.c gdk-pixbuf/io-gdip-bmp.c gdk-pixbuf/io-gdip-emf.c @@ -54,7 +56,10 @@ add_library(gdk-pixbuf gdk-pixbuf/io-gdip-jpeg.c gdk-pixbuf/io-gdip-tiff.c gdk-pixbuf/io-gdip-utils.c - gdk-pixbuf/io-gdip-wmf.c) + gdk-pixbuf/io-gdip-wmf.c +) +endif() +add_library(gdk-pixbuf ${SOURCES}) target_include_directories(gdk-pixbuf PRIVATE ${GLIB_INCLUDE_DIR} @@ -62,14 +67,20 @@ target_include_directories(gdk-pixbuf PRIVATE ${ZLIB_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR}) -target_link_libraries(gdk-pixbuf - ${GLIB_LIBRARIES} +set(LIBS + unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject ${ZLIB_LIBRARIES} ${PNG_LIBRARIES} - ${LIBINTL_LIBRARY} - Gdiplus) +) +if(WIN32) + list(APPEND LIBS Gdiplus unofficial::gettext::libintl) +else() + list(APPEND LIBS m) +endif() + +target_link_libraries(gdk-pixbuf ${LIBS}) -target_compile_definitions(gdk-pixbuf PRIVATE +set(DEFS HAVE_CONFIG_H GDK_PIXBUF_COMPILATION GDK_PIXBUF_ENABLE_BACKEND @@ -85,9 +96,12 @@ target_compile_definitions(gdk-pixbuf PRIVATE INCLUDE_pnm INCLUDE_icns INCLUDE_xpm - INCLUDE_gdiplus G_DISABLE_SINGLE_INCLUDES GDK_PIXBUF_DISABLE_SINGLE_INCLUDES) +if(WIN32) + list(APPEND DEFS INCLUDE_gdiplus) +endif() +target_compile_definitions(gdk-pixbuf PRIVATE ${DEFS}) set_target_properties(gdk-pixbuf PROPERTIES OUTPUT_NAME gdk_pixbuf-${GDK_PIXBUF_DLL_SUFFIX} diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL index 7d485d95b..7fa34b21a 100644 --- a/ports/gdk-pixbuf/CONTROL +++ b/ports/gdk-pixbuf/CONTROL @@ -1,4 +1,5 @@ Source: gdk-pixbuf
-Version: 2.36.9-2
+Version: 2.36.9-3
+Homepage: https://developer.gnome.org/gdk-pixbuf/
Description: Image loading library.
Build-Depends: gettext, zlib, libpng, glib
diff --git a/ports/gdk-pixbuf/config.h.linux b/ports/gdk-pixbuf/config.h.linux new file mode 100644 index 000000000..f67387328 --- /dev/null +++ b/ports/gdk-pixbuf/config.h.linux @@ -0,0 +1,158 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#define ENABLE_NLS 1 + +/* Define to 1 to replace the build-time prefix in modules */ +/* #undef GDK_PIXBUF_RELOCATABLE */ + +/* Define if gio can sniff image data */ +#define GDK_PIXBUF_USE_GIO_MIME 1 + +/* The prefix for our gettext translation domains. */ +#define GETTEXT_PACKAGE "gdk-pixbuf" + +/* Define to 1 if you have the `bind_textdomain_codeset' function. */ +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#define HAVE_DCGETTEXT 1 + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#define HAVE_GETTEXT 1 + +/* Define if you have the iconv() function and it works. */ +/* #undef HAVE_ICONV */ + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if libm has lrint */ +#define HAVE_LRINT 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 is libjpeg supports progressive JPEG */ +#define HAVE_PROGRESSIVE_JPEG 1 + +/* Define to 1 if libm has round */ +#define HAVE_ROUND 1 + +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + +/* Define to 1 if sigsetjmp is available */ +#define HAVE_SIGSETJMP 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the <sys/resource.h> header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if sys/sysinfo.h is available */ +#define HAVE_SYS_SYSINFO_H 1 + +/* Define to 1 if sys/systeminfo.h is available */ +/* #undef HAVE_SYS_SYSTEMINFO_H */ + +/* Define to 1 if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Define to 1 if it's a darwin platform */ +/* #undef OS_DARWIN */ + +/* Define to 1 if it's a Linux platform */ +#define OS_LINUX 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "gdk-pixbuf" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "gdk-pixbuf 2.36.9" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "gdk-pixbuf" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.36.9" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if gmodule works and should be used */ +#define USE_GMODULE 1 + +/* Whether to load modules via .la files rather than directly */ +/* #undef USE_LA_MODULES */ + +/* Define to 1 if medialib is available and should be used */ +/* #undef USE_MEDIALIB */ + +/* Define to 1 if medialib 2.5 is available */ +/* #undef USE_MEDIALIB25 */ + +/* Define to 1 if MMX is available and should be used */ +/* #undef USE_MMX */ + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* defines how to decorate public symbols while building */ +#define _GDK_PIXBUF_EXTERN __attribute__((visibility("default"))) extern + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 06f06cb5d..ef65115d0 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.linux ${SOURCE_PATH}/config.h.linux) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL index 7b19ca9cf..8fd66be95 100644 --- a/ports/geogram/CONTROL +++ b/ports/geogram/CONTROL @@ -1,7 +1,8 @@ Source: geogram -Version: 1.6.9-2 +Version: 1.6.9-6 +Homepage: https://gforge.inria.fr/projects/geogram/ Description: Geogram is a programming library of geometric algorithms. -Build-Depends: openblas, clapack +Build-Depends: openblas (!osx), clapack (!osx) Feature: graphics Description: Build viewers and geogram_gfx library. diff --git a/ports/geogram/enable_openblas_compatibility.patch b/ports/geogram/enable_openblas_compatibility.patch new file mode 100644 index 000000000..e6ab75a4c --- /dev/null +++ b/ports/geogram/enable_openblas_compatibility.patch @@ -0,0 +1,1008 @@ +diff --git a/src/lib/third_party/numerics/ARPACK/arpack_cnames.h b/src/lib/third_party/numerics/ARPACK/arpack_cnames.h +new file mode 100644 +index 0000000..e6f2c48 +--- /dev/null ++++ b/src/lib/third_party/numerics/ARPACK/arpack_cnames.h +@@ -0,0 +1,105 @@ ++#ifndef __ARPACK_CNAMES ++#define __ARPACK_CNAMES ++ ++/* ++ * These defines set up the naming scheme required to have a fortran 77 ++ * routine call a C routine ++ * for following Fortran to C interface: ++ * FORTRAN CALL C DECLARATION ++ * call dgemm(...) void dgemm(...) ++ */ ++/* BLAS */ ++#define sswap_ sswap ++#define saxpy_ saxpy ++#define sasum_ sasum ++#define isamax_ isamax ++#define scopy_ scopy ++#define sscal_ sscal ++#define sger_ sger ++#define snrm2_ snrm2 ++#define ssymv_ ssymv ++#define sdot_ sdot ++#define saxpy_ saxpy ++#define ssyr2_ ssyr2 ++#define srot_ srot ++#define sgemv_ sgemv ++#define strsv_ strsv ++#define sgemm_ sgemm ++#define strsm_ strsm ++ ++#define dswap_ dswap ++#define daxpy_ daxpy ++#define dasum_ dasum ++#define idamax_ idamax ++#define dcopy_ dcopy ++#define dscal_ dscal ++#define dger_ dger ++#define dnrm2_ dnrm2 ++#define dsymv_ dsymv ++#define ddot_ ddot ++#define dsyr2_ dsyr2 ++#define drot_ drot ++#define dgemv_ dgemv ++#define dtrsv_ dtrsv ++#define dgemm_ dgemm ++#define dtrsm_ dtrsm ++ ++#define cswap_ cswap ++#define caxpy_ caxpy ++#define scasum_ scasum ++#define icamax_ icamax ++#define ccopy_ ccopy ++#define cscal_ cscal ++#define scnrm2_ scnrm2 ++#define cgemv_ cgemv ++#define ctrsv_ ctrsv ++#define cgemm_ cgemm ++#define ctrsm_ ctrsm ++#define cgerc_ cgerc ++#define chemv_ chemv ++#define cher2_ cher2 ++ ++#define zswap_ zswap ++#define zaxpy_ zaxpy ++#define dzasum_ dzasum ++#define izamax_ izamax ++#define zcopy_ zcopy ++#define zscal_ zscal ++#define dznrm2_ dznrm2 ++#define zgemv_ zgemv ++#define ztrsv_ ztrsv ++#define zgemm_ zgemm ++#define ztrsm_ ztrsm ++#define zgerc_ zgerc ++#define zhemv_ zhemv ++#define zher2_ zher2 ++ ++/* LAPACK */ ++#define dlacon_ dlacon ++#define slacon_ slacon ++#define icmax1_ icmax1 ++#define scsum1_ scsum1 ++#define clacon_ clacon ++#define dzsum1_ dzsum1 ++#define izmax1_ izmax1 ++#define zlacon_ zlacon ++ ++/* Fortran interface */ ++#define c_bridge_dgssv_ c_bridge_dgssv ++#define c_fortran_sgssv_ c_fortran_sgssv ++#define c_fortran_dgssv_ c_fortran_dgssv ++#define c_fortran_cgssv_ c_fortran_cgssv ++#define c_fortran_zgssv_ c_fortran_zgssv ++ ++#define cdotc_ cdotc ++#define csscal_ csscal ++#define zdscal_ zdscal ++#define zdotc_ zdotc ++#define ctrmm_ ctrmm ++#define dtrmm_ dtrmm ++#define strmm_ strmm ++#define ztrmm_ ztrmm ++#define cgeru_ cgeru ++#define zgeru_ zgeru ++ ++#endif /* __ARPACK_CNAMES */ +diff --git a/src/lib/third_party/numerics/ARPACK/cgetv0.c b/src/lib/third_party/numerics/ARPACK/cgetv0.c +index 48e8677..871d7b0 100755 +--- a/src/lib/third_party/numerics/ARPACK/cgetv0.c ++++ b/src/lib/third_party/numerics/ARPACK/cgetv0.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/cnaitr.c b/src/lib/third_party/numerics/ARPACK/cnaitr.c +index ee9318b..693f399 100755 +--- a/src/lib/third_party/numerics/ARPACK/cnaitr.c ++++ b/src/lib/third_party/numerics/ARPACK/cnaitr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/cnapps.c b/src/lib/third_party/numerics/ARPACK/cnapps.c +index 0c4a6a2..4929fc1 100755 +--- a/src/lib/third_party/numerics/ARPACK/cnapps.c ++++ b/src/lib/third_party/numerics/ARPACK/cnapps.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/cnaup2.c b/src/lib/third_party/numerics/ARPACK/cnaup2.c +index 8322446..2d98e4b 100755 +--- a/src/lib/third_party/numerics/ARPACK/cnaup2.c ++++ b/src/lib/third_party/numerics/ARPACK/cnaup2.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/cnaupd.c b/src/lib/third_party/numerics/ARPACK/cnaupd.c +index e51f72e..4fe5dca 100755 +--- a/src/lib/third_party/numerics/ARPACK/cnaupd.c ++++ b/src/lib/third_party/numerics/ARPACK/cnaupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/cneigh.c b/src/lib/third_party/numerics/ARPACK/cneigh.c +index d96bebd..adfa279 100755 +--- a/src/lib/third_party/numerics/ARPACK/cneigh.c ++++ b/src/lib/third_party/numerics/ARPACK/cneigh.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/cneupd.c b/src/lib/third_party/numerics/ARPACK/cneupd.c +index 6a839e7..35fc426 100755 +--- a/src/lib/third_party/numerics/ARPACK/cneupd.c ++++ b/src/lib/third_party/numerics/ARPACK/cneupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/cngets.c b/src/lib/third_party/numerics/ARPACK/cngets.c +index 9788d00..663406f 100755 +--- a/src/lib/third_party/numerics/ARPACK/cngets.c ++++ b/src/lib/third_party/numerics/ARPACK/cngets.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/csortc.c b/src/lib/third_party/numerics/ARPACK/csortc.c +index 8c6cedb..0d330fe 100755 +--- a/src/lib/third_party/numerics/ARPACK/csortc.c ++++ b/src/lib/third_party/numerics/ARPACK/csortc.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* \BeginDoc */ + + /* \Name: csortc */ +diff --git a/src/lib/third_party/numerics/ARPACK/cstatn.c b/src/lib/third_party/numerics/ARPACK/cstatn.c +index 6fcde6d..4eb47dc 100755 +--- a/src/lib/third_party/numerics/ARPACK/cstatn.c ++++ b/src/lib/third_party/numerics/ARPACK/cstatn.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dgetv0.c b/src/lib/third_party/numerics/ARPACK/dgetv0.c +index 0f4c2bb..2206708 100755 +--- a/src/lib/third_party/numerics/ARPACK/dgetv0.c ++++ b/src/lib/third_party/numerics/ARPACK/dgetv0.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dlaqrb.c b/src/lib/third_party/numerics/ARPACK/dlaqrb.c +index baa4f12..d4275a7 100755 +--- a/src/lib/third_party/numerics/ARPACK/dlaqrb.c ++++ b/src/lib/third_party/numerics/ARPACK/dlaqrb.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Table of constant values */ + + static integer c__1 = 1; +diff --git a/src/lib/third_party/numerics/ARPACK/dnaitr.c b/src/lib/third_party/numerics/ARPACK/dnaitr.c +index 8fffe7f..74eca38 100755 +--- a/src/lib/third_party/numerics/ARPACK/dnaitr.c ++++ b/src/lib/third_party/numerics/ARPACK/dnaitr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dnapps.c b/src/lib/third_party/numerics/ARPACK/dnapps.c +index 67dac36..b0083a1 100755 +--- a/src/lib/third_party/numerics/ARPACK/dnapps.c ++++ b/src/lib/third_party/numerics/ARPACK/dnapps.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dnaup2.c b/src/lib/third_party/numerics/ARPACK/dnaup2.c +index 28dabb6..8b48f33 100755 +--- a/src/lib/third_party/numerics/ARPACK/dnaup2.c ++++ b/src/lib/third_party/numerics/ARPACK/dnaup2.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dnaupd.c b/src/lib/third_party/numerics/ARPACK/dnaupd.c +index e20298c..dcfaf47 100755 +--- a/src/lib/third_party/numerics/ARPACK/dnaupd.c ++++ b/src/lib/third_party/numerics/ARPACK/dnaupd.c +@@ -11,7 +11,7 @@ + */ + + #include "protos.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dnconv.c b/src/lib/third_party/numerics/ARPACK/dnconv.c +index e2324b7..aa0bf91 100755 +--- a/src/lib/third_party/numerics/ARPACK/dnconv.c ++++ b/src/lib/third_party/numerics/ARPACK/dnconv.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dneigh.c b/src/lib/third_party/numerics/ARPACK/dneigh.c +index b7057eb..94e3680 100755 +--- a/src/lib/third_party/numerics/ARPACK/dneigh.c ++++ b/src/lib/third_party/numerics/ARPACK/dneigh.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dneupd.c b/src/lib/third_party/numerics/ARPACK/dneupd.c +index 141255d..067041b 100755 +--- a/src/lib/third_party/numerics/ARPACK/dneupd.c ++++ b/src/lib/third_party/numerics/ARPACK/dneupd.c +@@ -11,7 +11,7 @@ + */ + + #include "protos.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dngets.c b/src/lib/third_party/numerics/ARPACK/dngets.c +index 9b0ee73..e39848f 100755 +--- a/src/lib/third_party/numerics/ARPACK/dngets.c ++++ b/src/lib/third_party/numerics/ARPACK/dngets.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsaitr.c b/src/lib/third_party/numerics/ARPACK/dsaitr.c +index 2f3df52..89a597a 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsaitr.c ++++ b/src/lib/third_party/numerics/ARPACK/dsaitr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsapps.c b/src/lib/third_party/numerics/ARPACK/dsapps.c +index e87b27d..4a320c9 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsapps.c ++++ b/src/lib/third_party/numerics/ARPACK/dsapps.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsaup2.c b/src/lib/third_party/numerics/ARPACK/dsaup2.c +index e5f224f..b93e80b 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsaup2.c ++++ b/src/lib/third_party/numerics/ARPACK/dsaup2.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsaupd.c b/src/lib/third_party/numerics/ARPACK/dsaupd.c +index a9e456f..d20ebe2 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsaupd.c ++++ b/src/lib/third_party/numerics/ARPACK/dsaupd.c +@@ -11,7 +11,7 @@ + */ + + #include "protos.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsconv.c b/src/lib/third_party/numerics/ARPACK/dsconv.c +index 843ac29..25e3b8f 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsconv.c ++++ b/src/lib/third_party/numerics/ARPACK/dsconv.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dseigt.c b/src/lib/third_party/numerics/ARPACK/dseigt.c +index c7e975b..ba74d2f 100755 +--- a/src/lib/third_party/numerics/ARPACK/dseigt.c ++++ b/src/lib/third_party/numerics/ARPACK/dseigt.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsesrt.c b/src/lib/third_party/numerics/ARPACK/dsesrt.c +index 1bf99ee..8a2030f 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsesrt.c ++++ b/src/lib/third_party/numerics/ARPACK/dsesrt.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Table of constant values */ + + static integer c__1 = 1; +diff --git a/src/lib/third_party/numerics/ARPACK/dseupd.c b/src/lib/third_party/numerics/ARPACK/dseupd.c +index 9b81477..065e4d8 100755 +--- a/src/lib/third_party/numerics/ARPACK/dseupd.c ++++ b/src/lib/third_party/numerics/ARPACK/dseupd.c +@@ -11,7 +11,7 @@ + */ + + #include "protos.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsgets.c b/src/lib/third_party/numerics/ARPACK/dsgets.c +index 7983ec8..19a33d9 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsgets.c ++++ b/src/lib/third_party/numerics/ARPACK/dsgets.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dsortc.c b/src/lib/third_party/numerics/ARPACK/dsortc.c +index 2170fcc..131ae2f 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsortc.c ++++ b/src/lib/third_party/numerics/ARPACK/dsortc.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* ----------------------------------------------------------------------- */ + /* \BeginDoc */ + +diff --git a/src/lib/third_party/numerics/ARPACK/dsortr.c b/src/lib/third_party/numerics/ARPACK/dsortr.c +index 5f8dca8..335d9a9 100755 +--- a/src/lib/third_party/numerics/ARPACK/dsortr.c ++++ b/src/lib/third_party/numerics/ARPACK/dsortr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* ----------------------------------------------------------------------- */ + /* \BeginDoc */ + +diff --git a/src/lib/third_party/numerics/ARPACK/dstatn.c b/src/lib/third_party/numerics/ARPACK/dstatn.c +index 50c15f2..1909d6d 100755 +--- a/src/lib/third_party/numerics/ARPACK/dstatn.c ++++ b/src/lib/third_party/numerics/ARPACK/dstatn.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dstats.c b/src/lib/third_party/numerics/ARPACK/dstats.c +index 4341eea..02f4024 100755 +--- a/src/lib/third_party/numerics/ARPACK/dstats.c ++++ b/src/lib/third_party/numerics/ARPACK/dstats.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/dstqrb.c b/src/lib/third_party/numerics/ARPACK/dstqrb.c +index 2a10880..c25f44d 100755 +--- a/src/lib/third_party/numerics/ARPACK/dstqrb.c ++++ b/src/lib/third_party/numerics/ARPACK/dstqrb.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Table of constant values */ + + static integer c__0 = 0; +diff --git a/src/lib/third_party/numerics/ARPACK/protos.h b/src/lib/third_party/numerics/ARPACK/protos.h +index 2e87fe7..09a89fc 100755 +--- a/src/lib/third_party/numerics/ARPACK/protos.h ++++ b/src/lib/third_party/numerics/ARPACK/protos.h +@@ -8,7 +8,7 @@ + + #include <third_party/numerics/linkage.h> + #include "f2c.h" +- ++#include "arpack_cnames.h" + int NUMERICS_API dnaupd_( + integer *ido, char *bmat, integer *n, char * + which, integer *nev, doublereal *tol, doublereal *resid, integer *ncv, +diff --git a/src/lib/third_party/numerics/ARPACK/sgetv0.c b/src/lib/third_party/numerics/ARPACK/sgetv0.c +index 206122a..314252f 100755 +--- a/src/lib/third_party/numerics/ARPACK/sgetv0.c ++++ b/src/lib/third_party/numerics/ARPACK/sgetv0.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/slaqrb.c b/src/lib/third_party/numerics/ARPACK/slaqrb.c +index 335faa2..12cc92a 100755 +--- a/src/lib/third_party/numerics/ARPACK/slaqrb.c ++++ b/src/lib/third_party/numerics/ARPACK/slaqrb.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Table of constant values */ + + static integer c__1 = 1; +diff --git a/src/lib/third_party/numerics/ARPACK/snaitr.c b/src/lib/third_party/numerics/ARPACK/snaitr.c +index 5e24f6c..f3bc2fa 100755 +--- a/src/lib/third_party/numerics/ARPACK/snaitr.c ++++ b/src/lib/third_party/numerics/ARPACK/snaitr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/snapps.c b/src/lib/third_party/numerics/ARPACK/snapps.c +index 37470fc..9ae03e4 100755 +--- a/src/lib/third_party/numerics/ARPACK/snapps.c ++++ b/src/lib/third_party/numerics/ARPACK/snapps.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/snaup2.c b/src/lib/third_party/numerics/ARPACK/snaup2.c +index 4028150..f893a8e 100755 +--- a/src/lib/third_party/numerics/ARPACK/snaup2.c ++++ b/src/lib/third_party/numerics/ARPACK/snaup2.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/snaupd.c b/src/lib/third_party/numerics/ARPACK/snaupd.c +index 88118f0..66fac19 100755 +--- a/src/lib/third_party/numerics/ARPACK/snaupd.c ++++ b/src/lib/third_party/numerics/ARPACK/snaupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/snconv.c b/src/lib/third_party/numerics/ARPACK/snconv.c +index 4984455..cb42561 100755 +--- a/src/lib/third_party/numerics/ARPACK/snconv.c ++++ b/src/lib/third_party/numerics/ARPACK/snconv.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/sneigh.c b/src/lib/third_party/numerics/ARPACK/sneigh.c +index 4ff7d7a..a8b3ffc 100755 +--- a/src/lib/third_party/numerics/ARPACK/sneigh.c ++++ b/src/lib/third_party/numerics/ARPACK/sneigh.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/sneupd.c b/src/lib/third_party/numerics/ARPACK/sneupd.c +index e2a7205..430f033 100755 +--- a/src/lib/third_party/numerics/ARPACK/sneupd.c ++++ b/src/lib/third_party/numerics/ARPACK/sneupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/sngets.c b/src/lib/third_party/numerics/ARPACK/sngets.c +index 5a13f94..1c34e92 100755 +--- a/src/lib/third_party/numerics/ARPACK/sngets.c ++++ b/src/lib/third_party/numerics/ARPACK/sngets.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssaitr.c b/src/lib/third_party/numerics/ARPACK/ssaitr.c +index 65a61f6..98fbb1c 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssaitr.c ++++ b/src/lib/third_party/numerics/ARPACK/ssaitr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssapps.c b/src/lib/third_party/numerics/ARPACK/ssapps.c +index 9537c2f..b979fb1 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssapps.c ++++ b/src/lib/third_party/numerics/ARPACK/ssapps.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssaup2.c b/src/lib/third_party/numerics/ARPACK/ssaup2.c +index a5123dc..59e08aa 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssaup2.c ++++ b/src/lib/third_party/numerics/ARPACK/ssaup2.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssaupd.c b/src/lib/third_party/numerics/ARPACK/ssaupd.c +index 5898148..32ba0b0 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssaupd.c ++++ b/src/lib/third_party/numerics/ARPACK/ssaupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssconv.c b/src/lib/third_party/numerics/ARPACK/ssconv.c +index 0e1c9c2..90faa50 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssconv.c ++++ b/src/lib/third_party/numerics/ARPACK/ssconv.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/sseigt.c b/src/lib/third_party/numerics/ARPACK/sseigt.c +index 6b9e407..6652b74 100755 +--- a/src/lib/third_party/numerics/ARPACK/sseigt.c ++++ b/src/lib/third_party/numerics/ARPACK/sseigt.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssesrt.c b/src/lib/third_party/numerics/ARPACK/ssesrt.c +index 9287d6a..d6bcd6d 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssesrt.c ++++ b/src/lib/third_party/numerics/ARPACK/ssesrt.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Table of constant values */ + + static integer c__1 = 1; +diff --git a/src/lib/third_party/numerics/ARPACK/sseupd.c b/src/lib/third_party/numerics/ARPACK/sseupd.c +index 163df3a..b0e825f 100755 +--- a/src/lib/third_party/numerics/ARPACK/sseupd.c ++++ b/src/lib/third_party/numerics/ARPACK/sseupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssgets.c b/src/lib/third_party/numerics/ARPACK/ssgets.c +index 244f2ab..52127c2 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssgets.c ++++ b/src/lib/third_party/numerics/ARPACK/ssgets.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/ssortc.c b/src/lib/third_party/numerics/ARPACK/ssortc.c +index aa836f7..38b5fbd 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssortc.c ++++ b/src/lib/third_party/numerics/ARPACK/ssortc.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* ----------------------------------------------------------------------- */ + /* \BeginDoc */ + +diff --git a/src/lib/third_party/numerics/ARPACK/ssortr.c b/src/lib/third_party/numerics/ARPACK/ssortr.c +index e48fb1c..88db423 100755 +--- a/src/lib/third_party/numerics/ARPACK/ssortr.c ++++ b/src/lib/third_party/numerics/ARPACK/ssortr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* ----------------------------------------------------------------------- */ + /* \BeginDoc */ + +diff --git a/src/lib/third_party/numerics/ARPACK/sstatn.c b/src/lib/third_party/numerics/ARPACK/sstatn.c +index fc899df..26d49b9 100755 +--- a/src/lib/third_party/numerics/ARPACK/sstatn.c ++++ b/src/lib/third_party/numerics/ARPACK/sstatn.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/sstats.c b/src/lib/third_party/numerics/ARPACK/sstats.c +index 6601d2e..61577e2 100755 +--- a/src/lib/third_party/numerics/ARPACK/sstats.c ++++ b/src/lib/third_party/numerics/ARPACK/sstats.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/sstqrb.c b/src/lib/third_party/numerics/ARPACK/sstqrb.c +index 4c7bf91..2a416e2 100755 +--- a/src/lib/third_party/numerics/ARPACK/sstqrb.c ++++ b/src/lib/third_party/numerics/ARPACK/sstqrb.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Table of constant values */ + + static integer c__0 = 0; +diff --git a/src/lib/third_party/numerics/ARPACK/zgetv0.c b/src/lib/third_party/numerics/ARPACK/zgetv0.c +index 96d3c48..d868c1f 100755 +--- a/src/lib/third_party/numerics/ARPACK/zgetv0.c ++++ b/src/lib/third_party/numerics/ARPACK/zgetv0.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/znaitr.c b/src/lib/third_party/numerics/ARPACK/znaitr.c +index 2ce6b9c..c8cf0f6 100755 +--- a/src/lib/third_party/numerics/ARPACK/znaitr.c ++++ b/src/lib/third_party/numerics/ARPACK/znaitr.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/znapps.c b/src/lib/third_party/numerics/ARPACK/znapps.c +index 732aed0..30f46e6 100755 +--- a/src/lib/third_party/numerics/ARPACK/znapps.c ++++ b/src/lib/third_party/numerics/ARPACK/znapps.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/znaup2.c b/src/lib/third_party/numerics/ARPACK/znaup2.c +index b7caa42..7164775 100755 +--- a/src/lib/third_party/numerics/ARPACK/znaup2.c ++++ b/src/lib/third_party/numerics/ARPACK/znaup2.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/znaupd.c b/src/lib/third_party/numerics/ARPACK/znaupd.c +index ed251ee..f960959 100755 +--- a/src/lib/third_party/numerics/ARPACK/znaupd.c ++++ b/src/lib/third_party/numerics/ARPACK/znaupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/zneigh.c b/src/lib/third_party/numerics/ARPACK/zneigh.c +index 4157ab3..4ee3c1e 100755 +--- a/src/lib/third_party/numerics/ARPACK/zneigh.c ++++ b/src/lib/third_party/numerics/ARPACK/zneigh.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/zneupd.c b/src/lib/third_party/numerics/ARPACK/zneupd.c +index 3f684f4..3ef32c1 100755 +--- a/src/lib/third_party/numerics/ARPACK/zneupd.c ++++ b/src/lib/third_party/numerics/ARPACK/zneupd.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/zngets.c b/src/lib/third_party/numerics/ARPACK/zngets.c +index a2e461b..97bbebd 100755 +--- a/src/lib/third_party/numerics/ARPACK/zngets.c ++++ b/src/lib/third_party/numerics/ARPACK/zngets.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { +diff --git a/src/lib/third_party/numerics/ARPACK/zsortc.c b/src/lib/third_party/numerics/ARPACK/zsortc.c +index a35748c..38dbc42 100755 +--- a/src/lib/third_party/numerics/ARPACK/zsortc.c ++++ b/src/lib/third_party/numerics/ARPACK/zsortc.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* \BeginDoc */ + + /* \Name: zsortc */ +diff --git a/src/lib/third_party/numerics/ARPACK/zstatn.c b/src/lib/third_party/numerics/ARPACK/zstatn.c +index d433e97..5a8bd1e 100755 +--- a/src/lib/third_party/numerics/ARPACK/zstatn.c ++++ b/src/lib/third_party/numerics/ARPACK/zstatn.c +@@ -11,7 +11,7 @@ + */ + + #include "f2c.h" +- ++#include "arpack_cnames.h" + /* Common Block Declarations */ + + struct { diff --git a/ports/geogram/fix_underscore.patch b/ports/geogram/fix_underscore.patch new file mode 100644 index 000000000..eeb5a30cb --- /dev/null +++ b/ports/geogram/fix_underscore.patch @@ -0,0 +1,10 @@ +diff --git a/src/lib/third_party/numerics/SUPERLU/slu_Cnames.h b/src/lib/third_party/numerics/SUPERLU/slu_Cnames.h +index 68b3afe..0369a68 100755 +--- a/src/lib/third_party/numerics/SUPERLU/slu_Cnames.h ++++ b/src/lib/third_party/numerics/SUPERLU/slu_Cnames.h +@@ -1,4 +1,4 @@ +-#define Add_ /* Bruno */ ++#define NoChange + + /*! \file + Copyright (c) 2003, The Regents of the University of California, through diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 46709f6c3..9584e6619 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -8,11 +8,17 @@ vcpkg_download_distfile(ARCHIVE SHA512 1b5c7540bef734c1908f213f26780aba63b4911a8022d5eb3f7c90eabe2cb69efd1f298b30cdc8e2c636a5b37c8c25832dd4aad0b7c2ff5f0a5b5caa17970136 ) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(ADDITIONAL_PATCHES "fix_underscore.patch" "enable_openblas_compatibility.patch") +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${GEOGRAM_VERSION} - PATCHES fix-cmake-config-and-install.patch + PATCHES + fix-cmake-config-and-install.patch + ${ADDITIONAL_PATCHES} ) file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake) @@ -24,10 +30,30 @@ endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(VORPALINE_BUILD_DYNAMIC FALSE) - set(VORPALINE_PLATFORM Win-vs-generic) + if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + set(VORPALINE_PLATFORM Win-vs-generic) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux") + message("geogram on Linux only supports dynamic library linkage. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) + set(VORPALINE_PLATFORM Linux64-gcc-dynamic ) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin") + message("geogram on Darwin only supports dynamic library linkage. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) + set(VORPALINE_PLATFORM Darwin-clang-dynamic) + endif() else() set(VORPALINE_BUILD_DYNAMIC TRUE) - set(VORPALINE_PLATFORM Win-vs-dynamic-generic) + if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + set(VORPALINE_PLATFORM Win-vs-generic) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Linux") + set(VORPALINE_PLATFORM Linux64-gcc-dynamic ) + endif() + if (VCPKG_CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(VORPALINE_PLATFORM Darwin-clang-dynamic) + endif() endif() vcpkg_configure_cmake( @@ -45,7 +71,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/geogram") +vcpkg_fixup_cmake_targets() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) diff --git a/ports/geographiclib/CONTROL b/ports/geographiclib/CONTROL index 993239b96..1c4c5a17d 100644 --- a/ports/geographiclib/CONTROL +++ b/ports/geographiclib/CONTROL @@ -1,3 +1,4 @@ Source: geographiclib -Version: 1.47-patch1-4 +Version: 1.47-patch1-6 +Homepage: https://sourceforge.net/projects/geographiclib/ Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems. diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 96b633aec..8f4a716dc 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -11,16 +11,17 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geographiclib-1.47) + vcpkg_download_distfile(ARCHIVE URLS "https://jaist.dl.sourceforge.net/project/geographiclib/distrib/GeographicLib-1.47-patch1.zip" FILENAME "geographiclib-1.47-patch1.zip" SHA512 d8fdfd7ae093057ec1a4ab922457fe71a3fb9975df5b673c276d62a0e9c4f212dc63652830b9d89e3890bc96aafd335992943cf6a1bce8260acf932d1eb7abfd ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove-tools-and-fix-version.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + remove-tools-and-fix-version.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -44,39 +45,14 @@ else() endif() vcpkg_install_cmake() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) -file(GLOB GEOGRAPHICLIB_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/cmake/*.cmake ${CURRENT_PACKAGES_DIR}/debug/cmake/*.cmake) -file(COPY ${GEOGRAPHICLIB_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib) - -file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-targets.cmake GEOGRAPHICLIB_MODULE) -string(REPLACE "\${_IMPORT_PREFIX}/include" "\${_IMPORT_PREFIX}/../include" GEOGRAPHICLIB_MODULE "${GEOGRAPHICLIB_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets.cmake "${GEOGRAPHICLIB_MODULE}") - -file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-targets-debug.cmake GEOGRAPHICLIB_DEBUG_MODULE) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/../debug" GEOGRAPHICLIB_DEBUG_MODULE "${GEOGRAPHICLIB_DEBUG_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets-debug.cmake "${GEOGRAPHICLIB_DEBUG_MODULE}") - -file(READ ${CURRENT_PACKAGES_DIR}/debug/cmake/geographiclib-namespace-targets-debug.cmake GEOGRAPHICLIB_DEBUG_MODULE) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/../debug" GEOGRAPHICLIB_DEBUG_MODULE "${GEOGRAPHICLIB_DEBUG_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-namespace-targets-debug.cmake "${GEOGRAPHICLIB_DEBUG_MODULE}") - -file(READ ${CURRENT_PACKAGES_DIR}/cmake/geographiclib-targets-release.cmake GEOGRAPHICLIB_RELEASE_MODULE) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/.." GEOGRAPHICLIB_RELEASE_MODULE "${GEOGRAPHICLIB_RELEASE_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-targets-release.cmake "${GEOGRAPHICLIB_RELEASE_MODULE}") +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/cmake/geographiclib-namespace-targets-release.cmake GEOGRAPHICLIB_RELEASE_MODULE) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/.." GEOGRAPHICLIB_RELEASE_MODULE "${GEOGRAPHICLIB_RELEASE_MODULE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/geographiclib/geographiclib-namespace-targets-release.cmake "${GEOGRAPHICLIB_RELEASE_MODULE}") - - -file(COPY ${CURRENT_BUILDTREES_DIR}/src/GeographicLib-1.47/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/geographiclib/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/geographiclib/copyright) - -file(GLOB EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake) +file(COPY ${CURRENT_PACKAGES_DIR}/lib/pkgconfig DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# file(REMOVE_RECURSE ${EXE_FILES}) + +file(INSTALL ${SOURCE_PATH}/00README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib RENAME readme) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/geographiclib RENAME copyright) diff --git a/ports/geos/CONTROL b/ports/geos/CONTROL index cb19bebd9..3366b6a5e 100644 --- a/ports/geos/CONTROL +++ b/ports/geos/CONTROL @@ -1,3 +1,4 @@ Source: geos Version: 3.6.3-3 +Homepage: https://www.osgeo.org/projects/geos/ Description: Geometry Engine Open Source diff --git a/ports/getopt-win32/CONTROL b/ports/getopt-win32/CONTROL index d80fa0b00..ba14d4909 100644 --- a/ports/getopt-win32/CONTROL +++ b/ports/getopt-win32/CONTROL @@ -1,3 +1,4 @@ Source: getopt-win32
Version: 0.1
-Description: An implementation of getopt provided by https://github.com/libimobiledevice-win32
+Description: An implementation of getopt.
+Homepage: https://github.com/libimobiledevice-win32
diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL index be85f1d66..a6adfefc6 100644 --- a/ports/gettext/CONTROL +++ b/ports/gettext/CONTROL @@ -1,4 +1,5 @@ Source: gettext Version: 0.19-10 +Homepage: https://www.gnu.org/software/gettext/ Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl. Build-Depends: libiconv diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index b090f2ba5..4cd423293 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,3 +1,4 @@ Source: gflags Version: 2.2.2-1 +Homepage: https://github.com/gflags/gflags Description: A C++ library that implements commandline flags processing diff --git a/ports/gherkin-c/CONTROL b/ports/gherkin-c/CONTROL index 171dedae0..b25786ca3 100644 --- a/ports/gherkin-c/CONTROL +++ b/ports/gherkin-c/CONTROL @@ -1,3 +1,3 @@ Source: gherkin-c
-Version: c-libs-e63e83104b
+Version: 4.1.2 Description: Gherkin parser/compiler in C
diff --git a/ports/gherkin-c/portfile.cmake b/ports/gherkin-c/portfile.cmake index f229ba836..453387f5f 100644 --- a/ports/gherkin-c/portfile.cmake +++ b/ports/gherkin-c/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO c-libs/gherkin-c
- REF e63e83104b835e217140e9dc77d9ce2bb50f234e
- SHA512 a99b3f695257b45df8ff7b8ec46bff28991cf2b9bc51a25247550471c724bd14ee64340db684f096131f47d7f4ff278d23dda546e7dfe29134bbc1dbccaf0d1e
+ REF 8f31c2ff6a7b58196a061c8847508563679f67b3 + SHA512 f78a1f9da7ff38fe2546e0db9ed33a2e25e12aa8a407ce827933a379ce083e6f872b39eb2321ff8c35199015c3c2299e46567171c5edfeff07600765f3f0a6ec
HEAD_REF master
)
diff --git a/ports/giflib/CONTROL b/ports/giflib/CONTROL index 169ddbd92..4de8f8e22 100644 --- a/ports/giflib/CONTROL +++ b/ports/giflib/CONTROL @@ -1,3 +1,4 @@ Source: giflib Version: 5.1.4-3 +Homepage: https://sourceforge.net/projects/giflib/ Description: A library for reading and writing gif images. diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake index ed68c11b8..7ca1478f7 100644 --- a/ports/giflib/portfile.cmake +++ b/ports/giflib/portfile.cmake @@ -4,18 +4,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(GIFLIB_VERSION 5.1.4) vcpkg_download_distfile(ARCHIVE - URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2" + URLS "https://nchc.dl.sourceforge.net/project/giflib/giflib-${GIFLIB_VERSION}.tar.bz2" FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2" SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d ) +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + set(ADDITIONAL_PATCH "fix-compile-error.patch") +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${GIFLIB_VERSION} PATCHES msvc-guard-unistd-h.patch - fix-compile-error.patch + ${ADDITIONAL_PATCH} ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/gl2ps/CONTROL b/ports/gl2ps/CONTROL index 052835a34..ae8aab8fa 100644 --- a/ports/gl2ps/CONTROL +++ b/ports/gl2ps/CONTROL @@ -1,4 +1,5 @@ Source: gl2ps Version: 1.4.0-1 +Homepage: https://gitlab.onelab.info/gl2ps/gl2ps Description: OpenGL to PostScript Printing Library Build-Depends: freeglut, zlib, libpng diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL index d2ce04972..7ce058fbc 100644 --- a/ports/gl3w/CONTROL +++ b/ports/gl3w/CONTROL @@ -1,4 +1,5 @@ Source: gl3w -Version: 99ed3211 +Version: 2018-05-31-1 +Homepage: https://github.com/skaslev/gl3w Description: Simple OpenGL core profile loading Build-Depends: opengl-registry diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake index c5010491a..ca35eb2bf 100644 --- a/ports/gl3w/portfile.cmake +++ b/ports/gl3w/portfile.cmake @@ -32,8 +32,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/gl3w) +vcpkg_fixup_cmake_targets() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(HEADER ${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h) diff --git a/ports/glad/CONTROL b/ports/glad/CONTROL index 5d041c0a0..98a427195 100644 --- a/ports/glad/CONTROL +++ b/ports/glad/CONTROL @@ -1,4 +1,4 @@ Source: glad
-Version: 0.1.29
+Version: 0.1.30
Description: Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.
Build-Depends: egl-registry, opengl-registry
diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index 252109b8f..eb1a226e9 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Dav1dde/glad
- REF v0.1.29
- SHA512 056c0439b673d86bd10fe733873d4b82cf70861818980f08b3ec23f7b478750064a6d53925cc2cf9445e570cece5f21e12d7af6f1927b64af05d8d1f2afdedcb
+ REF v0.1.30
+ SHA512 2db0f75e5859be039bf4dcbea239dd6d35bdc92e69912e807dfacdb01581c73b6a5eb0f0889f2ffcd705415abe5f28cf204b4010d08f5477b51c0ce3ae6a35b5
HEAD_REF master
)
diff --git a/ports/glbinding/force-system-install.patch b/ports/glbinding/0001_force-system-install.patch index 1674f145a..1674f145a 100644 --- a/ports/glbinding/force-system-install.patch +++ b/ports/glbinding/0001_force-system-install.patch diff --git a/ports/glbinding/0002_fix-uwpmacro.patch b/ports/glbinding/0002_fix-uwpmacro.patch new file mode 100644 index 000000000..61c179662 --- /dev/null +++ b/ports/glbinding/0002_fix-uwpmacro.patch @@ -0,0 +1,33 @@ +diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt
+index 97654c8..bca68d1 100644
+--- a/source/glbinding/CMakeLists.txt
++++ b/source/glbinding/CMakeLists.txt
+@@ -261,6 +261,11 @@ target_link_libraries(${target}
+ # Compile definitions
+ #
+
++
++if (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++ target_compile_definitions(${target} PRIVATE SYSTEM_WINDOWS WINDOWS_STORE)
++endif()
++
+ target_compile_definitions(${target}
+ PRIVATE
+ # since we use stl and stl is intended to use exceptions, exceptions should not be disabled
+diff --git a/source/glbinding/source/getProcAddress.cpp b/source/glbinding/source/getProcAddress.cpp
+index c1cfc5c..7e5f8bc 100644
+--- a/source/glbinding/source/getProcAddress.cpp
++++ b/source/glbinding/source/getProcAddress.cpp
+@@ -18,7 +18,11 @@ namespace glbinding {
+
+ ProcAddress getProcAddress(const char * name)
+ {
+- static auto module = LoadLibrary(_T("OPENGL32.DLL"));
++#ifdef WINDOWS_STORE
++ static auto module = ::LoadPackagedLibrary(_T("OPENGL32.DLL"), 0);
++#else
++ static auto module = ::LoadLibrary(_T("OPENGL32.DLL"));
++#endif
+
+ // Prevent static linking of opengl32
+ static auto wglGetProcAddress_ = reinterpret_cast<void * (__stdcall *)(const char *)>(::GetProcAddress(module, "wglGetProcAddress"));
diff --git a/ports/glbinding/0003_fix-cmake-configs-paths.patch b/ports/glbinding/0003_fix-cmake-configs-paths.patch new file mode 100644 index 000000000..359837784 --- /dev/null +++ b/ports/glbinding/0003_fix-cmake-configs-paths.patch @@ -0,0 +1,62 @@ +diff --git a/3rdparty/KHR/CMakeLists.txt b/3rdparty/KHR/CMakeLists.txt +index 25fac3a..429544f 100644 +--- a/3rdparty/KHR/CMakeLists.txt ++++ b/3rdparty/KHR/CMakeLists.txt +@@ -43,7 +43,7 @@ add_library(${target} INTERFACE) + add_library(externals::${target} ALIAS ${target}) + + # Export library for downstream projects +-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake) ++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake) + + + # +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 700b48b..8aaab8d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,15 +141,15 @@ endif() + if(1) + # Install into the system (/usr/bin or /usr/local/bin) + set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project> +- set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake ++ set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share/<project>/cmake + set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/<project> + set(INSTALL_DATA "share/${project}") # /usr/[local]/share/<project> + set(INSTALL_BIN "bin") # /usr/[local]/bin + set(INSTALL_SHARED "lib") # /usr/[local]/lib + set(INSTALL_LIB "lib") # /usr/[local]/lib + set(INSTALL_INCLUDE "include") # /usr/[local]/include +- set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/<project> +- set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications ++ set(INSTALL_DOC "share/${project}/doc") # /usr/[local]/share/doc/<project> ++ set(INSTALL_SHORTCUTS "share/${project}/applications") # /usr/[local]/share/applications + set(INSTALL_ICONS "share/pixmaps") # /usr/[local]/share/pixmaps + set(INSTALL_INIT "etc/init") # /etc/init (upstart init scripts) + else() +diff --git a/source/glbinding-aux/CMakeLists.txt b/source/glbinding-aux/CMakeLists.txt +index 61cc166..cb0758a 100644 +--- a/source/glbinding-aux/CMakeLists.txt ++++ b/source/glbinding-aux/CMakeLists.txt +@@ -137,7 +137,7 @@ add_library(${target} + add_library(${META_PROJECT_NAME}::${target} ALIAS ${target}) + + # Export library for downstream projects +-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake) ++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake) + + # Create API export header + generate_export_header(${target} +diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt +index bca68d1..f014494 100644 +--- a/source/glbinding/CMakeLists.txt ++++ b/source/glbinding/CMakeLists.txt +@@ -172,7 +172,7 @@ add_library(${target} + add_library(${META_PROJECT_NAME}::${target} ALIAS ${target}) + + # Export library for downstream projects +-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake) ++export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake) + + # Create API export header + generate_export_header(${target} diff --git a/ports/glbinding/0004_fix-config-expected-paths.patch b/ports/glbinding/0004_fix-config-expected-paths.patch new file mode 100644 index 000000000..e6fb16440 --- /dev/null +++ b/ports/glbinding/0004_fix-config-expected-paths.patch @@ -0,0 +1,35 @@ +diff --git a/glbinding-config.cmake b/glbinding-config.cmake +index 03fc505..01b6cc8 100644 +--- a/glbinding-config.cmake ++++ b/glbinding-config.cmake +@@ -1,7 +1,7 @@ + + # This config script tries to locate the project either in its source tree + # or from an install location. +-# ++# + # Please adjust the list of submodules to search for. + + +@@ -35,20 +35,11 @@ endmacro() + + # Try install location + set(MODULE_FOUND FALSE) +-find_modules("cmake") ++find_modules(".") + + if(MODULE_FOUND) + return() + endif() + +-# Try common build locations +-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") +- find_modules("build-debug/cmake") +- find_modules("build/cmake") +-else() +- find_modules("build/cmake") +- find_modules("build-debug/cmake") +-endif() +- + # Signal success/failure to CMake + set(glbinding_FOUND ${MODULE_FOUND}) diff --git a/ports/glbinding/CONTROL b/ports/glbinding/CONTROL index f63cec773..016283ca9 100644 --- a/ports/glbinding/CONTROL +++ b/ports/glbinding/CONTROL @@ -1,3 +1,5 @@ Source: glbinding -Version: 3.0.2-5 +Version: 3.1.0-1 Description: glbinding is an MIT licensed, cross-platform C++ binding for the OpenGL API +Homepage: https://github.com/cginternals/glbinding +Build-Depends: egl-registry diff --git a/ports/glbinding/portfile.cmake b/ports/glbinding/portfile.cmake index e645e5021..d9fb5c0b2 100644 --- a/ports/glbinding/portfile.cmake +++ b/ports/glbinding/portfile.cmake @@ -2,10 +2,14 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cginternals/glbinding - REF d7a1873ad741fb13a9c6dcbae93d0cda45a11933 - SHA512 70848d8ddad3e2ddfc54549ed3cdde569991858135140b30b50fa6e92c5aec6e3dd235418e091456f9b68da2fad09fbef117dedac7b48c26bcab62b6f0fa791f + REF v3.1.0 + SHA512 d7294c9a0dc47a7c107b134e5dfa78c5812fc6bf739b9fd778fa7ce946d5ea971839a65c3985e0915fd75311e4a85fb221d33a71856c460199eab0e7622f7151 HEAD_REF master - PATCHES force-system-install.patch + PATCHES + 0001_force-system-install.patch + 0002_fix-uwpmacro.patch + 0003_fix-cmake-configs-paths.patch + 0004_fix-config-expected-paths.patch ) vcpkg_configure_cmake( @@ -14,24 +18,21 @@ vcpkg_configure_cmake( -DOPTION_BUILD_TESTS=OFF -DOPTION_BUILD_GPU_TESTS=OFF -DOPTION_BUILD_TOOLS=OFF + -DOPTION_BUILD_EXAMPLES=OFF -DGIT_REV=0 -DCMAKE_DISABLE_FIND_PACKAGE_cpplocate=ON + -DOPTION_BUILD_EXAMPLES=OFF ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding) +vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/glbinding/cmake) - -# _IMPORT_PREFIX needs to go up one extra level in the directory tree. -# These files should be modified. -# /share/glbinding/glbinding-export.cmake -# /share/glbinding-aux/glbinding-aux-export.cmake +## _IMPORT_PREFIX needs to go up one extra level in the directory tree. file(GLOB_RECURSE TARGET_CMAKES "${CURRENT_PACKAGES_DIR}/*-export.cmake") foreach(TARGET_CMAKE IN LISTS TARGET_CMAKES) file(READ ${TARGET_CMAKE} _contents) - string(REPLACE + string(REPLACE [[ get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) @@ -47,10 +48,11 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) file(WRITE ${TARGET_CMAKE} "${_contents}") endforeach() -file(WRITE ${CURRENT_PACKAGES_DIR}/share/glbinding/glbinding-config.cmake "include(\${CMAKE_CURRENT_LIST_DIR}/glbinding/glbinding-export.cmake)\ninclude(\${CMAKE_CURRENT_LIST_DIR}/glbinding-aux/glbinding-aux-export.cmake)\nset(glbinding_FOUND TRUE)\n") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Remove files already published by egl-registry +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR) # Handle copyright file(RENAME ${CURRENT_PACKAGES_DIR}/share/glbinding/LICENSE ${CURRENT_PACKAGES_DIR}/share/glbinding/copyright) - -vcpkg_copy_pdbs() diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 54b2d09df..8d336de5a 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,3 +1,4 @@ -Source: glew
-Version: 2.1.0-3
-Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.
+Source: glew +Version: 2.1.0-4 +Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. +Homepage: https://github.com/nigels-com/glew diff --git a/ports/glew/fix-LNK2019.patch b/ports/glew/fix-LNK2019.patch new file mode 100644 index 000000000..d45e61a88 --- /dev/null +++ b/ports/glew/fix-LNK2019.patch @@ -0,0 +1,13 @@ +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
+index 5081e0f..f76725a 100644
+--- a/build/cmake/CMakeLists.txt
++++ b/build/cmake/CMakeLists.txt
+@@ -108,7 +108,7 @@ if (MSVC)
+ target_compile_options (glew PRIVATE -GS-)
+ target_compile_options (glew_s PRIVATE -GS-)
+ # remove stdlib dependency
+- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
++ # target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry)
+ string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+ elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang")))
+ # remove stdlib dependency on windows with GCC and Clang (for similar reasons
diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 9b982db7f..2637b2091 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,6 +1,6 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew/glew-2.1.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glew-58abdfb190) # Don't change to vcpkg_from_github! The github-auto-generated archives are missing some files. # More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 @@ -9,7 +9,12 @@ vcpkg_download_distfile(ARCHIVE_FILE FILENAME "glew-2.1.0.tgz" SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab ) -vcpkg_extract_source_archive(${ARCHIVE_FILE} ${CURRENT_BUILDTREES_DIR}/src/glew) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH ${SOURCE_PATH} + ARCHIVE ${ARCHIVE_FILE} + REF glew + PATCHES fix-LNK2019.patch +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/build/cmake @@ -19,8 +24,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glew") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew) set(_targets_cmake_files) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") diff --git a/ports/glfw3/CONTROL b/ports/glfw3/CONTROL index 96a63e080..361820820 100644 --- a/ports/glfw3/CONTROL +++ b/ports/glfw3/CONTROL @@ -1,3 +1,4 @@ Source: glfw3 Version: 3.3 +Homepage: https://github.com/glfw/glfw Description: GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc. diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL index 521a79120..6ba55d18d 100644 --- a/ports/gli/CONTROL +++ b/ports/gli/CONTROL @@ -1,4 +1,5 @@ Source: gli Version: dd17acf Build-Depends: glm -Description: OpenGL Image (GLI) https://gli.g-truc.net +Description: OpenGL Image (GLI) +Homepage: https://gli.g-truc.net diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 49e4e1112..ccc2a77e2 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -330,8 +330,8 @@ install( DESTINATION share/unofficial-glib ) configure_file( - cmake/unofficial-glib-config.in.cmake - cmake/unofficial-glib-config.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/unofficial-glib-config.in.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-glib-config.cmake @ONLY ) install( diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 9197a6037..e589ba426 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,4 +1,5 @@ Source: glib -Version: 2.52.3-14-1 +Version: 2.52.3-14-2 +Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/cmake/unofficial-glib-config.in.cmake b/ports/glib/cmake/unofficial-glib-config.in.cmake index 976e52a9b..ea87ea0b2 100644 --- a/ports/glib/cmake/unofficial-glib-config.in.cmake +++ b/ports/glib/cmake/unofficial-glib-config.in.cmake @@ -1,7 +1,7 @@ -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
- include(CMakeFindDependencyMacro)
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-iconv)
+if(NOT WIN32)
find_dependency(Threads)
- find_dependency(unofficial-iconv)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-glib-targets.cmake")
diff --git a/ports/glibmm/CMakeLists.txt b/ports/glibmm/CMakeLists.txt index 8e7f8f0fe..10839260a 100644 --- a/ports/glibmm/CMakeLists.txt +++ b/ports/glibmm/CMakeLists.txt @@ -40,9 +40,14 @@ if(APPLE) link_libraries(${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY} ${FOUNDATION_LIBRARY})
endif()
-if(BUILD_SHARED_LIBS)
- add_definitions(-DGLIBMM_DLL -DGIOMM_DLL)
-else()
+# 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()
diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL index efef52d3f..4b2b8283f 100644 --- a/ports/glibmm/CONTROL +++ b/ports/glibmm/CONTROL @@ -1,4 +1,5 @@ -Source: glibmm
-Version: 2.52.1-8
-Description: This is glibmm, a C++ API for parts of glib that are useful for C++. See http://www.gtkmm.org.
-Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
+Source: glibmm +Version: 2.52.1-9 +Description: This is glibmm, a C++ API for parts of glib that are useful for C++. +Homepage: https://www.gtkmm.org. +Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp diff --git a/ports/glibmm/fix-define-glibmmconfig.patch b/ports/glibmm/fix-define-glibmmconfig.patch new file mode 100644 index 000000000..90b97d907 --- /dev/null +++ b/ports/glibmm/fix-define-glibmmconfig.patch @@ -0,0 +1,43 @@ +diff --git a/MSVC_Net2013/glibmm/glibmmconfig.h b/MSVC_Net2013/glibmm/glibmmconfig.h +index 61bb83e..7dbe809 100644 +--- a/MSVC_Net2013/glibmm/glibmmconfig.h ++++ b/MSVC_Net2013/glibmm/glibmmconfig.h +@@ -7,12 +7,17 @@ + # if defined(_MSC_VER) + # define GLIBMM_MSC 1 + # define GLIBMM_WIN32 1 +-# define GLIBMM_DLL 1 ++# if !defined(GLIBMM_STATIC_LIB) ++# define GLIBMM_DLL 1 ++# endif + # elif defined(__CYGWIN__) + # define GLIBMM_CONFIGURE 1 + # elif defined(__MINGW32__) + # define GLIBMM_WIN32 1 + # define GLIBMM_CONFIGURE 1 ++# if !defined(GLIBMM_STATIC_LIB) ++# define GLIBMM_DLL 1 ++# endif + # else + /* AIX clR compiler complains about this even though it doesn't get this far */ + # error "Unknown architecture (send me gcc --dumpspecs or equiv)" +@@ -108,6 +113,7 @@ + # define GLIBMM_HAVE_WIDE_STREAM 1 + # define GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS 1 + # define GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32 1 ++# define GLIBMM_HAVE_ALLOWS_STATIC_INLINE_NPOS 1 + # define GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION 1 + # define GLIBMM_CAN_ASSIGN_NON_EXTERN_C_FUNCTIONS_TO_EXTERN_C_CALLBACKS 1 + # define GLIBMM_CAN_USE_NAMESPACES_INSIDE_EXTERNC 1 +@@ -140,11 +146,6 @@ + * it to be defined. Remove after grace period. */ + #define GLIBMM_USING_STD(Symbol) + +-/* Enable DLL-specific stuff only when not building a static library */ +-#if !defined(__CYGWIN__) && defined(__MINGW32__) && !defined(GLIBMM_STATIC_LIB) +-# define GLIBMM_DLL 1 +-#endif +- + #ifdef GLIBMM_DLL + # if defined(GLIBMM_BUILD) && defined(_WINDLL) + /* Do not dllexport as it is handled by gendef on MSVC */ diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 40eee279c..460e32cac 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -1,12 +1,10 @@ -# Glib uses winapi functions not available in WindowsStore, so glibmm also include(vcpkg_common_functions) +# Glib uses winapi functions not available in WindowsStore if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) message(FATAL_ERROR "Error: UWP builds are currently not supported.") endif() -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glibmm-2.52.1) vcpkg_download_distfile(ARCHIVE URLS "http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz" @@ -17,7 +15,9 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/glibmm-api-variant.patch + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/glibmm-api-variant.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-define-glibmmconfig.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/glm/CMakeLists.txt b/ports/glm/CMakeLists.txt new file mode 100644 index 000000000..678604b86 --- /dev/null +++ b/ports/glm/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+
+project(glm LANGUAGES CXX)
+
+include(GNUInstallDirs)
+
+add_library(glm INTERFACE)
+target_include_directories(glm INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+install(
+ TARGETS glm EXPORT glm-config
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/
+)
+
+install(
+ EXPORT glm-config DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glm
+)
+
+install(
+ DIRECTORY ${CMAKE_SOURCE_DIR}/glm
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ FILES_MATCHING PATTERN "*.hpp*" PATTERN "*.inl*" PATTERN "*.h*"
+)
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL index 1cc8a594c..ccf64caa1 100644 --- a/ports/glm/CONTROL +++ b/ports/glm/CONTROL @@ -1,3 +1,4 @@ Source: glm -Version: 0.9.9.5 -Description: OpenGL Mathematics (GLM) https://glm.g-truc.net +Version: 0.9.9.5-3 +Description: OpenGL Mathematics (GLM) +Homepage: https://glm.g-truc.net diff --git a/ports/glm/disable_warnings_as_error.patch b/ports/glm/disable_warnings_as_error.patch deleted file mode 100644 index f87616b1e..000000000 --- a/ports/glm/disable_warnings_as_error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 756673a3..5fbc8906 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -216,7 +216,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - message("GLM: Visual C++ - ${CMAKE_CXX_COMPILER_ID} compiler") - endif() - -- add_compile_options(/W4 /WX) -+ add_compile_options(/W4) - add_compile_options(/wd4309 /wd4324 /wd4389 /wd4127 /wd4267 /wd4146 /wd4201 /wd4464 /wd4514 /wd4701 /wd4820 /wd4365) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - endif() diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index e0400f696..d38589a88 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -8,23 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_warnings_as_error.patch" -) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glm") - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Put the license file where vcpkg expects it file(COPY ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/) diff --git a/ports/globjects/CONTROL b/ports/globjects/CONTROL index b75b256c6..0de66a3b2 100644 --- a/ports/globjects/CONTROL +++ b/ports/globjects/CONTROL @@ -1,5 +1,5 @@ Source: globjects -Maintainer: mattias@mattiascibien.net -Version: 1.1.0-2018-09-19 +Version: 1.1.0-2 Build-Depends: glbinding, glm -Description: C++ library strictly wrapping OpenGL objects. <https://github.com/cginternals/globjects> +Description: C++ library strictly wrapping OpenGL objects. +Homepage: https://github.com/cginternals/globjects diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake index 5019fea0d..524014a8b 100644 --- a/ports/globjects/portfile.cmake +++ b/ports/globjects/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cginternals/globjects - REF fe53c4a386506d3374df12ad6f1f67c4232aa389 - SHA512 62b40675671acf050bfe4836da5b6b6a757185d296a86ad1079cf79e4a149820971ed46fce7379b73707dff368919b63d52044230a7ce75601441fe368d91e63 + REF dc68b09a53ec20683d3b3a12ed8d9cb12602bb9a + SHA512 5145df795a73a8d74e983e143fd57441865f3082860efb89a3aa8c4d64c2eb6f0256a8049ccd5479dd77e53ef6638d9c903b29a8ef2b41a076003d9595912500 HEAD_REF master PATCHES system-install.patch ) @@ -20,7 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects TARGET_PATH share/globjects/cmake/globjects) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/glog/CONTROL b/ports/glog/CONTROL index 19b9a35be..a94938acd 100644 --- a/ports/glog/CONTROL +++ b/ports/glog/CONTROL @@ -1,4 +1,5 @@ Source: glog -Version: 0.4.0 +Version: 0.4.0-1 +Homepage: https://github.com/google/glog Description: C++ implementation of the Google logging module Build-Depends: gflags diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index da6b76f4f..978539217 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -25,7 +25,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glog") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glog) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/glslang/CONTROL b/ports/glslang/CONTROL index 8f6bb6de9..f3a25620c 100644 --- a/ports/glslang/CONTROL +++ b/ports/glslang/CONTROL @@ -1,3 +1,4 @@ Source: glslang Version: 2018-03-02-2 +Homepage: https://github.com/KhronosGroup/glslang Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL index 4c11abf2a..2b1a9842f 100644 --- a/ports/gmime/CONTROL +++ b/ports/gmime/CONTROL @@ -1,4 +1,5 @@ Source: gmime Version: 3.2.3-1 Build-Depends: zlib, glib, libiconv, libidn2 +Homepage: https://developer.gnome.org/gmime/ Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME). diff --git a/ports/gmmlib/CONTROL b/ports/gmmlib/CONTROL index a06044494..ae6f760a9 100644 --- a/ports/gmmlib/CONTROL +++ b/ports/gmmlib/CONTROL @@ -1,3 +1,3 @@ Source: gmmlib -Version: 18.3.pre2-1 +Version: 19.1.2 Description: intel's graphics memory management library diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake index 6ed92151f..d3bf8dbec 100644 --- a/ports/gmmlib/portfile.cmake +++ b/ports/gmmlib/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/gmmlib - REF intel-gmmlib-18.3.pre2 - SHA512 9831f6e6f001ba99d5b4860c68697dfc33535a20aa853716534a18b6e4df6c7b95039fff7ffe6f0303cfeb70db4c53ad26a6fa6a8fb6148fa4080e456bff3859 + REF intel-gmmlib-19.1.2 + SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL index 0f689c9e0..6c1b23391 100644 --- a/ports/google-cloud-cpp/CONTROL +++ b/ports/google-cloud-cpp/CONTROL @@ -1,4 +1,4 @@ Source: google-cloud-cpp
-Version: 0.8.1-1
+Version: 0.10.0
Build-Depends: grpc, curl[ssl], crc32c
Description: C++ Client Libraries for Google Cloud Platform APIs.
diff --git a/ports/google-cloud-cpp/cmake-libcurl-find-config.patch b/ports/google-cloud-cpp/cmake-libcurl-find-config.patch deleted file mode 100644 index 0c1d6dd6f..000000000 --- a/ports/google-cloud-cpp/cmake-libcurl-find-config.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake -index 6ea7ca3e6..3c2db6b28 100644 ---- a/cmake/IncludeCurl.cmake -+++ b/cmake/IncludeCurl.cmake -@@ -34,49 +34,57 @@ set_property(CACHE GOOGLE_CLOUD_CPP_CURL_PROVIDER - if ("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "external") - include(external/curl) - elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package") -- # Search for libcurl, in CMake 3.5 this does not define a target, but it -- # will in 3.12 (see https://cmake.org/cmake/help/git- -- # stage/module/FindCURL.html for details). Until then, define the target -- # ourselves if it is missing. -- find_package(CURL REQUIRED) -- if (NOT TARGET CURL::libcurl) -- add_library(CURL::libcurl UNKNOWN IMPORTED) -- set_property(TARGET CURL::libcurl -- APPEND -- PROPERTY INTERFACE_INCLUDE_DIRECTORIES -- "${CURL_INCLUDE_DIR}") -- set_property(TARGET CURL::libcurl -- APPEND -- PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") -- endif () -- # If the library is static, we need to explicitly link its dependencies. -- # However, we should not do so for shared libraries, because the version of -- # OpenSSL (for example) found by find_package() may be newer than the -- # version linked against libcurl. -- if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$") -- find_package(OpenSSL REQUIRED) -- find_package(ZLIB REQUIRED) -- set_property(TARGET CURL::libcurl -- APPEND -- PROPERTY INTERFACE_LINK_LIBRARIES -- OpenSSL::SSL -- OpenSSL::Crypto -- ZLIB::ZLIB) -- message(STATUS "CURL linkage will be static") -- if (WIN32) -+ # Search for libcurl, first using CONFIG mode, and retrying -+ # using MODULE mode if that fails -+ find_package(CURL CONFIG QUIET) # Deliberately quiet, so we can handle the result -+ if(CURL_FOUND) -+ message(STATUS "CURL library found via CONFIG mode") -+ else() -+ # CONFIG mode failed - fallback to MODULE mode -+ # In CMake 3.5 this does not define a target, but it -+ # will in 3.12 (see https://cmake.org/cmake/help/git- -+ # stage/module/FindCURL.html for details). Until then, define the target -+ # ourselves if it is missing. -+ find_package(CURL MODULE REQUIRED) # Use REQUIRED the second time to fail out -+ if (NOT TARGET CURL::libcurl) -+ add_library(CURL::libcurl UNKNOWN IMPORTED) - set_property(TARGET CURL::libcurl - APPEND -- PROPERTY INTERFACE_LINK_LIBRARIES -- crypt32 -- wsock32 -- ws2_32) -+ PROPERTY INTERFACE_INCLUDE_DIRECTORIES -+ "${CURL_INCLUDE_DIR}") -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") - endif () -- if (APPLE) -+ # If the library is static, we need to explicitly link its dependencies. -+ # However, we should not do so for shared libraries, because the version of -+ # OpenSSL (for example) found by find_package() may be newer than the -+ # version linked against libcurl. -+ if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$") -+ find_package(OpenSSL REQUIRED) -+ find_package(ZLIB REQUIRED) - set_property(TARGET CURL::libcurl - APPEND -- PROPERTY INTERFACE_LINK_LIBRARIES ldap) -+ PROPERTY INTERFACE_LINK_LIBRARIES -+ OpenSSL::SSL -+ OpenSSL::Crypto -+ ZLIB::ZLIB) -+ message(STATUS "CURL linkage will be static") -+ if (WIN32) -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY INTERFACE_LINK_LIBRARIES -+ crypt32 -+ wsock32 -+ ws2_32) -+ endif () -+ if (APPLE) -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY INTERFACE_LINK_LIBRARIES ldap) -+ endif () -+ else() -+ message(STATUS "CURL linkage will be non-static") - endif () -- else() -- message(STATUS "CURL linkage will be non-static") - endif () - endif () -diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in -index a4d261815..640089e09 100644 ---- a/google/cloud/storage/config.cmake.in -+++ b/google/cloud/storage/config.cmake.in -@@ -13,21 +13,25 @@ - # limitations under the License. - - include(CMakeFindDependencyMacro) --find_dependency(CURL) -+# Search for libcurl, first using CONFIG mode, and retrying -+# using MODULE mode if that fails -+find_package(CURL CONFIG QUIET) # find_package so we can explicitly specify QUIET -+if(NOT CURL_FOUND) -+ find_dependency(CURL MODULE) -+ # Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves. -+ if (NOT TARGET CURL::libcurl) -+ add_library(CURL::libcurl UNKNOWN IMPORTED) -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}") -+ set_property(TARGET CURL::libcurl -+ APPEND -+ PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") -+ endif () -+endif() - find_dependency(Crc32c) - find_dependency(google_cloud_cpp_common) - find_dependency(OpenSSL) - find_dependency(ZLIB) - --# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves. --if (NOT TARGET CURL::libcurl) -- add_library(CURL::libcurl UNKNOWN IMPORTED) -- set_property(TARGET CURL::libcurl -- APPEND -- PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}") -- set_property(TARGET CURL::libcurl -- APPEND -- PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") --endif () -- - include("${CMAKE_CURRENT_LIST_DIR}/storage-targets.cmake") diff --git a/ports/google-cloud-cpp/cmake-libcurl-target.patch b/ports/google-cloud-cpp/cmake-libcurl-target.patch deleted file mode 100644 index 97e66e69f..000000000 --- a/ports/google-cloud-cpp/cmake-libcurl-target.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff --git a/cmake/IncludeCurl.cmake b/cmake/IncludeCurl.cmake -index d3323e3b8..6ea7ca3e6 100644 ---- a/cmake/IncludeCurl.cmake -+++ b/cmake/IncludeCurl.cmake -@@ -39,13 +39,13 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package") - # stage/module/FindCURL.html for details). Until then, define the target - # ourselves if it is missing. - find_package(CURL REQUIRED) -- if (NOT TARGET CURL::CURL) -- add_library(CURL::CURL UNKNOWN IMPORTED) -- set_property(TARGET CURL::CURL -+ if (NOT TARGET CURL::libcurl) -+ add_library(CURL::libcurl UNKNOWN IMPORTED) -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_INCLUDE_DIRECTORIES - "${CURL_INCLUDE_DIR}") -- set_property(TARGET CURL::CURL -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") - endif () -@@ -56,7 +56,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package") - if ("${CURL_LIBRARY}" MATCHES "${CMAKE_STATIC_LIBRARY_SUFFIX}$") - find_package(OpenSSL REQUIRED) - find_package(ZLIB REQUIRED) -- set_property(TARGET CURL::CURL -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_LINK_LIBRARIES - OpenSSL::SSL -@@ -64,7 +64,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package") - ZLIB::ZLIB) - message(STATUS "CURL linkage will be static") - if (WIN32) -- set_property(TARGET CURL::CURL -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_LINK_LIBRARIES - crypt32 -@@ -72,7 +72,7 @@ elseif("${GOOGLE_CLOUD_CPP_CURL_PROVIDER}" STREQUAL "package") - ws2_32) - endif () - if (APPLE) -- set_property(TARGET CURL::CURL -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_LINK_LIBRARIES ldap) - endif () -diff --git a/cmake/external/curl.cmake b/cmake/external/curl.cmake -index 54753ada9..2a83e19df 100644 ---- a/cmake/external/curl.cmake -+++ b/cmake/external/curl.cmake -@@ -88,10 +88,10 @@ if (NOT TARGET curl_project) - endif () - - include(ExternalProjectHelper) -- add_library(CURL::CURL INTERFACE IMPORTED) -- add_dependencies(CURL::CURL curl_project) -- set_library_properties_for_external_project(CURL::CURL curl) -- set_property(TARGET CURL::CURL -+ add_library(CURL::libcurl INTERFACE IMPORTED) -+ add_dependencies(CURL::libcurl curl_project) -+ set_library_properties_for_external_project(CURL::libcurl curl) -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_LINK_LIBRARIES - c-ares::cares -@@ -99,7 +99,7 @@ if (NOT TARGET curl_project) - OpenSSL::Crypto - ZLIB::ZLIB) - if (WIN32) -- set_property(TARGET CURL::CURL -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_LINK_LIBRARIES - crypt32 -@@ -107,7 +107,7 @@ if (NOT TARGET curl_project) - ws2_32) - endif () - if (APPLE) -- set_property(TARGET CURL::CURL -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_LINK_LIBRARIES ldap) - endif () -diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt -index 1e750af8a..a0a04caab 100644 ---- a/google/cloud/storage/CMakeLists.txt -+++ b/google/cloud/storage/CMakeLists.txt -@@ -226,7 +226,7 @@ target_link_libraries(storage_client - PUBLIC google_cloud_cpp_common - nlohmann_json - Crc32c::crc32c -- CURL::CURL -+ CURL::libcurl - Threads::Threads - OpenSSL::SSL - OpenSSL::Crypto -@@ -396,7 +396,7 @@ if (BUILD_TESTING) - GTest::gmock_main - GTest::gmock - GTest::gtest -- CURL::CURL -+ CURL::libcurl - storage_common_options - nlohmann_json) - if (MSVC) -diff --git a/google/cloud/storage/config.cmake.in b/google/cloud/storage/config.cmake.in -index 660829ae4..a4d261815 100644 ---- a/google/cloud/storage/config.cmake.in -+++ b/google/cloud/storage/config.cmake.in -@@ -19,13 +19,13 @@ find_dependency(google_cloud_cpp_common) - find_dependency(OpenSSL) - find_dependency(ZLIB) - --# Some versions of FindCURL do not define CURL::CURL, so we define it ourselves. --if (NOT TARGET CURL::CURL) -- add_library(CURL::CURL UNKNOWN IMPORTED) -- set_property(TARGET CURL::CURL -+# Some versions of FindCURL do not define CURL::libcurl, so we define it ourselves. -+if (NOT TARGET CURL::libcurl) -+ add_library(CURL::libcurl UNKNOWN IMPORTED) -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}") -- set_property(TARGET CURL::CURL -+ set_property(TARGET CURL::libcurl - APPEND - PROPERTY IMPORTED_LOCATION "${CURL_LIBRARY}") - endif () -diff --git a/google/cloud/storage/tests/CMakeLists.txt b/google/cloud/storage/tests/CMakeLists.txt -index 9e5fb663d..987958396 100644 ---- a/google/cloud/storage/tests/CMakeLists.txt -+++ b/google/cloud/storage/tests/CMakeLists.txt -@@ -50,7 +50,7 @@ foreach (fname ${storage_client_integration_tests}) - GTest::gmock_main - GTest::gmock - GTest::gtest -- CURL::CURL -+ CURL::libcurl - Threads::Threads - nlohmann_json - storage_common_options) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 91dd7b83c..84c5c0240 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,13 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO GoogleCloudPlatform/google-cloud-cpp - REF v0.8.1 - SHA512 d81e05703b77109cace4460f8053cf4524d8372ee9185b3ba7d8713ca40e9fd16735b4e46cd8526bf61b8af9a4bdf9eb854505a25d02289227cf216660b12713 + REPO googleapis/google-cloud-cpp + REF v0.10.0 + SHA512 9a1774dcc39d1626c8a9cf8630fe3b3110df7e21e452c7b137e1911d10b304997571aadff5fc0216715729db4a29621066a5236a0b2cb027bba4ce3c56492fb3 HEAD_REF master - PATCHES - cmake-libcurl-target.patch # Should not be needed for v0.9.0+ / once googleapis/google-cloud-cpp@3284e34 is included - cmake-libcurl-find-config.patch ) vcpkg_configure_cmake( diff --git a/ports/graphicsmagick/CMakeLists.txt b/ports/graphicsmagick/CMakeLists.txt index c156b69c7..cf375e96d 100644 --- a/ports/graphicsmagick/CMakeLists.txt +++ b/ports/graphicsmagick/CMakeLists.txt @@ -2,20 +2,20 @@ cmake_minimum_required (VERSION 3.6) project (graphicsmagick) find_package(ZLIB REQUIRED) -find_package(Bzip2 REQUIRED) +find_package(BZip2 REQUIRED) find_package(JPEG REQUIRED) find_package(PNG REQUIRED) find_package(TIFF REQUIRED) find_package(Freetype REQUIRED) -add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION -D_VISUALC_) +add_definitions(-D_MAGICKLIB_ -D_WANDLIB_ -DMAGICK_IMPLEMENTATION) if (BUILD_SHARED_LIBS) add_definitions(-D_DLL -DDLL) endif () if (MSVC) - add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) + add_definitions( -D_VISUALC_ -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) endif () if (WIN32) @@ -28,6 +28,7 @@ include_directories("magick") include_directories("Magick++") include_directories("Magick++/lib") include_directories("wand") +include_directories("jbig/libjbig") file(READ "magick/magick_config.h.in" CONFIG_H) string(REPLACE "#undef HasBZLIB" "#define HasBZLIB" CONFIG_H "${CONFIG_H}") @@ -35,11 +36,21 @@ string(REPLACE "#undef HasJPEG" "#define HasJPEG" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HasPNG" "#define HasPNG" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HasTIFF" "#define HasTIFF" CONFIG_H "${CONFIG_H}") string(REPLACE "#undef HasTTF" "#define HasTTF" CONFIG_H "${CONFIG_H}") -string(REPLACE "#undef HasWINGDI32" "#define HasWINGDI32" CONFIG_H "${CONFIG_H}") +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 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}") +if (WIN32) +string(REPLACE "#undef HasWINGDI32" "#define HasWINGDI32" CONFIG_H "${CONFIG_H}") +else () +string(REPLACE "#undef HAVE_VSNPRINTF" "#define HAVE_VSNPRINTF" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef MagickLibSubdir" "#define MagickLibSubdir \"magick\"" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef MagickLibConfigSubDir" "#define MagickLibConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}") +string(REPLACE "#undef MagickShareConfigSubDir" "#define MagickShareConfigSubDir \"magick/config\"" CONFIG_H "${CONFIG_H}") +endif () file(WRITE "magick/magick_config.h" "${CONFIG_H}") file(READ "magick/magick_config_api.h.in" CONFIG_API_H) @@ -48,7 +59,7 @@ string(REPLACE "#undef size_t" "/* #undef size_t */" CONFIG_API_H "${CONFIG_API_ file(WRITE "magick/magick_config_api.h" "${CONFIG_API_H}") add_library(graphicsmagick coders/art.c coders/avs.c - coders/bmp.c coders/cals.c coders/caption.c + coders/bmp.c coders/braille.c coders/cals.c coders/caption.c coders/cineon.c coders/clipboard.c coders/cmyk.c coders/cut.c coders/dcm.c coders/dcraw.c coders/dib.c coders/dps.c coders/dpx.c coders/emf.c coders/ept.c @@ -99,7 +110,8 @@ add_library(graphicsmagick coders/art.c coders/avs.c Magick++/lib/ImageRef.cpp Magick++/lib/Montage.cpp Magick++/lib/Options.cpp Magick++/lib/Pixels.cpp Magick++/lib/STL.cpp Magick++/lib/Thread.cpp Magick++/lib/TypeMetric.cpp - wand/drawing_wand.c wand/magick_compat.c wand/magick_wand.c wand/pixel_wand.c) + wand/drawing_wand.c wand/magick_compat.c wand/magick_wand.c wand/pixel_wand.c + jbig/libjbig/jbig.c jbig/libjbig/jbig_tab.c) TARGET_LINK_LIBRARIES(graphicsmagick PRIVATE ZLIB::ZLIB @@ -149,7 +161,6 @@ option(INSTALL_HEADERS "Install development header files" ON) if (INSTALL_HEADERS) install(FILES magick/alpha_composite.h DESTINATION include/magick) install(FILES magick/analyze.h DESTINATION include/magick) - install(FILES magick/animate.h DESTINATION include/magick) install(FILES magick/api.h DESTINATION include/magick) install(FILES magick/attribute.h DESTINATION include/magick) install(FILES magick/average.h DESTINATION include/magick) @@ -172,7 +183,6 @@ if (INSTALL_HEADERS) install(FILES magick/delegate.h DESTINATION include/magick) install(FILES magick/deprecate.h DESTINATION include/magick) install(FILES magick/describe.h DESTINATION include/magick) - install(FILES magick/display.h DESTINATION include/magick) install(FILES magick/draw.h DESTINATION include/magick) install(FILES magick/effect.h DESTINATION include/magick) install(FILES magick/enhance.h DESTINATION include/magick) @@ -197,6 +207,7 @@ if (INSTALL_HEADERS) install(FILES magick/map.h DESTINATION include/magick) install(FILES magick/memory.h DESTINATION include/magick) install(FILES magick/module.h DESTINATION include/magick) + install(FILES magick/module_aliases.h DESTINATION include/magick) install(FILES magick/monitor.h DESTINATION include/magick) install(FILES magick/montage.h DESTINATION include/magick) install(FILES magick/nt_base.h DESTINATION include/magick) diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index 7b89a8fd9..631fd52f3 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,5 +1,6 @@ Source: graphicsmagick Maintainer: josuegomes@gmail.com -Version: 1.3.31 +Version: 1.3.32 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff +Homepage: https://sourceforge.net/projects/graphicsmagick/ Description: Image processing library diff --git a/ports/graphicsmagick/magick_types.h b/ports/graphicsmagick/magick_types.h index a27979210..93404cb4e 100644 --- a/ports/graphicsmagick/magick_types.h +++ b/ports/graphicsmagick/magick_types.h @@ -92,33 +92,33 @@ extern "C" { #else /* The following typedefs are subtituted when using Unixish configure */ - typedef @INT8_T@ magick_int8_t; - typedef @UINT8_T@ magick_uint8_t; + typedef signed char magick_int8_t; + typedef unsigned char magick_uint8_t; - typedef @INT16_T@ magick_int16_t; - typedef @UINT16_T@ magick_uint16_t; + typedef signed short magick_int16_t; + typedef unsigned short magick_uint16_t; - typedef @INT32_T@ magick_int32_t; -# define MAGICK_INT32_F @INT32_F@ - typedef @UINT32_T@ magick_uint32_t; -# define MAGICK_UINT32_F @UINT32_F@ + typedef signed int magick_int32_t; +# define MAGICK_INT32_F "" + typedef unsigned int magick_uint32_t; +# define MAGICK_UINT32_F "" - typedef @INT64_T@ magick_int64_t; -# define MAGICK_INT64_F @INT64_F@ - typedef @UINT64_T@ magick_uint64_t; -# define MAGICK_UINT64_F @UINT64_F@ + typedef signed long magick_int64_t; +# define MAGICK_INT64_F "l" + typedef unsigned long magick_uint64_t; +# define MAGICK_UINT64_F "l" - typedef @UINTMAX_T@ magick_uintmax_t; -# define MAGICK_UINTMAX_F @UINTMAX_F@ + typedef unsigned long magick_uintmax_t; +# define MAGICK_UINTMAX_F "l" - typedef @UINTPTR_T@ magick_uintptr_t; -# define MAGICK_UINTPTR_F @UINTPTR_F@ + typedef unsigned long magick_uintptr_t; +# define MAGICK_UINTPTR_F "l" -# define MAGICK_SIZE_T_F @MAGICK_SIZE_T_F@ -# define MAGICK_SIZE_T @MAGICK_SIZE_T@ +# define MAGICK_SIZE_T_F "l" +# define MAGICK_SIZE_T unsigned long -# define MAGICK_SSIZE_T_F @MAGICK_SSIZE_T_F@ -# define MAGICK_SSIZE_T @MAGICK_SSIZE_T@ +# define MAGICK_SSIZE_T_F "l" +# define MAGICK_SSIZE_T signed long #endif diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index 87d03bd1f..b976bfbee 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(GM_VERSION 1.3.31) +set(GM_VERSION 1.3.32) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z" FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" - SHA512 ff67f5e6adf352527264e7a6a76d45ce34470263dc764760d876b9ab5d5078e3a46b9d9cb2e7ab52d53106ffe584d44c66b42f3d4d62c972662d488c86510881 + SHA512 1636f704bac65587d6526a10e7002a6158f951643a4e9eb936b0b734c1eb187155aa4d67febe897f9a2397ecadff736ba84cfe21704348e2d8481af01eff02f6 ) vcpkg_extract_source_archive_ex( diff --git a/ports/graphite2/CONTROL b/ports/graphite2/CONTROL index f73126c5a..faf867a97 100644 --- a/ports/graphite2/CONTROL +++ b/ports/graphite2/CONTROL @@ -1,4 +1,5 @@ Source: graphite2 -Version: 1.3.12 +Version: 1.3.12-1 +Homepage: https://github.com/silnrsi/graphite Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world. - Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
\ No newline at end of file + Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications. diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake index f5292ba83..679d95679 100644 --- a/ports/graphite2/portfile.cmake +++ b/ports/graphite2/portfile.cmake @@ -19,8 +19,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/graphite2) +vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL index 0f6ed481e..128c49498 100644 --- a/ports/graphqlparser/CONTROL +++ b/ports/graphqlparser/CONTROL @@ -1,3 +1,3 @@ Source: graphqlparser
-Version: 0.7.0
+Version: 0.7.0-1
Description: A GraphQL query parser in C++ with C and C++ APIs
diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake index 6e175fe6b..a90959f5d 100644 --- a/ports/graphqlparser/portfile.cmake +++ b/ports/graphqlparser/portfile.cmake @@ -6,15 +6,17 @@ vcpkg_from_github( REF v0.7.0
SHA512 973292b164d0d2cfe453a2f01559dbdb1b9d22b6304f6a3aabf71e2c0a3e24ab69dfd72a086764ad5befecf0005620f8e86f552dacc324f9615a05f31de7cede
HEAD_REF master
- PATCHES win-cmake.patch
+ PATCHES
+ win-cmake.patch
+ static-compile-fix.patch
)
-if(UNIX)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
-elseif(WIN32)
+elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
vcpkg_find_acquire_program(PYTHON2)
vcpkg_find_acquire_program(FLEX) #
vcpkg_find_acquire_program(BISON)
diff --git a/ports/graphqlparser/static-compile-fix.patch b/ports/graphqlparser/static-compile-fix.patch new file mode 100644 index 000000000..3f2756d71 --- /dev/null +++ b/ports/graphqlparser/static-compile-fix.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 56741c2..313308a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,8 +142,11 @@ if (UNIX) + elseif(WIN32)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.lib
+ DESTINATION lib)
++ # do not install pdb when static compilation.
++ if (BUILD_SHARED_LIBS)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/graphqlparser.pdb
+ DESTINATION bin)
++ endif()
+ endif()
+
+ IF (test)
diff --git a/ports/greatest/CONTROL b/ports/greatest/CONTROL new file mode 100644 index 000000000..05c679d8e --- /dev/null +++ b/ports/greatest/CONTROL @@ -0,0 +1,4 @@ +Source: greatest +Version: 1.4.2 +Description: Single-file testing system for C +Homepage: https://github.com/silentbicycle/greatest diff --git a/ports/greatest/portfile.cmake b/ports/greatest/portfile.cmake new file mode 100644 index 000000000..479287ccb --- /dev/null +++ b/ports/greatest/portfile.cmake @@ -0,0 +1,16 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO silentbicycle/greatest + REF v1.4.2 + SHA512 8f2767ac2be017d2ecee3a903ab79834e783df464e3fd0e1e8c4397fdf8dabcc4fb2367163dcb9e944c404d00cf8960ec56c0345f43836182a6e058d9eaf6b0a + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/greatest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/grpc/00001-fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch index 1811fdf92..6f7f2d90f 100644 --- a/ports/grpc/00001-fix-uwp.patch +++ b/ports/grpc/00001-fix-uwp.patch @@ -1,148 +1,148 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1013dc561..b02d07ccba 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,6 +90,9 @@ if(UNIX)
- endif()
- if(WIN32)
- set(_gRPC_PLATFORM_WINDOWS ON)
-+ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+ set(_gRPC_PLATFORM_UWP ON)
-+ endif()
- endif()
-
- set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
-@@ -107,6 +110,9 @@ if (MSVC)
- add_definitions(/wd4267)
- # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later
- add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619)
-+ if(_gRPC_PLATFORM_UWP)
-+ add_definitions(-DGRPC_ARES=0)
-+ endif()
- endif()
-
- if (gRPC_USE_PROTO_LITE)
-@@ -177,6 +183,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR})
- # ``.proto`` files
- #
- function(protobuf_generate_grpc_cpp)
-+ if(_gRPC_PLATFORM_UWP)
-+ return()
-+ endif()
-+
- if(NOT ARGN)
- message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files")
- return()
-@@ -211,6 +221,7 @@ function(protobuf_generate_grpc_cpp)
- endforeach()
- endfunction()
-
-+if(NOT _gRPC_PLATFORM_UWP)
- add_custom_target(plugins
- DEPENDS
- grpc_cpp_plugin
-@@ -240,6 +251,8 @@ add_custom_target(tools_cxx
- add_custom_target(tools
- DEPENDS tools_c tools_cxx)
-
-+endif()
-+
- if (gRPC_BUILD_TESTS)
- add_custom_target(buildtests_c)
- add_dependencies(buildtests_c algorithm_test)
-@@ -3795,7 +3808,6 @@ foreach(_hdr
- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
- )
- endforeach()
--endif (gRPC_BUILD_CODEGEN)
-
-
- if (gRPC_INSTALL)
-@@ -3805,6 +3817,7 @@ if (gRPC_INSTALL)
- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
- )
- endif()
-+endif (gRPC_BUILD_CODEGEN)
-
- if (gRPC_BUILD_TESTS)
-
-@@ -3925,7 +3938,7 @@ foreach(_hdr
- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
- )
- endforeach()
--endif (gRPC_BUILD_CODEGEN)
-+
-
-
- if (gRPC_INSTALL)
-@@ -3935,6 +3948,7 @@ if (gRPC_INSTALL)
- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
- )
- endif()
-+endif (gRPC_BUILD_CODEGEN)
-
- if (gRPC_BUILD_TESTS)
-
-@@ -4926,7 +4940,6 @@ foreach(_hdr
- DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
- )
- endforeach()
--endif (gRPC_BUILD_CODEGEN)
-
-
- if (gRPC_INSTALL)
-@@ -4936,6 +4949,7 @@ if (gRPC_INSTALL)
- ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR}
- )
- endif()
-+endif (gRPC_BUILD_CODEGEN)
-
- if (gRPC_BUILD_TESTS)
-
-diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc
-index 61c366098e..aac2ce0a9f 100644
---- a/src/core/lib/iomgr/resource_quota.cc
-+++ b/src/core/lib/iomgr/resource_quota.cc
-@@ -937,7 +937,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size,
- void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) {
- gpr_mu_lock(&resource_user->mu);
- grpc_resource_quota* resource_quota = resource_user->resource_quota;
-- gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size);
-+ gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast<gpr_atm>(size));
- GPR_ASSERT(prior >= static_cast<long>(size));
- bool was_zero_or_negative = resource_user->free_pool <= 0;
- resource_user->free_pool += static_cast<int64_t>(size);
-diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-index 55efe0e..f538f26 100644
---- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) {
-
- static void init_mu(void) { gpr_mu_init(&g_mu); }
-
-+#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP
-+
- static bool run_powershell() {
- SECURITY_ATTRIBUTES sa;
- sa.nLength = sizeof(sa);
-@@ -97,8 +99,12 @@ static bool run_powershell() {
- CloseHandle(h);
- return true;
- }
-+#endif
-
- bool grpc_alts_is_running_on_gcp() {
-+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
-+ g_is_on_compute_engine = false;
-+#else
- gpr_once_init(&g_once, init_mu);
- gpr_mu_lock(&g_mu);
- if (!g_compute_engine_detection_done) {
-@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() {
- g_compute_engine_detection_done = true;
- }
- gpr_mu_unlock(&g_mu);
-+#endif
- return g_is_on_compute_engine;
- }
-
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ba68c4a13..258a1609f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -90,6 +90,9 @@ if(UNIX) + endif() + if(WIN32) + set(_gRPC_PLATFORM_WINDOWS ON) ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set(_gRPC_PLATFORM_UWP ON) ++ endif() + endif() + + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +@@ -107,6 +110,9 @@ if (MSVC) + add_definitions(/wd4267) + # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later + add_definitions(/wd4987 /wd4774 /wd4819 /wd4996 /wd4619) ++ if(_gRPC_PLATFORM_UWP) ++ add_definitions(-DGRPC_ARES=0) ++ endif() + endif() + + if (gRPC_USE_PROTO_LITE) +@@ -177,6 +183,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + # ``.proto`` files + # + function(protobuf_generate_grpc_cpp) ++ if(_gRPC_PLATFORM_UWP) ++ return() ++ endif() ++ + if(NOT ARGN) + message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") + return() +@@ -218,6 +228,7 @@ function(protobuf_generate_grpc_cpp) + endforeach() + endfunction() + ++if(NOT _gRPC_PLATFORM_UWP) + add_custom_target(plugins + DEPENDS + grpc_cpp_plugin +@@ -247,6 +258,8 @@ add_custom_target(tools_cxx + add_custom_target(tools + DEPENDS tools_c tools_cxx) + ++endif() ++ + if (gRPC_BUILD_TESTS) + add_custom_target(buildtests_c) + add_dependencies(buildtests_c algorithm_test) +@@ -4029,7 +4042,6 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_CODEGEN) + +@@ -4040,6 +4052,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + endif (gRPC_BUILD_CODEGEN) + if (gRPC_BUILD_TESTS) +@@ -4163,7 +4176,7 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) ++ + + if (gRPC_BUILD_CODEGEN) + +@@ -4174,6 +4187,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + endif (gRPC_BUILD_CODEGEN) + if (gRPC_BUILD_TESTS) +@@ -5196,7 +5210,6 @@ foreach(_hdr + DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}" + ) + endforeach() +-endif (gRPC_BUILD_CODEGEN) + + if (gRPC_BUILD_CODEGEN) + +@@ -5207,6 +5220,7 @@ if (gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} + ) + endif() ++endif (gRPC_BUILD_CODEGEN) + + endif (gRPC_BUILD_CODEGEN) + if (gRPC_BUILD_TESTS) +diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc +index dffac348c5..a59becb046 100644 +--- a/src/core/lib/iomgr/resource_quota.cc ++++ b/src/core/lib/iomgr/resource_quota.cc +@@ -940,7 +940,7 @@ void grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, + void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { + gpr_mu_lock(&resource_user->mu); + grpc_resource_quota* resource_quota = resource_user->resource_quota; +- gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size); ++ gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast<gpr_atm>(size)); + GPR_ASSERT(prior >= static_cast<long>(size)); + bool was_zero_or_negative = resource_user->free_pool <= 0; + resource_user->free_pool += static_cast<int64_t>(size); +diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +index 55efe0e9dd..f538f26edf 100644 +--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc ++++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +@@ -60,6 +60,8 @@ bool check_bios_data(const char* bios_data_file) { + + static void init_mu(void) { gpr_mu_init(&g_mu); } + ++#if !defined(WINAPI_FAMILY) || WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP ++ + static bool run_powershell() { + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(sa); +@@ -97,8 +99,12 @@ static bool run_powershell() { + CloseHandle(h); + return true; + } ++#endif + + bool grpc_alts_is_running_on_gcp() { ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++ g_is_on_compute_engine = false; ++#else + gpr_once_init(&g_once, init_mu); + gpr_mu_lock(&g_mu); + if (!g_compute_engine_detection_done) { +@@ -108,6 +114,7 @@ bool grpc_alts_is_running_on_gcp() { + g_compute_engine_detection_done = true; + } + gpr_mu_unlock(&g_mu); ++#endif + return g_is_on_compute_engine; + } + diff --git a/ports/grpc/00002-static-linking-in-linux.patch b/ports/grpc/00002-static-linking-in-linux.patch index 4c004d16b..e8005edaa 100644 --- a/ports/grpc/00002-static-linking-in-linux.patch +++ b/ports/grpc/00002-static-linking-in-linux.patch @@ -6,7 +6,7 @@ index 3839e22..91720a9 100644 add_definitions(-DPB_FIELD_32BIT)
-+if (gRPC_STATIC_LINKING)
++if (gRPC_STATIC_LINKING AND NOT _gRPC_PLATFORM_WINDOWS)
+ # Force to static link
+ set(CMAKE_EXE_LINKER_FLAGS "-Bstatic")
+endif()
diff --git a/ports/grpc/00003-undef-base64-macro.patch b/ports/grpc/00003-undef-base64-macro.patch new file mode 100644 index 000000000..193b1fd38 --- /dev/null +++ b/ports/grpc/00003-undef-base64-macro.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
+index 29c1e56..29de9d8 100644
+--- a/src/core/lib/transport/transport.cc
++++ b/src/core/lib/transport/transport.cc
+@@ -96,6 +96,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int initial_refs,
+ refcount, &refcount->slice_refcount);
+ }
+
++#undef move64
++
+ static void move64(uint64_t* from, uint64_t* to) {
+ *to += *from;
+ *from = 0;
diff --git a/ports/grpc/00004-link-gdi32-on-windows.patch b/ports/grpc/00004-link-gdi32-on-windows.patch new file mode 100644 index 000000000..8aede4656 --- /dev/null +++ b/ports/grpc/00004-link-gdi32-on-windows.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e820737201..3eb4795660 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ elseif(UNIX) + endif() + + if(WIN32 AND MSVC) +- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32) ++ set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 gdi32) + endif() + + # Create directory for generated .proto files diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL index 025227d09..079fd91f6 100644 --- a/ports/grpc/CONTROL +++ b/ports/grpc/CONTROL @@ -1,4 +1,5 @@ Source: grpc -Version: 1.19.1-1 +Version: 1.21.1-1 Build-Depends: zlib, openssl, protobuf, c-ares (!uwp) +Homepage: https://github.com/grpc/grpc Description: An RPC library and framework diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index e11586258..b71a55420 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -1,6 +1,8 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() # This snippet is a workaround for users who are upgrading from an extremely old version of this # port, which cloned directly into `src\` @@ -11,15 +13,17 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.19.1 - SHA512 4bb127d946fc16887fd4cf75215f0bc9f6d17dbd36fc4f1b191a64914f96c49dddb41f1b6c72fd24ea0a40f242b4398248f32fcb1fe9a764367be1c2edda9142 + REF 75475f090875e737ad6909a6057c59577f0c79b1 + SHA512 db9ff82dee38cb0f4ba10874d10bf6cb20c8a4d49e7dd24bcd9f71388c54c782ee12fda6f1bfedd79ad988b0275d3f96df4686217465acfafcfb5e4c30093a5b HEAD_REF master - PATCHES + PATCHES 00001-fix-uwp.patch 00002-static-linking-in-linux.patch + 00003-undef-base64-macro.patch + 00004-link-gdi32-on-windows.patch ) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(gRPC_BUILD_CODEGEN OFF) else() set(gRPC_BUILD_CODEGEN ON) @@ -68,7 +72,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake(ADD_BIN_TO_PATH) -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/grpc") +vcpkg_fixup_cmake_targets() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/grpc RENAME copyright) @@ -90,4 +94,4 @@ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -##
\ No newline at end of file +## diff --git a/ports/gsl-lite/CONTROL b/ports/gsl-lite/CONTROL index dcb7c182c..33149992d 100644 --- a/ports/gsl-lite/CONTROL +++ b/ports/gsl-lite/CONTROL @@ -1,3 +1,4 @@ Source: gsl-lite Version: 0.28.0 +Homepage: https://github.com/martinmoene/gsl-lite Description: A single-file header-only version of ISO C++ Guideline Support Library (GSL) for C++98, C++11 and later diff --git a/ports/gsl/CONTROL b/ports/gsl/CONTROL index f02ecc2ee..af68d6f02 100644 --- a/ports/gsl/CONTROL +++ b/ports/gsl/CONTROL @@ -1,3 +1,4 @@ Source: gsl Version: 2.4-3 +Homepage: https://www.gnu.org/software/gsl/ Description: The GNU Scientific Library is a numerical library for C and C++ programmers diff --git a/ports/gsoap/CONTROL b/ports/gsoap/CONTROL index ae1d1625b..364deb380 100644 --- a/ports/gsoap/CONTROL +++ b/ports/gsoap/CONTROL @@ -1,4 +1,4 @@ Source: gsoap -Version: 2.8.82-2 +Version: 2.8.84-1 Build-Depends: curl 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.
\ No newline at end of file diff --git a/ports/gsoap/portfile.cmake b/ports/gsoap/portfile.cmake index dc7547eb2..79270c7cb 100644 --- a/ports/gsoap/portfile.cmake +++ b/ports/gsoap/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) set(GSOAP_VERSION 2.8) -set(GSOAP_SUB_VERSION .82) +set(GSOAP_SUB_VERSION .84) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gsoap-${GSOAP_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ayera.dl.sourceforge.net/project/gsoap2/gsoap-${GSOAP_VERSION}/gsoap_${GSOAP_VERSION}${GSOAP_SUB_VERSION}.zip" FILENAME "gsoap_${GSOAP_VERSION}${GSOAP_SUB_VERSION}.zip" - SHA512 daf6a1870fe43beb20d0faf646b171c92629885708baabea5bbce79fa5a8030f014dbe5c0bf4024031df993dd3ed3a90449db813946cfdfa9c12318096b57eec + SHA512 ec050119cd3e480b266cad36823f4862fe0ac21045ce901c3c91a552eae2fbf9e1cd515458835807cce54c04df7835a980a299d37f418190cd57684fd6bdcf79 ) vcpkg_extract_source_archive_ex( @@ -26,7 +26,7 @@ endif() # Handle binary files and includes file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/gsoap ${CURRENT_PACKAGES_DIR}/debug/tools) -if (WIN32) +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_build_msbuild( USE_VCPKG_INTEGRATION PROJECT_PATH ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/soapcpp2.sln @@ -39,7 +39,7 @@ if (WIN32) PLATFORM ${BUILD_ARCH} TARGET Build ) - + file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/release/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/wsdl2h/release/wsdl2h.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/gsoap/) file(COPY ${SOURCE_PATH}/gsoap/VisualStudio2005/soapcpp2/debug/soapcpp2.exe DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/gsoap/) @@ -48,7 +48,7 @@ else() message(FATAL_ERROR "Sorry but gsoap only can be build in Windows temporary") endif() - + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) file(COPY ${SOURCE_PATH}/gsoap/stdsoap2.h ${SOURCE_PATH}/gsoap/stdsoap2.c ${SOURCE_PATH}/gsoap/stdsoap2.cpp ${SOURCE_PATH}/gsoap/dom.c ${SOURCE_PATH}/gsoap/dom.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) @@ -62,6 +62,6 @@ file(COPY ${SOURCE_PATH}/gsoap/plugin DESTINATION ${CURRENT_PACKAGES_DIR}/share/ file(COPY ${SOURCE_PATH}/LICENSE.txt ${SOURCE_PATH}/INSTALL.txt ${SOURCE_PATH}/README.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsoap) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/copyright) file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/INSTALL.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/install) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/README.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/readme) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsoap/README.txt ${CURRENT_PACKAGES_DIR}/share/gsoap/readme) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL index 187287cc0..7c91eb253 100644 --- a/ports/gtest/CONTROL +++ b/ports/gtest/CONTROL @@ -1,3 +1,4 @@ Source: gtest Version: 2019-01-04-2 +Homepage: https://github.com/google/googletest Description: GoogleTest and GoogleMock testing frameworks. diff --git a/ports/gtk/CMakeLists.txt b/ports/gtk/CMakeLists.txt index 22e30b1a7..9c265c7e5 100644 --- a/ports/gtk/CMakeLists.txt +++ b/ports/gtk/CMakeLists.txt @@ -12,6 +12,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug) set(CAIRO_LIB_SUFFIX d) endif() +if (WIN32) + # Set utf-8 charset to avoid compile error C2001 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8") +endif() + # find dependencies # glib find_path(GLIB_INCLUDE_DIR glib.h) diff --git a/ports/gtk/CONTROL b/ports/gtk/CONTROL index c470f8ac8..56e660c5c 100644 --- a/ports/gtk/CONTROL +++ b/ports/gtk/CONTROL @@ -1,4 +1,5 @@ Source: gtk -Version: 3.22.19-2 +Version: 3.22.19-3 +Homepage: https://www.gtk.org/ Description: Portable library for creating graphical user interfaces. Build-Depends: glib, atk, gdk-pixbuf, pango, cairo, libepoxy, gettext diff --git a/ports/gtkmm/CONTROL b/ports/gtkmm/CONTROL index 36bcea3f7..6ac1eede2 100644 --- a/ports/gtkmm/CONTROL +++ b/ports/gtkmm/CONTROL @@ -1,4 +1,5 @@ Source: gtkmm Version: 3.22.2-1 +Homepage: https://www.gtkmm.org/ Description: gtkmm is the official C++ interface for the popular GUI library GTK+. Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm diff --git a/ports/gts/CONTROL b/ports/gts/CONTROL index 0aa1251e4..917d66bf8 100644 --- a/ports/gts/CONTROL +++ b/ports/gts/CONTROL @@ -1,4 +1,5 @@ Source: gts
Version: 0.7.6-1
+Homepage: https://github.com/finetjul/gts
Description: A Library intended to provide a set of useful functions to deal with 3D surfaces meshed with interconnected triangles
Build-Depends: glib
diff --git a/ports/guetzli/CONTROL b/ports/guetzli/CONTROL index b68d01320..8fe11f58d 100644 --- a/ports/guetzli/CONTROL +++ b/ports/guetzli/CONTROL @@ -1,4 +1,5 @@ Source: guetzli
-Version: 2018-07-30-1
+Version: 2018-07-30-2
+Homepage: https://github.com/google/guetzli
Description: Perceptual JPEG encoder
Build-Depends: libpng, butteraugli
diff --git a/ports/guetzli/butteraugli.patch b/ports/guetzli/butteraugli.patch new file mode 100644 index 000000000..ac124ca54 --- /dev/null +++ b/ports/guetzli/butteraugli.patch @@ -0,0 +1,13 @@ +diff --git a/guetzli/butteraugli_comparator.cc b/guetzli/butteraugli_comparator.cc
+index 142c203..f4e710d 100644
+--- a/guetzli/butteraugli_comparator.cc
++++ b/guetzli/butteraugli_comparator.cc
+@@ -56,7 +56,7 @@ ButteraugliComparator::ButteraugliComparator(const int width, const int height,
+ height_(height),
+ target_distance_(target_distance),
+ rgb_orig_(*rgb),
+- comparator_(LinearRgb(width_, height_, *rgb)),
++ comparator_(LinearRgb(width_, height_, *rgb), 1.0f),
+ distance_(0.0),
+ stats_(stats) {}
+
diff --git a/ports/guetzli/portfile.cmake b/ports/guetzli/portfile.cmake index 248433e56..5e1041461 100644 --- a/ports/guetzli/portfile.cmake +++ b/ports/guetzli/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF 0b78c7cc8b1b6cbaaf3d08b1facb599bcec1d101 SHA512 54c5198c4c066858dd1377a32e765f46a589f3444bea303b54326453d0e8e71f959d3aaf2c72f4714fd27891f4d93288e7fa96baf1fd10f127929c1fcfa5ae1c HEAD_REF master + PATCHES butteraugli.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/gumbo/CONTROL b/ports/gumbo/CONTROL index 6889b526d..c6741b934 100644 --- a/ports/gumbo/CONTROL +++ b/ports/gumbo/CONTROL @@ -1,3 +1,4 @@ Source: gumbo
Version: 0.10.1-3
+Homepage: https://github.com/google/gumbo-parser
Description: An HTML5 parsing library in pure C99
diff --git a/ports/halide/CONTROL b/ports/halide/CONTROL index 4418e56de..cd7008837 100644 --- a/ports/halide/CONTROL +++ b/ports/halide/CONTROL @@ -1,3 +1,4 @@ Source: halide
Version: release_2018_02_15-1
+Homepage: https://github.com/halide/Halide
Description: Halide is a programming language designed to make it easier to write high-performance image processing code on modern machines.
diff --git a/ports/harfbuzz/0001-fix-cmake-export.patch b/ports/harfbuzz/0001-fix-cmake-export.patch index 0ba0245d0..c3264dfd5 100644 --- a/ports/harfbuzz/0001-fix-cmake-export.patch +++ b/ports/harfbuzz/0001-fix-cmake-export.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 019e205..8a464a5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -795,7 +795,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
- )
- install(EXPORT harfbuzzConfig
- NAMESPACE harfbuzz::
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz
-+ DESTINATION share/harfbuzz
- )
- if (HB_BUILD_UTILS)
- if (WIN32 AND BUILD_SHARED_LIBS)
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 019e205..8a464a5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -795,7 +795,7 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) + ) + install(EXPORT harfbuzzConfig + NAMESPACE harfbuzz:: +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/harfbuzz ++ DESTINATION share/harfbuzz + ) + if (HB_BUILD_UTILS) + if (WIN32 AND BUILD_SHARED_LIBS) diff --git a/ports/harfbuzz/0003-remove-broken-test.patch b/ports/harfbuzz/0003-remove-broken-test.patch index 2e5b78fa7..2a3b234ee 100644 --- a/ports/harfbuzz/0003-remove-broken-test.patch +++ b/ports/harfbuzz/0003-remove-broken-test.patch @@ -1,6 +1,8 @@ +diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc +index 85993d1..3e8e642 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc -@@ -1059,20 +1059,6 @@ +@@ -1059,21 +1059,6 @@ resize_and_retry: buffer->len += num_glyphs; } @@ -14,10 +16,11 @@ - if (false) - { - /* Make sure all runs had the expected direction. */ -- bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); +- HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); - assert (bool (status_and & kCTRunStatusRightToLeft) == backward); - assert (bool (status_or & kCTRunStatusRightToLeft) == backward); - } - +- buffer->clear_positions (); + unsigned int count = buffer->len; diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index 399f13111..39bce8010 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,6 +1,7 @@ Source: harfbuzz -Version: 2.3.1-3 +Version: 2.5.1-1 Description: HarfBuzz OpenType text shaping engine +Homepage: https://github.com/behdad/harfbuzz Build-Depends: freetype, ragel, gettext (osx) Default-Features: ucdn diff --git a/ports/harfbuzz/find-package-freetype-2.patch b/ports/harfbuzz/find-package-freetype-2.patch index 85dbbdeec..608e9c890 100644 --- a/ports/harfbuzz/find-package-freetype-2.patch +++ b/ports/harfbuzz/find-package-freetype-2.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index defd5d6..03f9d4e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -267,7 +267,7 @@ set (subset_project_headers
-
- ## Find and include needed header folders and libraries
- if (HB_HAVE_FREETYPE)
-- include (FindFreetype)
-+ find_package(Freetype REQUIRED)
- if (NOT FREETYPE_FOUND)
- message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix")
- endif ()
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index defd5d6..03f9d4e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -267,7 +267,7 @@ set (subset_project_headers + + ## Find and include needed header folders and libraries + if (HB_HAVE_FREETYPE) +- include (FindFreetype) ++ find_package(Freetype REQUIRED) + if (NOT FREETYPE_FOUND) + message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix") + endif () diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index e1a8199c0..93c1da645 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 2.3.1 - SHA512 c90f8a530bf49e91f5297f6a3c2f4be65f8907e3b41892cd5fbc1353ce7036aae7e182bfd0ea8cb32b0310cbe7284a3de8b6622e08db9736c3f0bba6cb1f9f01 + REF 2.5.1 + SHA512 e8b4b98e65d809579456551e4dd70bdd847d02cbfa80df479f6f544eff2bdbfaa7502f22e5f4e5217f063badc8874f6e568d49e9c40ab752b233fafa9e74aeab HEAD_REF master PATCHES 0001-fix-cmake-export.patch @@ -17,9 +17,11 @@ vcpkg_from_github( ) file(READ ${SOURCE_PATH}/CMakeLists.txt _contents) + if("${_contents}" MATCHES "include \\(FindFreetype\\)") message(FATAL_ERROR "Harfbuzz's cmake must not directly include() FindFreetype.") endif() + if("${_contents}" MATCHES "find_library\\(GLIB_LIBRARIES") message(FATAL_ERROR "Harfbuzz's cmake must not directly find_library() glib.") endif() @@ -68,9 +70,20 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/harfbuzz TARGET_PATH share/harfbuzz) +vcpkg_fixup_cmake_targets() vcpkg_copy_pdbs() +if (HAVE_GLIB) + # Propagate dependency on glib downstream + file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents) + file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(unofficial-glib CONFIG) + +${_contents} +") +endif() + # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz RENAME copyright) diff --git a/ports/hdf5/CONTROL b/ports/hdf5/CONTROL index 6ec2cea9b..18f03e487 100644 --- a/ports/hdf5/CONTROL +++ b/ports/hdf5/CONTROL @@ -1,11 +1,12 @@ -Source: hdf5
-Version: 1.10.5-5
-Description: HDF5 is a data model, library, and file format for storing and managing data
-Build-Depends: zlib, szip
-
-Feature: parallel
-Description: parallel support for HDF5
-Build-Depends: msmpi
-
-Feature: cpp
-Description: Builds cpp lib
+Source: hdf5 +Version: 1.10.5-7 +Homepage: https://www.hdfgroup.org/downloads/hdf5/ +Description: HDF5 is a data model, library, and file format for storing and managing data +Build-Depends: zlib, szip + +Feature: parallel +Description: parallel support for HDF5 +Build-Depends: msmpi + +Feature: cpp +Description: Builds cpp lib diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index cb1541fed..1a148c2c3 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -30,8 +30,7 @@ else() set(ENABLE_CPP OFF) endif() -#Note: HDF5 Builds by default static as well as shared libraries. Set BUILD_SHARED_LIBS to OFF to only get static libraries -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) +file(REMOVE ${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake)#Outdated; does not find debug szip vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -50,12 +49,12 @@ vcpkg_configure_cmake( -DHDF5_INSTALL_CMAKE_DIR=share ) + vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/hdf5) - -#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best +#Linux build create additional scripts here. I dont know what they are doing so I am deleting them and hope for the best if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() diff --git a/ports/hdf5/vcpkg-cmake-wrapper.cmake b/ports/hdf5/vcpkg-cmake-wrapper.cmake index 96d8a53c9..695befcdc 100644 --- a/ports/hdf5/vcpkg-cmake-wrapper.cmake +++ b/ports/hdf5/vcpkg-cmake-wrapper.cmake @@ -6,8 +6,10 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) # The caller hasn't said "CONFIG", so they want the built-in FindHDF5.cmake behavior. Set configurations macros to ensure the built-in script finds us.
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set(HDF5_USE_STATIC_LIBRARIES ON)
+ add_compile_definitions(H5_BUILT_AS_STATIC_LIB)
else()
set(HDF5_USE_STATIC_LIBRARIES OFF)
+ add_compile_definitions(H5_BUILT_AS_DYNAMIC_LIB)
endif()
endif()
cmake_policy(POP)
diff --git a/ports/hedley/CONTROL b/ports/hedley/CONTROL new file mode 100644 index 000000000..08b5e02b1 --- /dev/null +++ b/ports/hedley/CONTROL @@ -0,0 +1,3 @@ +Source: hedley +Version: 2019-05-08-1 +Description: A C/C++ header to help move #ifdefs out of your code diff --git a/ports/hedley/portfile.cmake b/ports/hedley/portfile.cmake new file mode 100644 index 000000000..e06e9630a --- /dev/null +++ b/ports/hedley/portfile.cmake @@ -0,0 +1,19 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nemequ/hedley + REF 1b74d9bc892137b3f006d04ff905098b900116d0 + SHA512 8f3e4fc081fb33cc3a3d637eb09863e80fa94b5e46ecf6507aabe6a5b0648881a96c8cf2ef01b4146ecd3a14908ef87f3204960514af6c91d00c93bea18eda41 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/hedley.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(STRINGS ${SOURCE_PATH}/hedley.h SOURCE_LINES) +# Capture more lines than required to handle future license file changes +list(SUBLIST SOURCE_LINES 0 30 SOURCE_LINES) +list(JOIN SOURCE_LINES "\n" _contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${_contents}") diff --git a/ports/highfive/CONTROL b/ports/highfive/CONTROL index af4df7993..6152bdf3d 100644 --- a/ports/highfive/CONTROL +++ b/ports/highfive/CONTROL @@ -1,4 +1,5 @@ Source: highfive Version: 2.0 +Homepage: https://github.com/BlueBrain/HighFive Description: HighFive is a modern C++/C++11 friendly interface for libhdf5 Build-Depends: hdf5 diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index ed88a45c9..db6f4a012 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -28,7 +28,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/HighFive/CMake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -if(NOT WIN32 AND NOT APPLE) +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() diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index d77e210b6..99cc84d6f 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,5 +1,6 @@ Source: hpx
-Version: 1.2.1-1
-Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
+Version: 1.3.0-1
+Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
+Homepage: https://github.com/STEllAR-GROUP/hpx
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.
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 3e687e50d..80e79bac6 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.2.1 - SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7 + REF 1.3.0 + SHA512 e55ca0c6fe1716b6ee72b0c4a9234a1136455ddc2f5509925395a80442d564b0db251968fef53d202a1f5140e12d0941d0173ab20a7b181632eac20cb925bf31 HEAD_REF master ) diff --git a/ports/http-parser/CONTROL b/ports/http-parser/CONTROL index da02d8dc1..d97927cd2 100644 --- a/ports/http-parser/CONTROL +++ b/ports/http-parser/CONTROL @@ -1,3 +1,4 @@ Source: http-parser
-Version: 2.9.0-1
+Version: 2.9.2-1
+Homepage: https://github.com/nodejs/http-parser
Description: HTTP Parser.
diff --git a/ports/http-parser/portfile.cmake b/ports/http-parser/portfile.cmake index e65980b6e..f3cc67ec1 100644 --- a/ports/http-parser/portfile.cmake +++ b/ports/http-parser/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nodejs/http-parser - REF v2.9.0 - SHA512 40acecbf71b9f0b4ae857c74c3ec0784d7f341a0cb83cf82b308387d0c5b56d38b282241aaf8ca93816970f2a9e67989f3d9d456459f3986c29fe51ab520155e + REF v2.9.2 + SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023 HEAD_REF master ) @@ -21,7 +21,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/unofficial-http-parser" TARGET_PATH "share/unofficial-http-parser") +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-http-parser TARGET_PATH share/unofficial-http-parser) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/http-parser) diff --git a/ports/hunspell/CONTROL b/ports/hunspell/CONTROL index 160bab7e6..d907a5536 100644 --- a/ports/hunspell/CONTROL +++ b/ports/hunspell/CONTROL @@ -1,3 +1,4 @@ Source: hunspell Version: 1.7.0 +Homepage: https://github.com/hunspell/hunspell Description: The most popular spellchecking library. diff --git a/ports/hwloc/CONTROL b/ports/hwloc/CONTROL index e2c820060..f754a0fd8 100644 --- a/ports/hwloc/CONTROL +++ b/ports/hwloc/CONTROL @@ -1,4 +1,5 @@ Source: hwloc Version: 1.11.7-3 +Homepage: https://github.com/open-mpi/hwloc 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. diff --git a/ports/hypre/CONTROL b/ports/hypre/CONTROL index c41f30930..907e64b87 100644 --- a/ports/hypre/CONTROL +++ b/ports/hypre/CONTROL @@ -1,4 +1,5 @@ Source: hypre Version: 2.11.2-1 +Homepage: https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS Build-Depends: msmpi diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL index 171eb1129..238ac176e 100644 --- a/ports/icu/CONTROL +++ b/ports/icu/CONTROL @@ -1,3 +1,4 @@ Source: icu
-Version: 61.1-5
+Version: 61.1-7
+Homepage: http://icu-project.org/apiref/icu4c/
Description: Mature and widely used Unicode and localization library.
diff --git a/ports/icu/fix_parallel_build_on_windows.patch b/ports/icu/fix_parallel_build_on_windows.patch new file mode 100644 index 000000000..b0ea7556c --- /dev/null +++ b/ports/icu/fix_parallel_build_on_windows.patch @@ -0,0 +1,13 @@ +diff --git a/source/data/Makefile.in b/source/data/Makefile.in +index 1140b69..936ef81 100644 +--- a/source/data/Makefile.in ++++ b/source/data/Makefile.in +@@ -514,7 +514,7 @@ build-dir: + # The | is an order-only prerequisite. This helps when the -j option is used, + # and we don't want the files to be built before the directories are built. + ifneq ($(filter order-only,$(.FEATURES)),) +-$(ALL_FILES) $(ALL_INDEX_SRC_FILES): | build-dir ++$(ALL_FILES) $(ALL_INDEX_SRC_FILES) $(SO_VERSION_DATA): | build-dir + endif + + # Now, sections for building each kind of data. diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 2061111e9..9225246f3 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -15,11 +15,13 @@ vcpkg_download_distfile( FILENAME "icu4c-${VERSION2}-src.tgz"
SHA512 4c37691246db802e4bae0c8c5f6ac1dac64c5753b607e539c5c1c36e361fcd9dd81bd1d3b5416c2960153b83700ccdb356412847d0506ab7782ae626ac0ffb94
)
-vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/icu-${VERSION})
-
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch
- ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ PATCHES
+ ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch
+ ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch
+ ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch
)
set(CONFIGURE_OPTIONS "--disable-samples --disable-tests")
@@ -94,8 +96,8 @@ else() message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
- set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
- set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}")
+ set(ENV{CFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
+ set(ENV{CXXFLAGS} "${ICU_RUNTIME} -O2 -Oi -Zi -FS ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_RELEASE}")
set(ENV{LDFLAGS} "-DEBUG -INCREMENTAL:NO -OPT:REF -OPT:ICF")
vcpkg_execute_required_process(
COMMAND ${BASH} --noprofile --norc -c
@@ -110,8 +112,8 @@ else() message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
- set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")
- set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -RTC1 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}")
+ set(ENV{CFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}")
+ set(ENV{CXXFLAGS} "${ICU_RUNTIME}d -Od -Zi -FS -RTC1 ${VCPKG_CXX_FLAGS} ${VCPKG_CXX_FLAGS_DEBUG}")
set(ENV{LDFLAGS} "-DEBUG")
vcpkg_execute_required_process(
COMMAND ${BASH} --noprofile --norc -c
@@ -129,20 +131,32 @@ unset(ENV{LDFLAGS}) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
# Build release
message(STATUS "Package ${TARGET_TRIPLET}-rel")
- vcpkg_execute_required_process(
- COMMAND ${BASH} --noprofile --norc -c "make && make install"
+ vcpkg_execute_build_process(
+ COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}"
+ NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make"
+ WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
+ LOGNAME "make-build-${TARGET_TRIPLET}-rel")
+
+ vcpkg_execute_build_process(
+ COMMAND ${BASH} --noprofile --norc -c "make install"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
- LOGNAME "build-${TARGET_TRIPLET}-rel")
+ LOGNAME "make-install-${TARGET_TRIPLET}-rel")
message(STATUS "Package ${TARGET_TRIPLET}-rel done")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
# Build debug
message(STATUS "Package ${TARGET_TRIPLET}-dbg")
- vcpkg_execute_required_process(
- COMMAND ${BASH} --noprofile --norc -c "make && make install"
+ vcpkg_execute_build_process(
+ COMMAND ${BASH} --noprofile --norc -c "make -j ${VCPKG_CONCURRENCY}"
+ NO_PARALLEL_COMMAND ${BASH} --noprofile --norc -c "make"
+ WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
+ LOGNAME "make-build-${TARGET_TRIPLET}-dbg")
+
+ vcpkg_execute_build_process(
+ COMMAND ${BASH} --noprofile --norc -c "make install"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
- LOGNAME "build-${TARGET_TRIPLET}-dbg")
+ LOGNAME "make-install-${TARGET_TRIPLET}-dbg")
message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
endif()
diff --git a/ports/idevicerestore/CONTROL b/ports/idevicerestore/CONTROL index dc781eb5c..36c31d97c 100644 --- a/ports/idevicerestore/CONTROL +++ b/ports/idevicerestore/CONTROL @@ -1,4 +1,4 @@ Source: idevicerestore
-Version: 1.0.12-1
+Version: 1.0.12-2
Description: Restore/upgrade firmware of iOS devices
Build-Depends: libimobiledevice, curl, libirecovery, libzip
\ No newline at end of file diff --git a/ports/idevicerestore/libcurl_d.patch b/ports/idevicerestore/libcurl_d.patch new file mode 100644 index 000000000..1d9d3f3d7 --- /dev/null +++ b/ports/idevicerestore/libcurl_d.patch @@ -0,0 +1,23 @@ +diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj +index fa209fae..cf89306b 100644 +--- a/idevicerestore.vcxproj ++++ b/idevicerestore.vcxproj +@@ -94,7 +94,7 @@ + <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> + </ClCompile> + <Link> +- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> +@@ -105,7 +105,7 @@ + <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> + </ClCompile> + <Link> +- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + diff --git a/ports/idevicerestore/libcurl_imp.patch b/ports/idevicerestore/libcurl_imp.patch new file mode 100644 index 000000000..f93dfb2b5 --- /dev/null +++ b/ports/idevicerestore/libcurl_imp.patch @@ -0,0 +1,40 @@ +diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj +index fa209fae..cf89306b 100644 +--- a/idevicerestore.vcxproj ++++ b/idevicerestore.vcxproj +@@ -94,7 +94,7 @@ + <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> + </ClCompile> + <Link> +- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d_imp.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> +@@ -105,7 +105,7 @@ + <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS</PreprocessorDefinitions> + </ClCompile> + <Link> +- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl-d_imp.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> +@@ -120,7 +120,7 @@ + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> +- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> +@@ -135,7 +135,7 @@ + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> +- <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake index e0f9a0888..271c249c6 100644 --- a/ports/idevicerestore/portfile.cmake +++ b/ports/idevicerestore/portfile.cmake @@ -8,6 +8,18 @@ vcpkg_from_github( HEAD_REF msvc-master
)
+if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
+ vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES
+ libcurl_imp.patch)
+else()
+ vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES
+ libcurl_d.patch)
+endif()
+
vcpkg_install_msbuild(
SOURCE_PATH ${SOURCE_PATH}
PROJECT_SUBPATH idevicerestore.vcxproj
diff --git a/ports/if97/CONTROL b/ports/if97/CONTROL index 7e5bb74fb..787bc1182 100644 --- a/ports/if97/CONTROL +++ b/ports/if97/CONTROL @@ -1,3 +1,4 @@ Source: if97 -Version: 2.1.0 +Version: 2.1.2 +Homepage: https://github.com/CoolProp/IF97 Description: This repository implements the IF97 formulation for the properties of pure water substance. diff --git a/ports/if97/portfile.cmake b/ports/if97/portfile.cmake index 4f8d28e82..c07d11e5c 100644 --- a/ports/if97/portfile.cmake +++ b/ports/if97/portfile.cmake @@ -1,11 +1,10 @@ include(vcpkg_common_functions) -set(PORT_VERSION 2.1.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CoolProp/IF97 - REF v${PORT_VERSION} - SHA512 f8cde0538af395d8d82998bd71f28d89cd5c6fcfdf16410b0630a0f8b59ec86ff8a748b05681e65cbece051db5be6b960b6ea4fc8bce83b4309f46896083164a + REF v2.1.2 + SHA512 a7625fcc1ca0763df5b4cf5be741babbaefc09022940b4fc5ee1c05121751282c18ebd87ae58e1eee9bdb46dab5ae6fb4ed9a31fc2c53dc6de5cbd243fa4c8e9 HEAD_REF master ) diff --git a/ports/imgui/CONTROL b/ports/imgui/CONTROL index 6d143cb48..6de881a9a 100644 --- a/ports/imgui/CONTROL +++ b/ports/imgui/CONTROL @@ -1,3 +1,4 @@ Source: imgui -Version: 1.69-1 +Version: 1.70-1 +Homepage: https://github.com/ocornut/imgui Description: Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies. diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 8365f1902..2acebc0c8 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.69 - SHA512 6d65bc513ce30c77f7714c852cc1fd56295d212a7adc61cd81f48551bb5b88000dbc193fb9a167fb9819ed99a6b05a7001f82dbc727fdb438ca82dafc1c688d9 + REF v1.70 + SHA512 b1a0fba339a9b19a49316494e58eabacd250e85e8ee17552c03ed99f50886072c882979039f18139e504c4406cf31aea3e9ce391d4641318f0022fa9b51bb9c4 HEAD_REF master ) @@ -21,6 +21,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/imgui) +vcpkg_fixup_cmake_targets() configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/imgui/copyright COPYONLY) diff --git a/ports/immer/CONTROL b/ports/immer/CONTROL new file mode 100644 index 000000000..f6f736b59 --- /dev/null +++ b/ports/immer/CONTROL @@ -0,0 +1,3 @@ +Source: immer
+Version: 2019-06-07
+Description: Postmodern immutable and persistent data structures for C++
diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake new file mode 100644 index 000000000..da2a40bad --- /dev/null +++ b/ports/immer/portfile.cmake @@ -0,0 +1,29 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO arximboldi/immer
+ REF fe1d5151f8e62a97a953664f8de39b05ac0d2031
+ SHA512 2f78c2d85a24b2bcb69bbbf8b038c8bacb5a841e0f0ce7e4e521d369423c7d44f803a1c766a77d0955246a1b22476de15fa708a3786f05c41a3b705a574bbb71
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DENABLE_PYTHON=OFF
+ -DENABLE_GUILE=OFF
+ -DENABLE_BOOST_COROUTINE=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Immer)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/inih/CONTROL b/ports/inih/CONTROL index a93e47dd2..22c519e21 100644 --- a/ports/inih/CONTROL +++ b/ports/inih/CONTROL @@ -1,3 +1,3 @@ Source: inih
-Version: 42-1
+Version: 44 Description: Simple .INI file parser
diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake index 549c7fbe4..a0a34d77f 100644 --- a/ports/inih/portfile.cmake +++ b/ports/inih/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO benhoyt/inih - REF r42 - SHA512 bb414bf03e2055f47149d69bd373923cc663f5e044cd021fd34ac646effc485db8cedb128123aaac7e2abc16c98bee98f34d89108a4bab9af50b8cd05eb7af8d + REF b1dbff4b0bd1e1f40d237e21011f6dee0ec2fa69 + SHA512 b250a7d2a9a1a18793a5f7421d444cbf92c21f1aca5f767781221e2e64b0ba5e0804e82c3f8e4f2c0e08516f4ddbf1533e4d254c557bfb38d9a0da879b98cffb HEAD_REF master ) diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL index 7e36cb5d9..2376ce6de 100644 --- a/ports/io2d/CONTROL +++ b/ports/io2d/CONTROL @@ -1,4 +1,4 @@ Source: io2d -Version: 0.1-1 +Version: 0.1-2 Description: a lightweight, cross platform drawing library -Build-Depends: cairo, graphicsmagick +Build-Depends: cairo (!osx), graphicsmagick (!osx) diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake index c1d536d57..3411620f5 100644 --- a/ports/io2d/portfile.cmake +++ b/ports/io2d/portfile.cmake @@ -5,25 +5,20 @@ include(vcpkg_common_functions) # For now, io2d is always a static library. vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -# Optionally, uncomment and modify one of the 'set(...)' calls below -# to use io2d sources from a local directory, rather than Github. -# set(SOURCE_PATH "C:\\Path\\To\\P0267_RefImpl\\") -# set(SOURCE_PATH "/Path/To/P0267_RefImpl") - -# Retrieve and validate io2d source code, as-needed -if ("${SOURCE_PATH}" STREQUAL "") - # TODO: point at cpp-io2d/(whatever), if and as needed - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO cpp-io2d/P0267_RefImpl - REF 21ae92c8be6916034e6e18f08aa57899a975dfb0 - SHA512 5b674f98ca7705d6901af339a4189d5ce4f2c3118bfb99430734f355159602f177bc8d1b345c3a2f17947a62547553f7b91747a1f16da063707a4da7f990391d - HEAD_REF master - PATCHES find-package.patch - ) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-io2d/P0267_RefImpl + REF 21ae92c8be6916034e6e18f08aa57899a975dfb0 + SHA512 5b674f98ca7705d6901af339a4189d5ce4f2c3118bfb99430734f355159602f177bc8d1b345c3a2f17947a62547553f7b91747a1f16da063707a4da7f990391d + HEAD_REF master + PATCHES find-package.patch +) # Configure the library, using CMake +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(IO2D_DEFAULT_OPTION "-DIO2D_DEFAULT=COREGRAPHICS_MAC") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -31,6 +26,7 @@ vcpkg_configure_cmake( -DIO2D_WITHOUT_SAMPLES=1 -DIO2D_WITHOUT_TESTS=1 -DCMAKE_INSTALL_INCLUDEDIR:STRING=include + ${IO2D_DEFAULT_OPTION} ) # Build + install the library, using CMake @@ -42,14 +38,16 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/io2d) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake " -include(CMakeFindDependencyMacro) -find_dependency(unofficial-cairo CONFIG) -find_dependency(unofficial-graphicsmagick CONFIG) +if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) + file(RENAME ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake ${CURRENT_PACKAGES_DIR}/share/io2d/io2dTargets.cmake) + file(WRITE ${CURRENT_PACKAGES_DIR}/share/io2d/io2dConfig.cmake " + include(CMakeFindDependencyMacro) + find_dependency(unofficial-cairo CONFIG) + find_dependency(unofficial-graphicsmagick CONFIG) -include(\${CMAKE_CURRENT_LIST_DIR}/io2dTargets.cmake) -") + include(\${CMAKE_CURRENT_LIST_DIR}/io2dTargets.cmake) + ") +endif() file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/io2d RENAME copyright) diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL index 395a5d331..f876416d4 100644 --- a/ports/ismrmrd/CONTROL +++ b/ports/ismrmrd/CONTROL @@ -1,8 +1,4 @@ Source: ismrmrd
-Version: 1.3.2-4
+Version: 1.4.0-1
Description: ISMRM Raw Data Format
-Build-Depends: pugixml
-
-Feature: dataset
-Description: Dataset and file support
-Build-Depends: hdf5
+Build-Depends: pugixml, hdf5, boost, fftw3
diff --git a/ports/ismrmrd/fix_static.patch b/ports/ismrmrd/fix_static.patch new file mode 100644 index 000000000..e9bd5f360 --- /dev/null +++ b/ports/ismrmrd/fix_static.patch @@ -0,0 +1,9 @@ +diff --git a/tests/test_main.cpp b/tests/test_main.cpp +index 4b1809d..7ec1414 100644 +--- a/tests/test_main.cpp ++++ b/tests/test_main.cpp +@@ -1,4 +1,3 @@ +-#define BOOST_TEST_DYN_LINK + #define BOOST_TEST_MODULE "ISMRMRD Unit Tests" + #include <boost/test/unit_test.hpp> + diff --git a/ports/ismrmrd/optional_hdf5_dependency.patch b/ports/ismrmrd/optional_hdf5_dependency.patch deleted file mode 100644 index 7c4772ed5..000000000 --- a/ports/ismrmrd/optional_hdf5_dependency.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 456d4f4..3c235f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ set (ISMRMRD_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake CACHE PATH
-
- # command line options
- option(USE_SYSTEM_PUGIXML "Use pugixml installed on the system" OFF)
-+option(USE_HDF5_DATASET_SUPPORT "Use HDF5 library for dataset support" OFF)
-
- # and include it to the search list
- list(APPEND CMAKE_MODULE_PATH ${ISMRMRD_CMAKE_DIR})
-@@ -91,18 +92,23 @@ endif()
- set(ISMRMRD_VERSION_STRING ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR}.${ISMRMRD_VERSION_PATCH})
- set(ISMRMRD_SOVERSION ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR})
-
--# Find HDF5 for dataset support
--find_package(HDF5 1.8 COMPONENTS C)
--
--if (HDF5_FOUND)
-- set (ISMRMRD_DATASET_SUPPORT true)
-- set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
-- set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
-- set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
--else (HDF5_FOUND)
-+if (USE_HDF5_DATASET_SUPPORT)
-+ # Find HDF5 for dataset support
-+ find_package(HDF5 1.8 COMPONENTS C)
-+
-+ if (HDF5_FOUND)
-+ set (ISMRMRD_DATASET_SUPPORT true)
-+ set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
-+ set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
-+ set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
-+ elseif (USE_HDF5_DATASET_SUPPORT)
-+ set (ISMRMRD_DATASET_SUPPORT false)
-+ # Dataset and file support was explicitly requested, force failure rather than succeed without support.
-+ message (FATAL_ERROR "HDF5 not found. Dataset and file support unavailable!")
-+ endif (HDF5_FOUND)
-+else (USE_HDF5_DATASET_SUPPORT)
- set (ISMRMRD_DATASET_SUPPORT false)
-- message (WARNING "HDF5 not found. Dataset and file support unavailable!")
--endif (HDF5_FOUND)
-+endif (USE_HDF5_DATASET_SUPPORT)
-
- # Generate the version.h header file
- find_package(Git)
-@@ -127,7 +133,7 @@ install(FILES ${CMAKE_BINARY_DIR}/include/ismrmrd/version.h DESTINATION include/
-
- # --- Main Library (begin) ----
- # in windows, install the HDF5 dependencies
--if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
-+if (USE_HDF5_DATASET_SUPPORT AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
- if(DEFINED ENV{HDF5_ROOT})
- set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin)
- else (DEFINED ENV{HDF5_ROOT})
-@@ -135,7 +141,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
- endif (DEFINED ENV{HDF5_ROOT})
- message("Install hdf5 libraries from ${HDF5_BIN_DIR} ")
- install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION bin/.. FILES_MATCHING PATTERN "*.dll" )
--endif (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
-+endif (USE_HDF5_DATASET_SUPPORT AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
-
- # include directories for main library
- set(ISMRMRD_TARGET_INCLUDE_DIRS
-@@ -199,9 +205,9 @@ install(FILES cmake/FindIsmrmrd.cmake cmake/FindFFTW3.cmake DESTINATION share/is
- add_subdirectory(doc)
-
- add_subdirectory(utilities)
--if (HDF5_FOUND)
-+if (USE_HDF5_DATASET_SUPPORT)
- add_subdirectory(examples/c)
--endif (HDF5_FOUND)
-+endif (USE_HDF5_DATASET_SUPPORT)
-
- # TODO: make this work on Windows
- if (NOT WIN32)
diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake index af4b05f7d..4b6f7e6d6 100644 --- a/ports/ismrmrd/portfile.cmake +++ b/ports/ismrmrd/portfile.cmake @@ -1,56 +1,90 @@ -include(vcpkg_common_functions) - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ismrmrd/ismrmrd - REF v1.3.2 - SHA512 eb806f71c4b183105b3270d658a68195e009c0f7ca37f54f76d650a4d5c83c44d26b5f12a4c47c608aae9990cd04f1204b0c57e6438ca34a271fd54880133106 - HEAD_REF master - PATCHES - # Makes optional hdf5 dependency explicit - optional_hdf5_dependency.patch -) - -if ("dataset" IN_LIST FEATURES) - set(ENABLE_DATASET ON) -else() - set(ENABLE_DATASET OFF) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DUSE_SYSTEM_PUGIXML=ON - -DUSE_HDF5_DATASET_SUPPORT=${ENABLE_DATASET} -) - -vcpkg_install_cmake() -vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/ismrmrd/cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll) - file(COPY ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll) -endif() - -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll) -endif() - -file(COPY ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_info.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ismrmrd) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_info.exe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_info.exe) - -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/ismrmrd/LICENSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/copyright) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd) +include(vcpkg_common_functions)
+
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+ set(WIN32_INCLUDE_STDDEF_PATCH "x86-windows-include-stddef.patch")
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ set(STATIC_PATCH "fix_static.patch")
+endif()
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO ismrmrd/ismrmrd
+ REF 4d4004d91ccadd41ddb30b019f970a69bb23a1bc
+ SHA512 648901de4629c8b11574894763a5fa61a3cb0420c5aa62cdff02c4641ba702ca73efba12b403076301e44a4f0a7c915da1f2c7a34b24377d0385af92f2eda892
+ HEAD_REF master
+ PATCHES
+ ${STATIC_PATCH}
+ ${WIN32_INCLUDE_STDDEF_PATCH}
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DUSE_SYSTEM_PUGIXML=ON
+ -DUSE_HDF5_DATASET_SUPPORT=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/ismrmrd/cmake)
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll)
+ file(COPY ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll)
+endif()
+
+if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll)
+ file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll)
+endif()
+
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/FindFFTW3.cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/FindFFTW3.cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/FindFFTW3.cmake)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake)
+
+set(ISMRMRD_CMAKE_DIRS ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+foreach(ISMRMRD_CMAKE_DIR IN LISTS ISMRMRD_CMAKE_DIRS)
+if (EXISTS ${ISMRMRD_CMAKE_DIR})
+ file(GLOB ISMRMRD_CMAKE_FILES "${ISMRMRD_CMAKE_DIR}/ISMRMRD/ISMRMRD*.cmake")
+ foreach(ICF ${ISMRMRD_CMAKE_FILES})
+ file(COPY ${ICF} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake/)
+ endforeach()
+endif()
+endforeach()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${ISMRMRD_CMAKE_DIRS})
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+ set(EXECUTABLE_SUFFIX ".exe")
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_c_example${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_c_example${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_generate_cartesian_shepp_logan${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_generate_cartesian_shepp_logan${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_info${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_info${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_read_timing_test${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_read_timing_test${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_recon_cartesian_2d${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_recon_cartesian_2d${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ismrmrd_test_xml${EXECUTABLE_SUFFIX})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ismrmrd_test_xml${EXECUTABLE_SUFFIX})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/)
+endif()
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/ismrmrd/LICENSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/copyright)
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd)
diff --git a/ports/ismrmrd/x86-windows-include-stddef.patch b/ports/ismrmrd/x86-windows-include-stddef.patch new file mode 100644 index 000000000..3855f86d5 --- /dev/null +++ b/ports/ismrmrd/x86-windows-include-stddef.patch @@ -0,0 +1,14 @@ +diff --git a/include/ismrmrd/ismrmrd.h b/include/ismrmrd/ismrmrd.h
+index 40614eb..e5e3e25 100644
+--- a/include/ismrmrd/ismrmrd.h
++++ b/include/ismrmrd/ismrmrd.h
+@@ -30,6 +30,9 @@ typedef unsigned __int32 uint32_t;
+ typedef __int64 int64_t;
+ typedef unsigned __int64 uint64_t;
+ #endif
++#if _WIN32
++#include <stddef.h> /* for size_t */
++#endif
+ #else /* non MS C or C++ compiler */
+ #include <stdint.h>
+ #include <stddef.h> /* for size_t */
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL index 5c9d25881..b77968554 100644 --- a/ports/itk/CONTROL +++ b/ports/itk/CONTROL @@ -1,8 +1,9 @@ -Source: itk
-Version: 4.13.0-906736bd-1
-Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
-Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp]
-
-Feature: vtk
-Description: Build ITKVtkGlue module.
-Build-Depends: vtk
+Source: itk +Version: 5.0.0-2 +Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis. +Homepage: https://github.com/InsightSoftwareConsortium/ITK +Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg + +Feature: vtk +Description: Build ITKVtkGlue module. +Build-Depends: vtk diff --git a/ports/itk/fix_libminc_config_path.patch b/ports/itk/fix_libminc_config_path.patch new file mode 100644 index 000000000..3ff305d4b --- /dev/null +++ b/ports/itk/fix_libminc_config_path.patch @@ -0,0 +1,13 @@ +diff --git a/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt b/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt +index 305b2c63..63f81a53 100644 +--- a/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt ++++ b/Modules/ThirdParty/MINC/src/libminc/CMakeLists.txt +@@ -550,7 +550,7 @@ IF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT) + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Use${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINC.cmake + ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${LIBMINC_EXTERNAL_LIB_PREFIX}LIBMINCConfig.cmake + DESTINATION +- ${LIBMINC_INSTALL_LIB_DIR}/cmake ++ share/itk + COMPONENT Development) + ENDIF(LIBMINC_INSTALL_LIB_DIR AND NOT LIBMINC_INSTALL_NO_DEVELOPMENT) + diff --git a/ports/itk/fix_openjpeg_search.patch b/ports/itk/fix_openjpeg_search.patch new file mode 100644 index 000000000..d17a1ab84 --- /dev/null +++ b/ports/itk/fix_openjpeg_search.patch @@ -0,0 +1,13 @@ +diff --git a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt +index 6ac16ab6..4638f13c 100644 +--- a/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt ++++ b/Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt +@@ -373,7 +373,7 @@ else() + endif() + + if(GDCM_USE_SYSTEM_OPENJPEG) +- find_package(OpenJPEG 2.0.0 REQUIRED) ++ find_package(OpenJPEG REQUIRED) + set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES}) + else() + set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2) diff --git a/ports/itk/hdf5_config_mode_find_package.patch b/ports/itk/hdf5_config_mode_find_package.patch deleted file mode 100644 index f106d7151..000000000 --- a/ports/itk/hdf5_config_mode_find_package.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/Modules/ThirdParty/HDF5/CMakeLists.txt b/Modules/ThirdParty/HDF5/CMakeLists.txt -index 6caa63b..f118c73 100644 ---- a/Modules/ThirdParty/HDF5/CMakeLists.txt -+++ b/Modules/ThirdParty/HDF5/CMakeLists.txt -@@ -1,7 +1,7 @@ - project(ITKHDF5) - set(ITKHDF5_THIRD_PARTY 1) - --if (BUILD_SHARED_LIBS) -+if (ITK_BUILD_SHARED_LIBS) - add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB=1) - endif() - if(ITK_USE_SYSTEM_HDF5) -@@ -20,11 +20,10 @@ endif() - ") - endif() - -- set(ITKHDF5_LIBRARIES ) -- if(BUILD_SHARED_LIBS) -- list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_SHARED_LIBRARY} ${HDF5_CXX_SHARED_LIBRARY}) -+ if(ITK_BUILD_SHARED_LIBS) -+ set(ITKHDF5_LIBRARIES hdf5::hdf5-shared hdf5::hdf5_cpp-shared) - else() -- list(APPEND ITKHDF5_LIBRARIES ${HDF5_C_STATIC_LIBRARY} ${HDF5_CXX_STATIC_LIBRARY}) -+ set(ITKHDF5_LIBRARIES hdf5::hdf5-static hdf5::hdf5_cpp-static) - endif() - - set(ITKHDF5_INCLUDE_DIRS -@@ -33,11 +32,6 @@ endif() - set(ITKHDF5_SYSTEM_INCLUDE_DIRS - ${HDF5_INCLUDE_DIR} - ${HDF5_INCLUDE_DIR_CPP} -- ${HDF5_INCLUDE_DIRS} -- ${HDF5_INCLUDE_DIR_CPP} -- ) -- list(APPEND ITKHDF5_LIBRARIES -- ${HDF5_LIBRARIES} - ) - set(ITKHDF5_NO_SRC 1) - else() -@@ -45,7 +39,7 @@ else() - ${ITKHDF5_SOURCE_DIR}/src - ${ITKHDF5_BINARY_DIR}/src - ) -- if(BUILD_SHARED_LIBS) -+ if(ITK_BUILD_SHARED_LIBS) - set(ITKHDF5_LIBRARIES hdf5_cpp-shared hdf5-shared) - else() - set(ITKHDF5_LIBRARIES hdf5_cpp-static hdf5-static) -diff --git a/Modules/ThirdParty/HDF5/itk-module-init.cmake b/Modules/ThirdParty/HDF5/itk-module-init.cmake -index a9207a8..e36c2d9 100644 ---- a/Modules/ThirdParty/HDF5/itk-module-init.cmake -+++ b/Modules/ThirdParty/HDF5/itk-module-init.cmake -@@ -2,12 +2,8 @@ option(ITK_USE_SYSTEM_HDF5 "Use an outside build of HDF5." ${ITK_USE_SYSTEM_LIBR - mark_as_advanced(ITK_USE_SYSTEM_HDF5) - if(ITK_USE_SYSTEM_HDF5) - if(BUILD_SHARED_LIBS) -- find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C shared) -+ find_package(HDF5 REQUIRED NO_MODULE COMPONENTS CXX C shared) - else() -- find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C static) -- endif() -- -- if(NOT HDF5_FOUND) -- find_package(HDF5 REQUIRED COMPONENTS CXX C) -+ find_package(HDF5 REQUIRED NO_MODULE COMPONENTS CXX C static) - endif() - endif() diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 7339de39d..a83527a51 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -1,11 +1,21 @@ include(vcpkg_common_functions) +string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) +if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" + "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." + ) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF 906736bd453e95ccf03b318d3d07cb7884285161 - SHA512 8ac62262d46e7acbb0e5b2e964292ec17e1687bb162b8cec666e5b67acbe3449f093a0b1c03737e9951cb88248ed890805ffd57df6eae21220488620da833c57 + REF v5.0.0 + SHA512 7eecd62ab3124147f0abce482699dfdc43610703959d4a3f667c8ce12a6ecacf836a863d146f3cc7d5220b4aa05adf70a0d4dc6fa8e87bac215565badc96acff HEAD_REF master + PATCHES + fix_openjpeg_search.patch + fix_libminc_config_path.patch ) if ("vtk" IN_LIST FEATURES) @@ -14,14 +24,6 @@ else() set(ITKVtkGlue OFF) endif() -# directory path length needs to be shorter than 50 characters -set(ITK_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/ITK) -if(EXISTS ${ITK_BUILD_DIR}) - file(REMOVE_RECURSE ${ITK_BUILD_DIR}) -endif() -file(RENAME ${SOURCE_PATH} ${ITK_BUILD_DIR}) -set(SOURCE_PATH "${ITK_BUILD_DIR}") - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -60,20 +62,16 @@ vcpkg_configure_cmake( -DModule_IOSTL=ON # example how to turn on a non-default module -DModule_MorphologicalContourInterpolation=ON # example how to turn on a remote module -DModule_RLEImage=ON # example how to turn on a remote module + -DGDCM_USE_SYSTEM_OPENJPEG=ON #Use port openjpeg instead of own third-party ${ADDITIONAL_OPTIONS} ) vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets() # combines release and debug build configurations - -file(RENAME ${CURRENT_PACKAGES_DIR}/vcl_compiler_detection.h ${CURRENT_PACKAGES_DIR}/include/ITK-5.0/vcl_compiler_detection.h) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/vcl_compiler_detection.h) -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/itk) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/itk/LICENSE ${CURRENT_PACKAGES_DIR}/share/itk/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/itpp/CONTROL b/ports/itpp/CONTROL new file mode 100644 index 000000000..623b2fc6b --- /dev/null +++ b/ports/itpp/CONTROL @@ -0,0 +1,3 @@ +Source: itpp
+Version: 4.3.1
+Description: IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.
\ No newline at end of file diff --git a/ports/itpp/fix-linux.patch b/ports/itpp/fix-linux.patch new file mode 100644 index 000000000..5e7bb64c0 --- /dev/null +++ b/ports/itpp/fix-linux.patch @@ -0,0 +1,13 @@ +diff --git a/itpp/base/random_dsfmt.h b/itpp/base/random_dsfmt.h +index ccbf182..a3d5472 100644 +--- a/itpp/base/random_dsfmt.h ++++ b/itpp/base/random_dsfmt.h +@@ -299,7 +299,7 @@ private: + */ + static void do_recursion(typename Context::w128_t *r, typename Context::w128_t *a, typename Context::w128_t *b, typename Context::w128_t *lung) { + #if defined(__SSE2__) +- const unsigned int SSE2_SHUFF = 0x1bU; ++#define SSE2_SHUFF 0x1bU + + __m128i x = a->si; + __m128i z = _mm_slli_epi64(x, SL1); diff --git a/ports/itpp/fix-uwp.patch b/ports/itpp/fix-uwp.patch new file mode 100644 index 000000000..18e5fe4eb --- /dev/null +++ b/ports/itpp/fix-uwp.patch @@ -0,0 +1,12 @@ +diff --git a/itpp/base/timing.cpp b/itpp/base/timing.cpp +index 58178e4..47d662e 100644 +--- a/itpp/base/timing.cpp ++++ b/itpp/base/timing.cpp +@@ -51,6 +51,7 @@ + + #if defined(_WIN32) && !defined(__CYGWIN__) + #include <windows.h> ++#include <Winsock2.h> + + int gettimeofday(struct timeval* p, void*) + { diff --git a/ports/itpp/msvc2013.patch b/ports/itpp/msvc2013.patch new file mode 100644 index 000000000..9cd35e851 --- /dev/null +++ b/ports/itpp/msvc2013.patch @@ -0,0 +1,284 @@ + CMakeLists.txt | 2 ++ + itpp/base/algebra/eigen.cpp | 1 + + itpp/base/algebra/ls_solve.cpp | 2 +- + itpp/base/algebra/qr.cpp | 1 + + itpp/base/algebra/svd.cpp | 2 +- + itpp/base/bessel/gamma.cpp | 5 +++++ + itpp/base/itcompat.cpp | 11 ++++++++++- + itpp/base/itcompat.h | 14 ++++++++++++-- + itpp/base/matfunc.h | 1 + + itpp/base/svec.h | 1 + + itpp/comm/siso_dem.cpp | 6 ++++++ + itpp/comm/siso_eq.cpp | 6 ++++++ + itpp/comm/siso_mud.cpp | 7 +++++++ + itpp/comm/siso_nsc.cpp | 6 ++++++ + itpp/comm/siso_rsc.cpp | 7 +++++++ + 15 files changed, 67 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f6a9a6..2360f86 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,9 @@ CHECK_CXX_SYMBOL_EXISTS ( isnan "cmath" HAVE_DECL_ISNAN ) + CHECK_CXX_SYMBOL_EXISTS ( signgam "cmath" HAVE_DECL_SIGNGAM ) + + #check for functions ++if( NOT MSVC ) + set(CMAKE_REQUIRED_LIBRARIES m) ++endif() + include (CheckFunctionExists) + CHECK_FUNCTION_EXISTS ( acosh HAVE_ACOSH ) + CHECK_FUNCTION_EXISTS ( asinh HAVE_ASINH ) +diff --git a/itpp/base/algebra/eigen.cpp b/itpp/base/algebra/eigen.cpp +index 8c0c36b..54ae3e1 100644 +--- a/itpp/base/algebra/eigen.cpp ++++ b/itpp/base/algebra/eigen.cpp +@@ -39,6 +39,7 @@ + #include <itpp/base/algebra/eigen.h> + #include <itpp/base/converters.h> + ++#include <algorithm> + + namespace itpp + { +diff --git a/itpp/base/algebra/ls_solve.cpp b/itpp/base/algebra/ls_solve.cpp +index dae38fc..95abf0a 100644 +--- a/itpp/base/algebra/ls_solve.cpp ++++ b/itpp/base/algebra/ls_solve.cpp +@@ -37,7 +37,7 @@ + #endif + + #include <itpp/base/algebra/ls_solve.h> +- ++#include <algorithm> + + namespace itpp + { +diff --git a/itpp/base/algebra/qr.cpp b/itpp/base/algebra/qr.cpp +index 91dfb2b..0b47294 100644 +--- a/itpp/base/algebra/qr.cpp ++++ b/itpp/base/algebra/qr.cpp +@@ -39,6 +39,7 @@ + #include <itpp/base/algebra/qr.h> + #include <itpp/base/specmat.h> + ++#include <algorithm> + + namespace itpp + { +diff --git a/itpp/base/algebra/svd.cpp b/itpp/base/algebra/svd.cpp +index aa21e36..b2e499c 100644 +--- a/itpp/base/algebra/svd.cpp ++++ b/itpp/base/algebra/svd.cpp +@@ -37,7 +37,7 @@ + #endif + + #include <itpp/base/algebra/svd.h> +- ++#include <algorithm> + + namespace itpp + { +diff --git a/itpp/base/bessel/gamma.cpp b/itpp/base/bessel/gamma.cpp +index 162c4ae..9405507 100644 +--- a/itpp/base/bessel/gamma.cpp ++++ b/itpp/base/bessel/gamma.cpp +@@ -34,6 +34,11 @@ + #include <itpp/base/itcompat.h> + #include <itpp/base/math/misc.h> + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif + + /* + * Gamma function +diff --git a/itpp/base/itcompat.cpp b/itpp/base/itcompat.cpp +index f99ec81..aa34b28 100644 +--- a/itpp/base/itcompat.cpp ++++ b/itpp/base/itcompat.cpp +@@ -47,12 +47,21 @@ double tgamma(double x) + } + #endif + +-#if !defined(HAVE_LGAMMA) || (HAVE_DECL_SIGNGAM != 1) ++#if !defined(HAVE_LGAMMA) && (HAVE_DECL_SIGNGAM != 1) + // The sign of the Gamma function is returned in the external integer + // signgam declared in <math.h>. It is 1 when the Gamma function is positive + // or zero, -1 when it is negative. However, MinGW definition of lgamma() + // function does not use the global signgam variable. ++//May 3rd 2015 (Andy Panov): ++//Nonetheless, I guess it would be smarter not to break the ODR rule and not to provide our own definition of lgamma ++//function when HAVE_LGAMMA is defined. If we still provide the definition, two definitions ++//of the same function will exist in the program (this is undefined behaviour, as C++ standard says), ++//so we can not ensure linker will choose our definition and user's code will work as expected. ++//I guess, error message from linker regarding the unresolved symbol is much better option, ++//since it clearly points to the math library limitations. Otherwise user can get a malfunctioning program ++//with really subtle error. + int signgam; ++ + // Logarithm of an absolute value of gamma function + double lgamma(double x) + { +diff --git a/itpp/base/itcompat.h b/itpp/base/itcompat.h +index e6be223..dcf2ed7 100644 +--- a/itpp/base/itcompat.h ++++ b/itpp/base/itcompat.h +@@ -41,8 +41,12 @@ + #if defined(_MSC_VER) + # include <cfloat> + # define finite(x) _finite(x) ++#ifndef HAVE_STD_ISFINITE + # define isfinite(x) _finite(x) ++#endif ++#ifndef HAVE_STD_ISNAN + # define isnan(x) _isnan(x) ++#endif + # define fpclass(x) _fpclass(x) + # define FP_NINF _FPCLASS_NINF + # define FP_PINF _FPCLASS_PINF +@@ -119,13 +123,19 @@ inline bool isfinite(double x) + double tgamma(double x); + #endif + +-#if !defined(HAVE_LGAMMA) || (HAVE_DECL_SIGNGAM != 1) ++#if !defined(HAVE_LGAMMA) && (HAVE_DECL_SIGNGAM != 1) ++//Provide own definitions if both conditions are met: ++//-lgammma is not defined ++//-signgam was not found ++//See ODR desicussion in itcompat.cpp ++ + //! Lograrithm of an absolute gamma function + double lgamma(double x); + //! Global variable needed by \c lgamma function + extern int signgam; + #endif + ++ + #ifndef HAVE_CBRT + //! Cubic root + double cbrt(double x); +@@ -141,7 +151,7 @@ inline double log1p(double x) { return std::log(1.0 + x); } + //! Base-2 logarithm + inline double log2(double x) + { +- static const double one_over_log2 = 1.0 / std::log(2.0); ++ const double one_over_log2 = 1.0 / std::log(2.0); + return std::log(x) * one_over_log2; + } + #endif +diff --git a/itpp/base/matfunc.h b/itpp/base/matfunc.h +index 8ae683e..60cf95f 100644 +--- a/itpp/base/matfunc.h ++++ b/itpp/base/matfunc.h +@@ -36,6 +36,7 @@ + #include <itpp/base/algebra/inv.h> + #include <itpp/base/algebra/svd.h> + #include <itpp/itexports.h> ++#include <algorithm> + + namespace itpp + { +diff --git a/itpp/base/svec.h b/itpp/base/svec.h +index d105b2f..3a2c15b 100644 +--- a/itpp/base/svec.h ++++ b/itpp/base/svec.h +@@ -33,6 +33,7 @@ + #include <itpp/base/math/min_max.h> + #include <cstdlib> + #include <itpp/itexports.h> ++#include <algorithm> + + namespace itpp + { +diff --git a/itpp/comm/siso_dem.cpp b/itpp/comm/siso_dem.cpp +index 666f38c..4fa03fd 100644 +--- a/itpp/comm/siso_dem.cpp ++++ b/itpp/comm/siso_dem.cpp +@@ -32,6 +32,12 @@ + #define INFINITY std::numeric_limits<double>::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#endif ++ ++ + namespace itpp + { + void SISO::find_half_const(int &select_half, itpp::vec &re_part, itpp::bmat &re_bin_part, itpp::vec &im_part, itpp::bmat &im_bin_part) +diff --git a/itpp/comm/siso_eq.cpp b/itpp/comm/siso_eq.cpp +index 856c01a..6553b33 100644 +--- a/itpp/comm/siso_eq.cpp ++++ b/itpp/comm/siso_eq.cpp +@@ -32,6 +32,12 @@ + #define INFINITY std::numeric_limits<double>::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ + namespace itpp + { + void SISO::gen_chtrellis(void) +diff --git a/itpp/comm/siso_mud.cpp b/itpp/comm/siso_mud.cpp +index 60aa6d3..a7ff735 100644 +--- a/itpp/comm/siso_mud.cpp ++++ b/itpp/comm/siso_mud.cpp +@@ -32,6 +32,13 @@ + #define INFINITY std::numeric_limits<double>::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ ++ + namespace itpp + { + void SISO::descrambler(itpp::vec &extrinsic_coded, itpp::vec &extrinsic_data, const itpp::vec &intrinsic_coded, const itpp::vec &apriori_data) +diff --git a/itpp/comm/siso_nsc.cpp b/itpp/comm/siso_nsc.cpp +index ca7d19a..12ca62a 100644 +--- a/itpp/comm/siso_nsc.cpp ++++ b/itpp/comm/siso_nsc.cpp +@@ -33,6 +33,12 @@ + #define INFINITY std::numeric_limits<double>::infinity() + #endif + ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ + namespace itpp + { + void SISO::gen_nsctrellis(void) +diff --git a/itpp/comm/siso_rsc.cpp b/itpp/comm/siso_rsc.cpp +index e5003c7..9e3eea1 100644 +--- a/itpp/comm/siso_rsc.cpp ++++ b/itpp/comm/siso_rsc.cpp +@@ -29,6 +29,13 @@ + #include <itpp/comm/siso.h> + #include <itpp/base/itcompat.h> + #include <limits> ++ ++#if _MSC_VER ++//suppress warnings regarding the use infinity in fp arithmetic ++#pragma warning(disable: 4056) ++#pragma warning(disable: 4756) ++#endif ++ + #ifndef INFINITY + #define INFINITY std::numeric_limits<double>::infinity() + #endif + + #Remove this patch if the source has fixed these issues. diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake new file mode 100644 index 000000000..10faf4882 --- /dev/null +++ b/ports/itpp/portfile.cmake @@ -0,0 +1,45 @@ +include(vcpkg_common_functions)
+
+set(ITPP_VERSION 4.3.1)
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://sourceforge.net/projects/itpp/files/itpp/${ITPP_VERSION}/itpp-${ITPP_VERSION}.tar.bz2"
+ FILENAME "itpp-${ITPP_VERSION}.tar.bz2"
+ SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF ${ITPP_VERSION}
+ PATCHES
+ msvc2013.patch
+)
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES fix-uwp.patch
+ )
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES fix-linux.patch
+ )
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+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(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/jack2/CONTROL b/ports/jack2/CONTROL index e011b2711..d665dbe24 100644 --- a/ports/jack2/CONTROL +++ b/ports/jack2/CONTROL @@ -1,4 +1,5 @@ Source: jack2
Version: 1.9.12-1
+Homepage: https://github.com/jackaudio/jack2
Description: Cross-platform API that enables device sharing and inter-application audio routing
diff --git a/ports/jansson/CONTROL b/ports/jansson/CONTROL index 6050b464d..19b1224ef 100644 --- a/ports/jansson/CONTROL +++ b/ports/jansson/CONTROL @@ -1,3 +1,4 @@ Source: jansson -Version: 2.11-2 +Version: 2.12-1 +Homepage: https://github.com/akheron/jansson Description: Jansson is a C library for encoding, decoding and manipulating JSON data diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index e243422fb..62086e99d 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO akheron/jansson - REF v2.11 - SHA512 5dd94951e1aedd3f3a9ab6a43170d2395ec70c5a00e6da58538816b2dcd98835fc4ca43ab1e9b78864c01e48075505573f4f8d1da5c9d2c094622518d19525e8 + REF 71c4e8ec215afa225ac20eed269a14963cd37b50 + SHA512 cdb955996768d6c7ed15b9f1bb7ddf4905f881c4e604d9e7a863f42c513eaaa9fb8799dacfa392424fbf725aac125d4716e10c44c3415449b5c5edd38a87b290 HEAD_REF master ) @@ -42,8 +42,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/jansson) +vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jansson RENAME copyright) diff --git a/ports/jasper/CONTROL b/ports/jasper/CONTROL index ede42e377..43c657dd4 100644 --- a/ports/jasper/CONTROL +++ b/ports/jasper/CONTROL @@ -1,4 +1,5 @@ Source: jasper -Version: 2.0.14-1 +Version: 2.0.16-2 +Homepage: https://github.com/mdadams/jasper Description: Open source implementation of the JPEG-2000 Part-1 standard -Build-Depends: libjpeg-turbo +Build-Depends: libjpeg-turbo, opengl, freeglut diff --git a/ports/jasper/jasper-fix-uwp.patch b/ports/jasper/jasper-fix-uwp.patch deleted file mode 100644 index 2b67d6c93..000000000 --- a/ports/jasper/jasper-fix-uwp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bad33461a302ed8db02e0d9875e7b59b9e8f6032 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Tue, 7 Nov 2017 20:10:31 +0300 -Subject: [PATCH] Fixed build for Windows 10 UWP - ---- - src/libjasper/CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/libjasper/CMakeLists.txt b/src/libjasper/CMakeLists.txt -index 234ae67..9d0a522 100644 ---- a/src/libjasper/CMakeLists.txt -+++ b/src/libjasper/CMakeLists.txt -@@ -145,6 +145,15 @@ target_include_directories(libjasper BEFORE PRIVATE - set_target_properties(libjasper PROPERTIES OUTPUT_NAME jasper) - set_target_properties(libjasper PROPERTIES LINKER_LANGUAGE C) - -+if(MSVC) -+ target_compile_definitions(libjasper PRIVATE -+ "-D_CRT_SECURE_NO_WARNINGS") -+ target_compile_definitions(libjasper PRIVATE -+ "-D_CRT_SECURE_NO_DEPRECATE") -+ target_compile_definitions(libjasper PRIVATE -+ "-D_CRT_NONSTDC_NO_DEPRECATE") -+endif() -+ - if (UNIX) - set_target_properties(libjasper PROPERTIES - VERSION ${JAS_SO_NAME} SOVERSION ${JAS_SO_VERSION}) --- -2.14.1.windows.1 - diff --git a/ports/jasper/opengl-not-required.patch b/ports/jasper/opengl-not-required.patch deleted file mode 100644 index 5c40a6b67..000000000 --- a/ports/jasper/opengl-not-required.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c432ba2..c67598f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -267,7 +267,9 @@ message("JAS_HAVE_LIBJPEG: ${JAS_HAVE_LIBJPEG}")
- # Check for the OpenGL and GLUT libraries.
- ################################################################################
-
-+if(JAS_ENABLE_OPENGL)
- find_package(OpenGL ${JAS_REQUIRED})
-+endif()
- message("JAS_ENABLE_OPENGL: ${JAS_ENABLE_OPENGL}")
- message("OpenGL library found: ${OPENGL_FOUND}")
- if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake index 6e753ed74..ae42d2a22 100644 --- a/ports/jasper/portfile.cmake +++ b/ports/jasper/portfile.cmake @@ -3,15 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mdadams/jasper - REF version-2.0.14 - SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940 - HEAD_REF master) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/jasper-fix-uwp.patch - ${CMAKE_CURRENT_LIST_DIR}/opengl-not-required.patch + REF version-2.0.16 + SHA512 b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee + HEAD_REF master ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -26,10 +20,11 @@ vcpkg_configure_cmake( OPTIONS -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF -DJAS_ENABLE_LIBJPEG=ON - -DJAS_ENABLE_OPENGL=OFF # not needed for the library -DJAS_ENABLE_DOC=OFF -DJAS_ENABLE_PROGRAMS=OFF -DJAS_ENABLE_SHARED=${JAS_ENABLE_SHARED} + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # Due to CMakes FindJasper ) vcpkg_install_cmake() @@ -41,5 +36,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jasper) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/jasper/LICENSE ${CURRENT_PACKAGES_DIR}/share/jasper/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jasper RENAME copyright) diff --git a/ports/jbig2dec/CMakeLists.txt b/ports/jbig2dec/CMakeLists.txt index a2a8376de..14b1be671 100644 --- a/ports/jbig2dec/CMakeLists.txt +++ b/ports/jbig2dec/CMakeLists.txt @@ -3,8 +3,6 @@ project(jbig2dec C) set(CMAKE_DEBUG_POSTFIX d)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
file(GLOB SOURCES jbig2*.c)
list(REMOVE_ITEM SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/jbig2dec.c"
diff --git a/ports/jbig2dec/CONTROL b/ports/jbig2dec/CONTROL index 0ff000f44..5e11aa037 100644 --- a/ports/jbig2dec/CONTROL +++ b/ports/jbig2dec/CONTROL @@ -1,4 +1,4 @@ Source: jbig2dec
-Version: 0.13
+Version: 0.16-1
+Homepage: https://github.com/ArtifexSoftware/jbig2dec
Description: a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.
-
diff --git a/ports/jbig2dec/portfile.cmake b/ports/jbig2dec/portfile.cmake index 90e56bd9b..a9d767937 100644 --- a/ports/jbig2dec/portfile.cmake +++ b/ports/jbig2dec/portfile.cmake @@ -1,10 +1,12 @@ include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ArtifexSoftware/jbig2dec
- REF 0.13
- SHA512 11d1209810d6c80a095ec59d6af44010d4664f4ba744c0c14bdad9564359cf31dd0095b072fa63de381f2de57116e523883aa8843cc8d9baa2c3a8b9b1fc3527
+ REF 0.16
+ SHA512 a8aa1b1f14466104eed412c38604b2450d1acc1c73faaaf81d5211ac7f4d636bf8d177285f6550f1f5211b31d14f1c14d83571e3e899700ebfc9af00912ed874
HEAD_REF master
)
diff --git a/ports/jbigkit/CONTROL b/ports/jbigkit/CONTROL index f6c5e65ca..cc0a00aa2 100644 --- a/ports/jbigkit/CONTROL +++ b/ports/jbigkit/CONTROL @@ -1,3 +1,4 @@ Source: jbigkit
-Version: 2.1-2
+Version: 2.1-3
+Homepage: https://www.cl.cam.ac.uk/~mgk25/jbigkit
Description: A software implementation of the JBIG1 data compression standard (ITU-T T.82)
diff --git a/ports/jbigkit/portfile.cmake b/ports/jbigkit/portfile.cmake index 16b37eb29..9e63a426f 100644 --- a/ports/jbigkit/portfile.cmake +++ b/ports/jbigkit/portfile.cmake @@ -19,7 +19,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/jemalloc/CONTROL b/ports/jemalloc/CONTROL index 19d4fbcc0..3f6be44a5 100644 --- a/ports/jemalloc/CONTROL +++ b/ports/jemalloc/CONTROL @@ -1,4 +1,5 @@ Source: jemalloc
Version: 4.3.1-4
+Homepage: https://github.com/jemalloc/jemalloc-cmake
Description: jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support
Build-Depends:
diff --git a/ports/json-c/CONTROL b/ports/json-c/CONTROL new file mode 100644 index 000000000..ebd0ed02d --- /dev/null +++ b/ports/json-c/CONTROL @@ -0,0 +1,3 @@ +Source: json-c
+Version: 2019-05-31
+Description: A JSON implementation in C
diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake new file mode 100644 index 000000000..75ad6da61 --- /dev/null +++ b/ports/json-c/portfile.cmake @@ -0,0 +1,28 @@ +include(vcpkg_common_functions)
+
+# https://github.com/json-c/json-c/issues/488
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO json-c/json-c
+ REF 2b1903cc6941fb87db7526680829486f27fb1073
+ SHA512 0ee71a0c2f75f5114b65f06ef921ac7a66173d66592fa880336896de64f3a325b251028b35396184cd7c3ffd15db3826bed83200fa80f4d11607fdf758138bf9
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/json-dto/CONTROL b/ports/json-dto/CONTROL index 1d8b7b24b..dbd64c3c1 100644 --- a/ports/json-dto/CONTROL +++ b/ports/json-dto/CONTROL @@ -1,4 +1,4 @@ Source: json-dto -Version: 0.2.8 +Version: 0.2.8-2 Description: A small header-only library for converting data between json representation and c++ structs. Build-Depends: rapidjson diff --git a/ports/json-dto/portfile.cmake b/ports/json-dto/portfile.cmake index 212ef87aa..7600433ea 100644 --- a/ports/json-dto/portfile.cmake +++ b/ports/json-dto/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/json-dto") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/json-dto) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/jsoncons/CONTROL b/ports/jsoncons/CONTROL index 91896b6e2..8b01549ef 100644 --- a/ports/jsoncons/CONTROL +++ b/ports/jsoncons/CONTROL @@ -1,3 +1,3 @@ Source: jsoncons
-Version: v0.122.0
+Version: 0.125.0 Description: A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSONPath, CSV, MessagePack, CBOR, BSON, UBJSON
diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index c2218ba63..fb00be0ad 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons - REF v0.122.0 - SHA512 3fd52e45cc876e3cb3d773a2c7f022224dc1f288db89755d14a93a4e62977f767c6ccfb4aa22b2bc91664223bd15cd5c1bf408e8e298ad81f7b3ef811d8b3121 + REF v0.125.0 + SHA512 60969fa9bb47c8ee2e01c9333322940c7e9063e4c7761fa54f9d2bba8e49815145e2b48f2bc528a5b3b5316aded2930cdf410a29ce608df09a561a4650d20e15 HEAD_REF master ) diff --git a/ports/jsoncpp/CONTROL b/ports/jsoncpp/CONTROL index 4c7084d8e..6bbe46c0e 100644 --- a/ports/jsoncpp/CONTROL +++ b/ports/jsoncpp/CONTROL @@ -1,3 +1,4 @@ Source: jsoncpp
Version: 1.8.4-1
+Homepage: https://github.com/open-source-parsers/jsoncpp
Description: jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.
diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch new file mode 100644 index 000000000..3a666ee4b --- /dev/null +++ b/ports/jsonnet/001-enable-msvc.patch @@ -0,0 +1,78 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8682cc8..88b95c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,6 +11,8 @@ set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING + + project(jsonnet C CXX) + ++add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ + # Discourage in-source builds because they overwrite the hand-written Makefile. + # Use `cmake . -B<dir>` or the CMake GUI to do an out-of-source build. + if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} AND +@@ -73,17 +75,6 @@ elseif (BUILD_TESTS AND USE_SYSTEM_GTEST) + add_subdirectory(/usr/src/googletest ${GLOBAL_OUTPUT_PATH}/googletest-build) + endif() + +-# Compiler flags. +-if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR +- ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") +- set(OPT "-O3") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra -pedantic -std=c99 -O3 ${OPT}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC ${OPT}") +-else() +- # TODO: Windows support. +- message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported") +-endif() +- + # Look for libraries in global output path. + link_directories(${GLOBAL_OUTPUT_PATH}) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index f1c32b8..1a45a51 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE + string_utils.cpp + vm.cpp) + +-add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) ++add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet md5 stdlib) + target_link_libraries(libjsonnet md5) + +@@ -36,13 +36,12 @@ target_link_libraries(libjsonnet md5) + # this step the output would be |liblibjsonnet|. + set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet + VERSION 0.12.1 SOVERSION 0) +-install(TARGETS libjsonnet DESTINATION lib) ++install(TARGETS libjsonnet DESTINATION lib RUNTIME DESTINATION bin) + + # Static library for jsonnet command-line tool. + add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) + add_dependencies(libjsonnet_static md5 stdlib) + target_link_libraries(libjsonnet_static md5) +-set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) + + # Tests + +diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt +index a481d9f..9fe768e 100644 +--- a/stdlib/CMakeLists.txt ++++ b/stdlib/CMakeLists.txt +@@ -2,14 +2,6 @@ + + add_executable(to_c_array to_c_array.cpp) + +-# Custom command that will only build stdlib when it changes. +-add_custom_command( +- OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h +- COMMAND ${GLOBAL_OUTPUT_PATH}/to_c_array +- ${PROJECT_SOURCE_DIR}/stdlib/std.jsonnet +- ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h +- DEPENDS to_c_array std.jsonnet) +- + # Standard library build target that libjsonnet can depend on. + add_custom_target(stdlib ALL + DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h) diff --git a/ports/jsonnet/CMakeLists.txt b/ports/jsonnet/CMakeLists.txt deleted file mode 100644 index 5056191c1..000000000 --- a/ports/jsonnet/CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ -cmake_minimum_required(VERSION 3.5.1) -project(jsonnet) - -if(MSVC) - add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) -endif() - -set( jsonnet_sources - core/desugarer.cpp - core/formatter.cpp - core/lexer.cpp - core/libjsonnet.cpp - core/parser.cpp - core/pass.cpp - core/static_analysis.cpp - core/string_utils.cpp - core/vm.cpp -) - -include_directories(third_party/md5 include cpp core stdlib) - -add_library(md5 STATIC third_party/md5/md5.cpp) - -add_library(libjsonnet ${jsonnet_sources}) -target_link_libraries(libjsonnet md5) - -add_library(libjsonnet++ cpp/libjsonnet++.cpp) -target_link_libraries(libjsonnet++ libjsonnet) - -add_executable(jsonnet cmd/jsonnet.cpp) -target_link_libraries(jsonnet libjsonnet) - - -install( - TARGETS libjsonnet libjsonnet++ - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) -if(NOT DISABLE_INSTALL_TOOLS) - install ( - TARGETS jsonnet - RUNTIME DESTINATION tools/jsonnet - ) -endif() - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES include/libjsonnet++.h include/libjsonnet.h DESTINATION include) -endif() diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index 22906cdfb..35c870658 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,3 +1,4 @@ -Source: jsonnet
-Version: 2018-11-01-3
-Description: Jsonnet - The data templating language
+Source: jsonnet +Version: 2019-05-08 +Homepage: https://github.com/google/jsonnet +Description: Jsonnet - The data templating language diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 4ae28a70d..5472445da 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -1,16 +1,20 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO google/jsonnet - REF a0876b301daf8f45e16ac5f7bb814d0617772bb0 - SHA512 a57380ecc578b11f3a763202abb7ab703f2cc3c098ca7602d0bd199594a9e8d1cebc6d51332658edb08bf088e565d6afae0cb2faaf127fa33542a406de1ac055 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO google/jsonnet + REF c323f5ce5b8aa663585d23dc0fb94d4b166c6f16 + SHA512 d9f84c39929e9e80272e2b834f68a13b48c1cb4d64b70f5b6fa16e677555d947f7cf57372453e23066a330faa6a429b9aa750271b46f763581977a223d238785 + HEAD_REF master + PATCHES + 001-enable-msvc.patch ) -if (WIN32) +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_execute_required_process( COMMAND Powershell -Command "((Get-Content -Encoding Byte \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' > \"${SOURCE_PATH}/core/std.jsonnet.h\"" WORKING_DIRECTORY "${SOURCE_PATH}" @@ -24,11 +28,10 @@ else() ) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON + PREFER_NINJA + OPTIONS -DBUILD_JSONNET=OFF -DBUILD_TESTS=OFF ) vcpkg_install_cmake() @@ -36,3 +39,4 @@ vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/jsonnet) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jsonnet RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/jwt-cpp/CONTROL b/ports/jwt-cpp/CONTROL new file mode 100644 index 000000000..4f44063fe --- /dev/null +++ b/ports/jwt-cpp/CONTROL @@ -0,0 +1,3 @@ +Source: jwt-cpp +Version: 2019-05-07 +Description: A header only library for creating and validating json web tokens in c++
\ No newline at end of file diff --git a/ports/jwt-cpp/fix-picojson.patch b/ports/jwt-cpp/fix-picojson.patch new file mode 100644 index 000000000..44c04fe58 --- /dev/null +++ b/ports/jwt-cpp/fix-picojson.patch @@ -0,0 +1,12 @@ +diff --git a/include/jwt-cpp/jwt.h b/include/jwt-cpp/jwt.h +index ec56810..a26fd97 100644 +--- a/include/jwt-cpp/jwt.h ++++ b/include/jwt-cpp/jwt.h +@@ -1,6 +1,6 @@ + #pragma once + #define PICOJSON_USE_INT64 +-#include "picojson.h" ++#include "picojson/picojson.h" + #include "base.h" + #include <set> + #include <chrono> diff --git a/ports/jwt-cpp/fix-warning.patch b/ports/jwt-cpp/fix-warning.patch new file mode 100644 index 000000000..d013a7782 --- /dev/null +++ b/ports/jwt-cpp/fix-warning.patch @@ -0,0 +1,31 @@ +diff --git a/include/jwt-cpp/base.h b/include/jwt-cpp/base.h +index dfca7fc..4d05c0b 100644 +--- a/include/jwt-cpp/base.h ++++ b/include/jwt-cpp/base.h +@@ -2,6 +2,10 @@ + #include <string> + #include <array> + ++#ifdef _MSC_VER ++#pragma warning(disable : 4267) ++#endif ++ + namespace jwt { + namespace alphabet { + struct base64 { +diff --git a/include/jwt-cpp/jwt.h b/include/jwt-cpp/jwt.h +index ec56810..313cef2 100644 +--- a/include/jwt-cpp/jwt.h ++++ b/include/jwt-cpp/jwt.h +@@ -12,6 +12,11 @@ + #include <openssl/ec.h> + #include <openssl/err.h> + ++#ifdef _MSC_VER ++#pragma warning(disable : 4267) ++#pragma warning(disable : 4067) ++#endif ++ + //If openssl version less than 1.1 + #if OPENSSL_VERSION_NUMBER < 269484032 + #define OPENSSL10 diff --git a/ports/jwt-cpp/portfile.cmake b/ports/jwt-cpp/portfile.cmake new file mode 100644 index 000000000..89ff9b04c --- /dev/null +++ b/ports/jwt-cpp/portfile.cmake @@ -0,0 +1,23 @@ +#header-only library +include(vcpkg_common_functions) + +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/jwt-cpp) + +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO Thalhammer/jwt-cpp + REF 1d2b1bac13e54f99df4f890cd674ec149c135762 + SHA512 a45f12104e38a8b05a0ea5b5f91034b65d85dd048664bbda4f2909df32688726d599161e3d6541fd6f36c784d21c24a4d2666f670c3281b9e9130bc8a96fce39 + HEAD_REF master + PATCHES fix-picojson.patch + fix-warning.patch) + +# Copy the header files +file(GLOB HEADER_FILES ${SOURCE_PATH}/include/jwt-cpp/*) +file(COPY ${HEADER_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/include/jwt-cpp + REGEX "\.(gitattributes|gitignore|picojson.h)$" EXCLUDE) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/jwt-cpp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/jwt-cpp/LICENSE ${CURRENT_PACKAGES_DIR}/share/jwt-cpp/copyright)
\ No newline at end of file diff --git a/ports/jxrlib/CONTROL b/ports/jxrlib/CONTROL index 2f8ba2aaf..f104c4c84 100644 --- a/ports/jxrlib/CONTROL +++ b/ports/jxrlib/CONTROL @@ -1,3 +1,4 @@ Source: jxrlib
-Version: 1.1-6
+Version: 1.1-7
+Homepage: https://github.com/4creators/jxrlib
Description: Open source implementation of the jpegxr image format standard.
diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index 49869b43f..43358fa15 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -25,14 +25,13 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(COPY ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxrlib) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/jxrlib/LICENSE ${CURRENT_PACKAGES_DIR}/share/jxrlib/copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) #install FindJXR.cmake file -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/JXR) - -vcpkg_copy_pdbs() +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) diff --git a/ports/jxrlib/vcpkg-cmake-wrapper.cmake b/ports/jxrlib/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..e95a66bdc --- /dev/null +++ b/ports/jxrlib/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +set(JXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +if(NOT JXR_LIBRARIES) + _find_package(${ARGS}) +endif() + +set(CMAKE_MODULE_PATH ${JXR_PREV_MODULE_PATH}) diff --git a/ports/kangaru/CONTROL b/ports/kangaru/CONTROL index 42f8277fd..6990d5190 100644 --- a/ports/kangaru/CONTROL +++ b/ports/kangaru/CONTROL @@ -1,3 +1,3 @@ Source: kangaru -Version: 4.1.2 +Version: 4.1.3-1 Description: A dependency injection container for C++11, C++14 and later diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake index 6de69896b..15af5ded0 100644 --- a/ports/kangaru/portfile.cmake +++ b/ports/kangaru/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gracicot/kangaru - REF v4.1.2 - SHA512 44ca94da38c80aa8495bb58cc26db0591d5e1b32b52c3ff242d95598856c5e84f25d7e7184c1e15e44d9a89987856740548fb070ad393cbe51da4bb79aa216d2 + REF v4.1.3 + SHA512 7cfec493dff475c8fe88e336638897096359d3781ab8944aa6bb8f5b68a4dbc993f769142d0143ae5db751159cee1b125ea2728e8b73747950572c84ea354090 HEAD_REF master ) @@ -15,11 +15,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/kangaru") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kangaru) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/debug ) diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL index 65b8419e6..b399126c1 100644 --- a/ports/kd-soap/CONTROL +++ b/ports/kd-soap/CONTROL @@ -1,4 +1,5 @@ Source: kd-soap
-Version: 1.7.0
-Description: A Qt-based client-side and server-side SOAP component http://www.kdab.com/products/kd-soap
+Version: 1.8.0
+Description: A Qt-based client-side and server-side SOAP component
+Homepage: https://www.kdab.com/products/kd-soap
Build-Depends: qt5-base
diff --git a/ports/kd-soap/kd-saop.patch b/ports/kd-soap/kd-soap.patch index 975a1c9f7..d48050faf 100644 --- a/ports/kd-soap/kd-saop.patch +++ b/ports/kd-soap/kd-soap.patch @@ -1,12 +1,12 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c3c824e..d7a1cce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -168,6 +168,6 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT)
- enable_testing()
- add_subdirectory(testtools)
- add_subdirectory(unittests)
-+ add_subdirectory(examples)
- endif()
-- add_subdirectory(examples)
- endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index c3c824e..d7a1cce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -168,6 +168,6 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT) + enable_testing() + add_subdirectory(testtools) + add_subdirectory(unittests) ++ add_subdirectory(examples) + endif() +- add_subdirectory(examples) + endif() diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index 2b49d114e..61102836c 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -3,15 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDAB/KDSoap
- REF 66a7804f157f51bc62c193b63a28918236bd7424
- SHA512 e9e2ac3ef714ebd5a85972c0eed613f88cc36f213df4fb938d61b58947972524f26f54a226f8e28ce47385cd859030a560781b4aebe3a25e672ac82b5477eeb8
+ REF kdsoap-1.8.0
+ SHA512 e118f2083887d1b5d613d793e87ec23a570a8a749ef7f4de65582998b735979b4c389a939169a893d735bdf110dc84a4cca5ee38146e4009be715902f6323bb9
HEAD_REF master
+ PATCHES kd-soap.patch
)
-vcpkg_apply_patches(
- SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/8236bd7424-79789c62ed
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/kd-saop.patch"
-)
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/kealib/CONTROL b/ports/kealib/CONTROL index 6426fd5fa..9e2b6549c 100644 --- a/ports/kealib/CONTROL +++ b/ports/kealib/CONTROL @@ -1,6 +1,7 @@ Source: kealib Version: 1.4.11 Build-Depends: hdf5[cpp], zlib, szip +Homepage: https://bitbucket.org/chchrsc/kealib Description: kealib is gdal model using HDF5 standard. Feature: parallel diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL index c3e0e5dee..942167471 100644 --- a/ports/kf5archive/CONTROL +++ b/ports/kf5archive/CONTROL @@ -1,4 +1,4 @@ Source: kf5archive
-Version: 5.50.0
+Version: 5.58.0 Description: File compression
Build-Depends: ecm, qt5-base, zlib, bzip2
\ No newline at end of file diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 6f587a096..4e028695f 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/karchive
- REF v5.50.0
- SHA512 519dd69ef76c9655cdf9d8f16484244469a6d5d2185c1d588bad325a401dd11f35699e3c115dfd52e5db38aa26aea3d9b35c7e83b76a36bda926574a7d3ce50f
+ REF v5.58.0 + SHA512 8ac1ff25db7e27881cbea640744639a087a8fc87251337bca5c557b3ef3ec2b3490d3d1f2caf8fc22e0671dad1945e9263a59d22e4d1c395bd3b422cbb7ad1de
HEAD_REF master
)
diff --git a/ports/kf5holidays/CONTROL b/ports/kf5holidays/CONTROL index cd1e09ccf..7110145aa 100644 --- a/ports/kf5holidays/CONTROL +++ b/ports/kf5holidays/CONTROL @@ -1,4 +1,4 @@ Source: kf5holidays
-Version: 5.50.0
+Version: 5.58.0 Description: Holiday calculation library
Build-Depends: ecm, qt5-base, qt5-declarative, qt5-tools
\ No newline at end of file diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index b56abec1a..64209c5cb 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kholidays
- REF v5.50.0
- SHA512 01c1258213e1bbab90b9af9c41965599637b1ccd4cd285cbe9bc11579fae1363162567ae14c33001b8b1cc085bae4dfdf4ed79b7ff27f93187bce79db662b4e2
+ REF v5.58.0 + SHA512 1451603816617eef7e37c67085d12f34ce2e4b10db97220222450c9a7c5dc3200479718b86ea39b279bab93651790a8c70941ac1280458de7864ca04f9cf6471
HEAD_REF master
)
diff --git a/ports/kf5plotting/CONTROL b/ports/kf5plotting/CONTROL index 70439a5dc..0b75bd8c1 100644 --- a/ports/kf5plotting/CONTROL +++ b/ports/kf5plotting/CONTROL @@ -1,4 +1,5 @@ Source: kf5plotting -Version: 5.50.0 +Version: 5.58.0 +Homepage: https://api.kde.org/frameworks/kplotting/html/index.html Description: Lightweight plotting framework Build-Depends: ecm, qt5-base diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index 36f862d13..a5a4e1d46 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kplotting - REF v5.50.0 - SHA512 512a0f8e8a5147f06345d86fa29effa8d0a59b62f5a24b70a09c4ddf5204d626e13f421be7c42d2103c5634e863db5ac8e6763db886351597f0798e05bc97f33 + REF v5.58.0 + SHA512 4d2fd69bad6c3117084811453bd32fdd92d1f1df89dba489e6109caad9268107d908e0df6f3e35a460878aa32fe4744173cf96ff292858d657c49582ee1674fc HEAD_REF master ) diff --git a/ports/kinectsdk2/portfile.cmake b/ports/kinectsdk2/portfile.cmake index a4b89b521..bd2080c04 100644 --- a/ports/kinectsdk2/portfile.cmake +++ b/ports/kinectsdk2/portfile.cmake @@ -1,20 +1,8 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "Kinectsdk2's buildsystem uses very long paths and may fail on your system.\n" + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() diff --git a/ports/laszip/CONTROL b/ports/laszip/CONTROL index 5f6bac68b..c528a4879 100644 --- a/ports/laszip/CONTROL +++ b/ports/laszip/CONTROL @@ -1,3 +1,3 @@ Source: laszip
-Version: 3.2.2-1
+Version: 3.4.1 Description: LASzip - free and lossless LiDAR compression
diff --git a/ports/laszip/portfile.cmake b/ports/laszip/portfile.cmake index 92edbafb7..b72f7a0a2 100644 --- a/ports/laszip/portfile.cmake +++ b/ports/laszip/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LASzip/LASzip
- REF 3.2.2
- SHA512 c4dac1fd525b1889fa8cc77f168bc3c83053619402ec13ac0ae58665cfd4440b9135ce30c4ade925a0ac9db7e3f717344859e511b2207841c84dc2453c6cf7f7
+ REF 3.4.1 + SHA512 875303d4672c61778694b8a969cc1e4239564f2fa81b35cba472f7eb28c71ca9bf052ca633dcdc8cbfb486a6c6849caed9833669fd1ba0aa5ee0065e7e2013f1
HEAD_REF master
)
diff --git a/ports/lcm/CONTROL b/ports/lcm/CONTROL index 0cca68404..1eb187ef7 100644 --- a/ports/lcm/CONTROL +++ b/ports/lcm/CONTROL @@ -1,5 +1,6 @@ Source: lcm -Version: 1.3.95-1 +Version: 1.4.0 Build-Depends: glib +Homepage: https://github.com/lcm-proj/lcm Description: Lightweight Communications and Marshalling (LCM) LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages. diff --git a/ports/lcm/fix-build-error.patch b/ports/lcm/fix-build-error.patch new file mode 100644 index 000000000..ffca33d79 --- /dev/null +++ b/ports/lcm/fix-build-error.patch @@ -0,0 +1,32 @@ +diff --git a/lcm/windows/WinPorting.cpp b/lcm/windows/WinPorting.cpp +index e22acd6..b9c7e69 100644 +--- a/lcm/windows/WinPorting.cpp ++++ b/lcm/windows/WinPorting.cpp +@@ -1,8 +1,8 @@ + + #define _WIN32_WINNT 0x0501 +-#include <Mswsock.h> + #include <stdio.h> + #include <winsock2.h> ++#include <Mswsock.h> + + #include "WinPorting.h" + +diff --git a/lcmgen/emit_go.c b/lcmgen/emit_go.c +index c520044..b5be56a 100644 +--- a/lcmgen/emit_go.c ++++ b/lcmgen/emit_go.c +@@ -6,8 +6,13 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#ifdef WIN32 ++#include <io.h> ++#else + #include <unistd.h> ++#endif + #ifdef WIN32 ++#define F_OK 0 + #define __STDC_FORMAT_MACROS // Enable integer types + #endif + diff --git a/ports/lcm/portfile.cmake b/ports/lcm/portfile.cmake index b50139f62..ef1633d84 100644 --- a/ports/lcm/portfile.cmake +++ b/ports/lcm/portfile.cmake @@ -3,14 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lcm-proj/lcm - REF 82bd3a223e3227c70832307e53a65c13c1e5f81b - SHA512 5d3abf457e18a3bb50489ed17393c5416a459134f73c264e67d174a29411d6deb70c754b5669422a438ea3e5793b9b1b91d67e9d842151c5a910245fede5879f + REF v1.4.0 + SHA512 ca036aa2c31911e0bfaeab9665188c97726201267314693a1c333c4efe13ea598b39a55a19bc1d48e65462ac9d1716adfda5af86c645d59c3247192631247cc6 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/only-install-one-flavor.patch + PATCHES only-install-one-flavor.patch + fix-build-error.patch ) vcpkg_configure_cmake( diff --git a/ports/lcms/CONTROL b/ports/lcms/CONTROL index fd9c9d429..b42c827d4 100644 --- a/ports/lcms/CONTROL +++ b/ports/lcms/CONTROL @@ -1,4 +1,5 @@ Source: lcms -Version: 2.8-5 +Version: 2.9 Build-Depends: +Homepage: https://github.com/mm2/Little-CMS Description: Little CMS. diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 4e125fa86..deb6c9d3c 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mm2/Little-CMS - REF lcms2.8 - SHA512 22ee94aa3333db4248607d8aa84343d324e04b30c154c46672c6f668e14a369b9b72f2557b8465218b6e9a2676cf8fa37d617b4aa13a013dc2337197a599e63a + REF lcms2.9 + SHA512 b565ed3714c9beaf13e15b3798abbc6c295443357c8db3299cecd9794620bb1d7c50ad258cf887c7bbf66efacb8d8699a7ee579f8c73598740915caa3044ae70 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/remove_library_directive.patch" ) diff --git a/ports/leptonica/CONTROL b/ports/leptonica/CONTROL index 5fd60614d..39a0a5e5c 100644 --- a/ports/leptonica/CONTROL +++ b/ports/leptonica/CONTROL @@ -1,4 +1,5 @@ Source: leptonica -Version: 1.76.0 +Version: 1.76.0-1 +Homepage: https://github.com/DanBloomberg/leptonica Description: An open source library containing software that is broadly useful for image processing and image analysis applications Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index d42fa6b90..34a1c379e 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -24,7 +24,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake") +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) vcpkg_copy_pdbs() diff --git a/ports/lest/CONTROL b/ports/lest/CONTROL index 20913e218..38b01027b 100644 --- a/ports/lest/CONTROL +++ b/ports/lest/CONTROL @@ -1,3 +1,3 @@ Source: lest
-Version: 1.34.1
+Version: 1.35.1 Description: A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)
diff --git a/ports/lest/portfile.cmake b/ports/lest/portfile.cmake index cb2d9a080..d5948d97b 100644 --- a/ports/lest/portfile.cmake +++ b/ports/lest/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/lest
- REF v1.34.1
- SHA512 7f4b0e49c1cf4c55d21752259ee45f9265aba254b9c15f84e77f9ae3e5ef3443abcb43fafe8e16d84bbdffee72dae842de0ed661c2caeb9607fcb188eb3ec7d1
+ REF v1.35.1 + SHA512 06b786cbca37cb4d20737d040176bf34398090d566310b88558b788804d8b832c682f1814f5c68ef11192243dbde5643e73b78be4fb1407b831bcde43adb002c
)
file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/leveldb/CMakeLists.txt b/ports/leveldb/CMakeLists.txt deleted file mode 100644 index d19032582..000000000 --- a/ports/leveldb/CMakeLists.txt +++ /dev/null @@ -1,92 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(leveldb C CXX) - -option(INSTALL_HEADERS "Install header files" ON) - -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -IF (MSVC) -add_definitions( - -DWIN32 - -D_CRT_NONSTDC_NO_DEPRECATE - -D_SCL_SECURE_NO_WARNINGS - -D_CRT_SECURE_NO_WARNINGS - -DNOMINMAX - -DLEVELDB_PLATFORM_WINDOWS - -DLEVELDB_ATOMIC_PRESENT -) -else () -add_definitions( - -DLEVELDB_PLATFORM_POSIX - -DLEVELDB_ATOMIC_PRESENT -) -endif() -set(SRCS - db/builder.cc - db/c.cc - db/dbformat.cc - db/db_impl.cc - db/db_iter.cc - db/dumpfile.cc - db/filename.cc - db/log_reader.cc - db/log_writer.cc - db/memtable.cc - db/repair.cc - db/table_cache.cc - db/version_edit.cc - db/version_set.cc - db/write_batch.cc - helpers/memenv/memenv.cc - port/port_posix_sse.cc - table/block.cc - table/block_builder.cc - table/filter_block.cc - table/format.cc - table/iterator.cc - table/merger.cc - table/table.cc - table/table_builder.cc - table/two_level_iterator.cc - util/arena.cc - util/bloom.cc - util/cache.cc - util/coding.cc - util/comparator.cc - util/crc32c.cc - util/env.cc - util/filter_policy.cc - util/hash.cc - util/histogram.cc - util/logging.cc - util/options.cc - util/status.cc -) - -if (MSVC) -set(SRCS ${SRCS} port/port_win.cc util/env_win.cc) -else () -set(SRCS ${SRCS} port/port_posix.cc util/env_posix.cc) -ENDIF() - -add_library(leveldb ${SRCS}) - -target_include_directories(leveldb - PUBLIC include - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_link_libraries(leveldb PUBLIC Iphlpapi.lib Shlwapi.lib) - -install(TARGETS leveldb - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -if(INSTALL_HEADERS) - file(GLOB HEADERS include/leveldb/*.h) - install(FILES ${HEADERS} DESTINATION include/leveldb) - install(FILES helpers/memenv/memenv.h DESTINATION include) -endif() diff --git a/ports/leveldb/CONTROL b/ports/leveldb/CONTROL index 5f95fda4b..022415d26 100644 --- a/ports/leveldb/CONTROL +++ b/ports/leveldb/CONTROL @@ -1,3 +1,4 @@ -Source: leveldb
-Version: 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-3
-Description: LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.
+Source: leveldb +Version: 1.22 +Homepage: https://github.com/bitcoin-core/leveldb +Description: LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values. diff --git a/ports/leveldb/fix-install_path.patch b/ports/leveldb/fix-install_path.patch new file mode 100644 index 000000000..11a71a41a --- /dev/null +++ b/ports/leveldb/fix-install_path.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1409c06..c81d219 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -440,12 +440,12 @@ if(LEVELDB_INSTALL) + install( + EXPORT leveldbTargets + NAMESPACE leveldb:: +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/leveldb" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/../share/leveldb" + ) + install( + FILES + "${PROJECT_SOURCE_DIR}/cmake/leveldbConfig.cmake" + "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/leveldb" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/../share/leveldb" + ) + endif(LEVELDB_INSTALL) diff --git a/ports/leveldb/msvc_code_fix.diff b/ports/leveldb/msvc_code_fix.diff deleted file mode 100644 index 6cab006d3..000000000 --- a/ports/leveldb/msvc_code_fix.diff +++ /dev/null @@ -1,63 +0,0 @@ - db/c.cc | 2 ++ - port/port_win.h | 7 +++++++ - util/env_win.cc | 6 ++++-- - 3 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/db/c.cc b/db/c.cc -index 08ff0ad..b23e3dc 100644 ---- a/db/c.cc -+++ b/db/c.cc -@@ -5,7 +5,9 @@ - #include "leveldb/c.h" - - #include <stdlib.h> -+#ifndef WIN32 - #include <unistd.h> -+#endif - #include "leveldb/cache.h" - #include "leveldb/comparator.h" - #include "leveldb/db.h" -diff --git a/port/port_win.h b/port/port_win.h -index e8bf46e..989c15c 100644 ---- a/port/port_win.h -+++ b/port/port_win.h -@@ -32,9 +32,16 @@ - #define STORAGE_LEVELDB_PORT_PORT_WIN_H_ - - #ifdef _MSC_VER -+#if !(_MSC_VER >= 1900) - #define snprintf _snprintf -+#endif - #define close _close - #define fread_unlocked _fread_nolock -+#ifdef _WIN64 -+#define ssize_t int64_t -+#else -+#define ssize_t int32_t -+#endif - #endif - - #include <string> -diff --git a/util/env_win.cc b/util/env_win.cc -index d32c4e6..3b4c92b 100644 ---- a/util/env_win.cc -+++ b/util/env_win.cc -@@ -761,14 +761,16 @@ uint64_t Win32Env::NowMicros() - static Status CreateDirInner( const std::string& dirname ) - { - Status sRet; -- DWORD attr = ::GetFileAttributes(dirname.c_str()); -+ std::wstring dirnameW; -+ ToWidePath(dirname, dirnameW); -+ DWORD attr = ::GetFileAttributesW(dirnameW.c_str()); - if (attr == INVALID_FILE_ATTRIBUTES) { // doesn't exist: - std::size_t slash = dirname.find_last_of("\\"); - if (slash != std::string::npos){ - sRet = CreateDirInner(dirname.substr(0, slash)); - if (!sRet.ok()) return sRet; - } -- BOOL result = ::CreateDirectory(dirname.c_str(), NULL); -+ BOOL result = ::CreateDirectoryW(dirnameW.c_str(), NULL); - if (result == FALSE) { - sRet = Status::IOError(dirname, "Could not create directory."); - return sRet; diff --git a/ports/leveldb/portfile.cmake b/ports/leveldb/portfile.cmake index 6a2555e5c..02e18c430 100644 --- a/ports/leveldb/portfile.cmake +++ b/ports/leveldb/portfile.cmake @@ -4,17 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- BRANCH "bitcoin-fork"
- REPO "bitcoin-core/leveldb"
- REF "8b1cd3753b184341e837b30383832645135d3d73"
- SHA512 f5ad5fd21fb28ee052a4f3873abd58dab508c71621bcd482ab9e6ef4b57eca182c81502ddfe59736f5b2a54f2d05b397dd15982b3bd5d9039cd481eae3c7b958
+ REPO "google/leveldb"
+ REF 1.22
+ SHA512 f9bbf5f466e7f707b94e19261762319ea9f65d41911690e84f59098551e2e69beccf756a414d705ade74ee96fd979bdb8b94c171c6f2cc83873cbd4a9380dbab
+ HEAD_REF master
+ PATCHES
+ fix-install_path.patch
)
-vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/msvc_code_fix.diff)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
@@ -23,5 +20,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
+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)
diff --git a/ports/libaiff/CONTROL b/ports/libaiff/CONTROL index 0ed9a9cf2..6dbed3fcf 100644 --- a/ports/libaiff/CONTROL +++ b/ports/libaiff/CONTROL @@ -1,3 +1,4 @@ Source: libaiff
Version: 5.0-1
+Homepage: https://sourceforge.net/projects/aifftools
Description: LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL index 7cb34cd94..b39593aa9 100644 --- a/ports/libarchive/CONTROL +++ b/ports/libarchive/CONTROL @@ -1,5 +1,6 @@ Source: libarchive
Version: 3.3.3-3
+Homepage: https://github.com/libarchive/libarchive
Description: Library for reading and writing streaming archives
Build-Depends: zlib
Default-Features: bzip2, libxml2, lz4, lzma, lzo, openssl
diff --git a/ports/libbf/CONTROL b/ports/libbf/CONTROL index 3b51a52e1..35ee0fbcc 100644 --- a/ports/libbf/CONTROL +++ b/ports/libbf/CONTROL @@ -1,3 +1,3 @@ Source: libbf -Version: 1.0.0 +Version: 1.0.0-1 Description: Bloom filters for C++11.
\ No newline at end of file diff --git a/ports/libbf/portfile.cmake b/ports/libbf/portfile.cmake index b339e94cc..c7a9ef42e 100644 --- a/ports/libbf/portfile.cmake +++ b/ports/libbf/portfile.cmake @@ -1,4 +1,4 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "libbf does not support MSVC") endif() diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL index 541286c50..f5ae2330d 100644 --- a/ports/libbson/CONTROL +++ b/ports/libbson/CONTROL @@ -1,3 +1,4 @@ Source: libbson -Version: 1.13.0 +Version: 1.14.0-1 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents. +Homepage: https://github.com/mongodb/libbson diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index dc4de34dd..c682ae086 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,10 +1,11 @@ include(vcpkg_common_functions)
+set(BUILD_VERSION 1.14.0)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mongodb/mongo-c-driver
- REF 1.13.0
- SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
+ REF ${BUILD_VERSION}
+ SHA512 bf2bb835543dd2a445aac6cafa7bbbf90921ec41014534779924a5eb7cbd9fd532acd8146ce81dfcf1bcac33a78d8fce22b962ed7f776449e4357eccab8d6110
HEAD_REF master
PATCHES fix-uwp.patch
)
@@ -24,13 +25,14 @@ vcpkg_configure_cmake( -DENABLE_TESTS=OFF
-DENABLE_EXAMPLES=OFF
-DENABLE_STATIC=${ENABLE_STATIC}
+ -DBUILD_VERSION=${BUILD_VERSION}
)
vcpkg_install_cmake()
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libbson-static-1.0")
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libbson-static-1.0)
else()
- vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libbson-1.0")
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libbson-1.0)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver)
diff --git a/ports/libcds/CONTROL b/ports/libcds/CONTROL index 1707512fd..5c3062318 100644 --- a/ports/libcds/CONTROL +++ b/ports/libcds/CONTROL @@ -1,4 +1,5 @@ Source: libcds Version: 2.3.3 Build-Depends: boost-system, boost-thread +Homepage: https://github.com/khizmax/libcds Description: a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR. diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL index fceb37bd3..8b64a280e 100644 --- a/ports/libconfig/CONTROL +++ b/ports/libconfig/CONTROL @@ -1,3 +1,4 @@ Source: libconfig Version: 1.7.2 +Homepage: https://github.com/hyperrealm/libconfig Description: C/C++ library for processing configuration files diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt new file mode 100644 index 000000000..ff11792ff --- /dev/null +++ b/ports/libcroco/CMakeLists.txt @@ -0,0 +1,139 @@ +cmake_minimum_required(VERSION 3.11) +project(libcroco C) + +find_package(unofficial-iconv REQUIRED) +find_package(unofficial-gettext CONFIG REQUIRED) +find_package(unofficial-glib CONFIG REQUIRED) +find_package(LibXml2 REQUIRED) +if(NOT WIN32) + find_package(Threads REQUIRED) +endif() +find_path(GLIB_INCLUDE_DIR glib.h) + +file(GLOB SOURCES + src/cr-utils.c + src/cr-utils.h + src/cr-input.c + src/cr-input.h + src/cr-enc-handler.c + src/cr-enc-handler.h + src/cr-num.c + src/cr-num.h + src/cr-rgb.c + src/cr-rgb.h + src/cr-token.c + src/cr-token.h + src/cr-tknzr.c + src/cr-tknzr.h + src/cr-term.c + src/cr-term.h + src/cr-attr-sel.c + src/cr-attr-sel.h + src/cr-pseudo.c + src/cr-pseudo.h + src/cr-additional-sel.c + src/cr-additional-sel.h + src/cr-simple-sel.c + src/cr-simple-sel.h + src/cr-selector.c + src/cr-selector.h + src/cr-doc-handler.c + src/cr-doc-handler.h + src/cr-parser.c + src/cr-parser.h + src/cr-declaration.c + src/cr-declaration.h + src/cr-statement.c + src/cr-statement.h + src/cr-stylesheet.c + src/cr-stylesheet.h + src/cr-cascade.c + src/cr-cascade.h + src/cr-om-parser.c + src/cr-om-parser.h + src/cr-style.c + src/cr-style.h + src/cr-sel-eng.c + src/cr-sel-eng.h + src/cr-fonts.c + src/cr-fonts.h + src/cr-prop-list.c + src/cr-prop-list.h + src/cr-parsing-location.c + src/cr-parsing-location.h + src/cr-string.c + src/cr-string.h + src/libcroco.def +) + +set(CMAKE_DEBUG_POSTFIX "d") + +add_library(croco-0.6 ${SOURCES}) + +target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) +target_link_libraries(croco-0.6 PRIVATE + unofficial::glib::gio + unofficial::glib::glib + unofficial::glib::gmodule + unofficial::glib::gobject + ${LIBXML2_LIBRARIES} +) + +install(TARGETS croco-0.6 + EXPORT libcroco-targets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES + src/libcroco.h + src/cr-additional-sel.h + src/cr-attr-sel.h + src/cr-cascade.h + src/cr-declaration.h + src/cr-doc-handler.h + src/cr-enc-handler.h + src/cr-input.h + src/cr-num.h + src/cr-om-parser.h + src/cr-parser.h + src/cr-pseudo.h + src/cr-rgb.h + src/cr-selector.h + src/cr-simple-sel.h + src/cr-statement.h + src/cr-stylesheet.h + src/cr-term.h + src/cr-tknzr.h + src/cr-token.h + src/cr-utils.h + src/cr-fonts.h + src/cr-sel-eng.h + src/cr-style.h + src/cr-prop-list.h + src/cr-parsing-location.h + src/cr-string.h + src/libcroco-config.h + DESTINATION include/libcroco +) + +install( + EXPORT libcroco-targets + NAMESPACE unofficial::libcroco:: + FILE unofficial-libcroco-targets.cmake + DESTINATION share/unofficial-libcroco +) + +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake " +include(CMakeFindDependencyMacro) +find_dependency(unofficial-gettext) +find_dependency(unofficial-iconv CONFIG) +find_dependency(unofficial-glib CONFIG) +find_dependency(LibXml2) +if(NOT WIN32) + find_dependency(Threads) +endif() +include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-libcroco-targets.cmake) +") +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake DESTINATION share/unofficial-libcroco) diff --git a/ports/libcroco/CONTROL b/ports/libcroco/CONTROL new file mode 100644 index 000000000..8badbeccc --- /dev/null +++ b/ports/libcroco/CONTROL @@ -0,0 +1,4 @@ +Source: libcroco
+Version: 0.6.13-1
+Description: A standalone css2 parsing and manipulation library
+Build-Depends: glib, libxml2
diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake new file mode 100644 index 000000000..b5c332306 --- /dev/null +++ b/ports/libcroco/portfile.cmake @@ -0,0 +1,36 @@ +include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://download.gnome.org/sources/libcroco/0.6/libcroco-0.6.13.tar.xz"
+ FILENAME "libcroco-0.6.13.tar.xz"
+ SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+configure_file(${SOURCE_PATH}/config.h.win32 ${SOURCE_PATH}/src/config.h COPYONLY)
+file(READ "${SOURCE_PATH}/src/libcroco.symbols" SYMBOLS)
+string(REGEX REPLACE ";[^\n]*\n" "" DEF "EXPORTS\n${SYMBOLS}")
+file(WRITE "${SOURCE_PATH}/src/libcroco.def" "${DEF}")
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libcroco TARGET_PATH share/unofficial-libcroco)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcroco RENAME copyright)
+
+vcpkg_copy_pdbs()
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME libcroco)
diff --git a/ports/libdatrie/CONTROL b/ports/libdatrie/CONTROL index 8b9747fd7..587063ec5 100644 --- a/ports/libdatrie/CONTROL +++ b/ports/libdatrie/CONTROL @@ -1,4 +1,5 @@ Source: libdatrie Version: 0.2.10-2 +Homepage: https://linux.thai.net/pub/ThaiLinux/software/libthai Description: implementation of double-array structure for representing trie Build-Depends: libiconv diff --git a/ports/libdisasm/CONTROL b/ports/libdisasm/CONTROL index e55dfab7d..dae49116d 100644 --- a/ports/libdisasm/CONTROL +++ b/ports/libdisasm/CONTROL @@ -1,3 +1,4 @@ Source: libdisasm
Version: 0.23-2
+Homepage: https://sourceforge.net/projects/bastard
Description: x86 Disassembler Library.
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index 819813e91..acab175c5 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,3 +1,4 @@ Source: libepoxy
-Version: 1.4.3-2
+Version: 1.5.3
+Homepage: https://github.com/anholt/libepoxy
Description: Epoxy is a library for handling OpenGL function pointer management for you
diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 12c4742b6..d4fc00fbc 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO anholt/libepoxy - REF 1.4.3 - SHA512 41c7a4eea66c89346b0ec71407b2d22bf645ed0ef81ebad560370903f138ed48abb6bc6bcc88c75a3a05497acc6720397db828d61301599c05040263a9f4f7f0 + REF 1.5.3 + SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8 HEAD_REF master) vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL index e9577f803..2534bf1f6 100644 --- a/ports/libevent/CONTROL +++ b/ports/libevent/CONTROL @@ -1,4 +1,5 @@ Source: libevent
Version: 2.1.8-5
Build-Depends: openssl
+Homepage: https://github.com/libevent/libevent
Description: An event notification library
diff --git a/ports/libexif/CONTROL b/ports/libexif/CONTROL index 427d907f2..d99eb31b9 100644 --- a/ports/libexif/CONTROL +++ b/ports/libexif/CONTROL @@ -1,3 +1,4 @@ Source: libexif Version: 0.6.21-1 +Homepage: https://sourceforge.net/projects/libexif/ Description: a library for parsing, editing, and saving EXIF data diff --git a/ports/libfabric/CONTROL b/ports/libfabric/CONTROL new file mode 100644 index 000000000..931d10f5e --- /dev/null +++ b/ports/libfabric/CONTROL @@ -0,0 +1,5 @@ +Source: libfabric
+Version: 1.7.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
+Build-Depends: networkdirect-sdk (windows)
diff --git a/ports/libfabric/add_additional_includes.patch b/ports/libfabric/add_additional_includes.patch new file mode 100644 index 000000000..377a810d2 --- /dev/null +++ b/ports/libfabric/add_additional_includes.patch @@ -0,0 +1,58 @@ +diff --git a/libfabric.vcxproj b/libfabric.vcxproj
+index 43a05e7..ceb596f 100644
+--- a/libfabric.vcxproj
++++ b/libfabric.vcxproj
+@@ -125,7 +125,7 @@
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+- <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>$(AdditionalIncludeDirectories);$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsC</CompileAs>
+ <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
+ <C99Support>true</C99Support>
+@@ -148,7 +148,7 @@
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+- <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>$(AdditionalIncludeDirectories);$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsC</CompileAs>
+ <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
+ <C99Support>true</C99Support>
+@@ -171,7 +171,7 @@
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+- <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>$(AdditionalIncludeDirectories);$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsC</CompileAs>
+ <DisableSpecificWarnings>4127;4200;94;4204;4221;869</DisableSpecificWarnings>
+ <C99Support>true</C99Support>
+@@ -195,7 +195,7 @@
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+- <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>$(AdditionalIncludeDirectories);$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
+ <C99Support>true</C99Support>
+ <ShowIncludes>false</ShowIncludes>
+@@ -220,7 +220,7 @@
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+- <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>$(AdditionalIncludeDirectories);$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4127;4200;4204;4221;4115;4201;4100</DisableSpecificWarnings>
+ <C99Support>true</C99Support>
+ <ShowIncludes>false</ShowIncludes>
+@@ -245,7 +245,7 @@
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <SDLCheck>true</SDLCheck>
+- <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>$(AdditionalIncludeDirectories);$(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4127;4200;94;4204;4221;869</DisableSpecificWarnings>
+ <C99Support>true</C99Support>
+ <ShowIncludes>false</ShowIncludes>
diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake new file mode 100644 index 000000000..f7dc21226 --- /dev/null +++ b/ports/libfabric/portfile.cmake @@ -0,0 +1,46 @@ +include(vcpkg_common_functions)
+
+if (VCPKG_CMAKE_SYSTEM_NAME)
+ # The library supports Linux/Darwin/BSD, it is just not yet added here
+ message(FATAL_ERROR "vcpkg libfabric currently suports windows. Please consider a pull request to add additional support!")
+endif()
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO ofiwg/libfabric
+ REF v1.7.1
+ HEAD_REF master
+ SHA512 3ae06839295a5b581a5d9936ee991bb597672a4981cc7fa385f4db7645d5328156d758848827ec186c0056cf3abd97f8f3859ec16a8b5bbd0d1f979143ee7bb1
+ PATCHES
+ add_additional_includes.patch
+)
+
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+ message(FATAL_ERROR "VCPKG BUILD ERROR: libfabric only supports x64")
+endif()
+
+set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v141")
+set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v141")
+
+vcpkg_install_msbuild(
+ SOURCE_PATH ${SOURCE_PATH}
+ PROJECT_SUBPATH libfabric.vcxproj
+ INCLUDES_SUBPATH include
+ LICENSE_SUBPATH COPYING
+ PLATFORM "x64"
+ RELEASE_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION}
+ DEBUG_CONFIGURATION ${LIBFABRIC_RELEASE_CONFIGURATION}
+ USE_VCPKG_INTEGRATION
+ ALLOW_ROOT_INCLUDES
+ OPTIONS
+ /p:SolutionDir=${SOURCE_PATH}
+ /p:AdditionalIncludeDirectories="${CURRENT_INSTALLED_DIR}/include"
+)
+
+#Move includes under subdirectory to avoid colisions with other libraries
+file(RENAME ${CURRENT_PACKAGES_DIR}/include ${CURRENT_PACKAGES_DIR}/includetemp)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
+file(RENAME ${CURRENT_PACKAGES_DIR}/includetemp ${CURRENT_PACKAGES_DIR}/include/libfabric)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libfabric RENAME copyright)
diff --git a/ports/libffi/CONTROL b/ports/libffi/CONTROL index 882d7ca94..b393491e1 100644 --- a/ports/libffi/CONTROL +++ b/ports/libffi/CONTROL @@ -1,3 +1,4 @@ Source: libffi
Version: 3.1-5
+Homepage: https://github.com/libffi/libffi
Description: Portable, high level programming interface to various calling conventions
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL index afdb70cbe..53ec5a95b 100644 --- a/ports/libflac/CONTROL +++ b/ports/libflac/CONTROL @@ -1,4 +1,5 @@ Source: libflac
Version: 1.3.2-6
+Homepage: https://xiph.org/flac/
Description: Library for manipulating FLAC files
Build-Depends: libogg
diff --git a/ports/libfreenect2/CONTROL b/ports/libfreenect2/CONTROL index 7f6ba98df..bb0b63871 100644 --- a/ports/libfreenect2/CONTROL +++ b/ports/libfreenect2/CONTROL @@ -1,4 +1,5 @@ Source: libfreenect2 -Version: 0.2.0-1 +Version: 0.2.0-2 Build-Depends: libusb, libjpeg-turbo +Homepage: https://github.com/OpenKinect/libfreenect2 Description: Open source drivers for the Kinect for Windows v2 device diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index ba41bb904..839c7073e 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/freenect2") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/freenect2) vcpkg_copy_pdbs() diff --git a/ports/libftdi/CONTROL b/ports/libftdi/CONTROL new file mode 100644 index 000000000..3c50a00e2 --- /dev/null +++ b/ports/libftdi/CONTROL @@ -0,0 +1,4 @@ +Source: libftdi
+Version: 0.20
+Build-Depends: libusb-win32
+Description: FTDI USB driver with bitbang mode (v0.20)
diff --git a/ports/libftdi/export-cmake.patch b/ports/libftdi/export-cmake.patch new file mode 100644 index 000000000..29078c25d --- /dev/null +++ b/ports/libftdi/export-cmake.patch @@ -0,0 +1,24 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1c326fe..3c1d9ab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -47,14 +47,19 @@ if(WIN32 OR 1) + + if(BUILD_SHARED_LIBS) + install( TARGETS ftdi ++ EXPORT ftdi + COMPONENT sharedlibs + ) + ++ target_link_libraries(ftdi PUBLIC $<INSTALL_INTERFACE:include>) + else() + install( TARGETS ftdi-static ++ EXPORT ftdi + COMPONENT staticlibs + ) ++ target_link_libraries(ftdi-static PUBLIC $<INSTALL_INTERFACE:include>) + endif() ++ install(EXPORT ftdi FILE libftdi-config.cmake NAMESPACE libftdi:: DESTINATION share/libftdi) + + install( FILES ${c_headers} + DESTINATION include diff --git a/ports/libftdi/exports.def b/ports/libftdi/exports.def new file mode 100644 index 000000000..31ebd214e --- /dev/null +++ b/ports/libftdi/exports.def @@ -0,0 +1,56 @@ +EXPORTS
+ ftdi_deinit
+ ftdi_disable_bitbang
+ ftdi_eeprom_build
+ ftdi_eeprom_decode
+ ftdi_eeprom_free
+ ftdi_eeprom_initdefaults
+ ftdi_eeprom_setsize
+ ftdi_enable_bitbang
+ ftdi_erase_eeprom
+ ftdi_free
+ ftdi_get_error_string
+ ftdi_get_latency_timer
+ ftdi_init
+ ftdi_list_free
+ ftdi_list_free2
+ ftdi_new
+ ftdi_poll_modem_status
+ ftdi_read_chipid
+ ftdi_read_data
+ ftdi_read_data_get_chunksize
+ ftdi_read_data_set_chunksize
+ ftdi_read_eeprom
+ ftdi_read_eeprom_getsize
+ ftdi_read_eeprom_location
+ ftdi_read_pins
+ ftdi_set_baudrate
+ ftdi_set_bitmode
+ ftdi_set_error_char
+ ftdi_set_event_char
+ ftdi_set_interface
+ ftdi_set_latency_timer
+ ftdi_set_line_property
+ ftdi_set_line_property2
+ ftdi_set_usbdev
+ ftdi_setdtr
+ ftdi_setdtr_rts
+ ftdi_setflowctrl
+ ftdi_setrts
+ ftdi_usb_close
+ ftdi_usb_find_all
+ ftdi_usb_get_strings
+ ftdi_usb_open
+ ftdi_usb_open_desc
+ ftdi_usb_open_desc_index
+ ftdi_usb_open_dev
+ ftdi_usb_open_string
+ ftdi_usb_purge_buffers
+ ftdi_usb_purge_rx_buffer
+ ftdi_usb_purge_tx_buffer
+ ftdi_usb_reset
+ ftdi_write_data
+ ftdi_write_data_get_chunksize
+ ftdi_write_data_set_chunksize
+ ftdi_write_eeprom
+ ftdi_write_eeprom_location
diff --git a/ports/libftdi/libusb-win32.patch b/ports/libftdi/libusb-win32.patch new file mode 100644 index 000000000..55bc1c3f1 --- /dev/null +++ b/ports/libftdi/libusb-win32.patch @@ -0,0 +1,43 @@ +diff --git a/FindUSB.cmake b/FindUSB.cmake
+index 566cdd8..0710345 100644
+--- a/FindUSB.cmake
++++ b/FindUSB.cmake
+@@ -24,10 +24,10 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+ pkg_check_modules(PC_LIBUSB libusb)
+ ENDIF(NOT WIN32)
+
+- FIND_PATH(LIBUSB_INCLUDE_DIR usb.h
++ FIND_PATH(LIBUSB_INCLUDE_DIR lusb0_usb.h
+ PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
+
+- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb
++ FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb0 libusb0
+ PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
+
+ include(FindPackageHandleStandardArgs)
+diff --git a/src/ftdi.c b/src/ftdi.c
+index 980622d..8f6ab67 100644
+--- a/src/ftdi.c
++++ b/src/ftdi.c
+@@ -28,7 +28,7 @@
+ /** \addtogroup libftdi */
+ /* @{ */
+
+-#include <usb.h>
++#include <lusb0_usb.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <stdio.h>
+diff --git a/src/ftdi.h b/src/ftdi.h
+index 6bb7a3e..d4472c2 100644
+--- a/src/ftdi.h
++++ b/src/ftdi.h
+@@ -17,7 +17,7 @@
+ #ifndef __libftdi_h__
+ #define __libftdi_h__
+
+-#include <usb.h>
++#include <lusb0_usb.h>
+
+ #define FTDI_DEFAULT_EEPROM_SIZE 128
+
diff --git a/ports/libftdi/portfile.cmake b/ports/libftdi/portfile.cmake new file mode 100644 index 000000000..29e5bc42d --- /dev/null +++ b/ports/libftdi/portfile.cmake @@ -0,0 +1,45 @@ +include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz"
+ FILENAME "libftdi-0.20.tar.gz"
+ SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF 0.20
+ PATCHES
+ libusb-win32.patch
+ shared-static.patch
+ export-cmake.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DDOCUMENTATION=OFF
+ -DEXAMPLES=OFF
+ -DPYTHON_BINDINGS=OFF
+ -DFTDIPP=OFF
+
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+
+ -DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libftdi)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE ${CURRENT_PACKAGES_DIR}/share/libftdi/copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/libftdi/shared-static.patch b/ports/libftdi/shared-static.patch new file mode 100644 index 000000000..dad7aa0c5 --- /dev/null +++ b/ports/libftdi/shared-static.patch @@ -0,0 +1,52 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 071ae90..b42bbcd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,7 +4,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
+ # Targets
+-set(c_sources ftdi.c)
++set(c_sources ftdi.c exports.def)
+ set(c_headers ftdi.h)
+
+ add_library(ftdi SHARED ${c_sources})
+@@ -24,7 +24,7 @@ set_target_properties(ftdi-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ target_link_libraries(ftdi ${LIBUSB_LIBRARIES})
+
+ # Install
+-if(${UNIX})
++if(UNIX AND 0)
+
+ install( TARGETS ftdi
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+@@ -41,23 +41,24 @@ if(${UNIX})
+ COMPONENT headers
+ )
+
+-endif(${UNIX})
++endif()
+
+-if(${WIN32})
++if(WIN32 OR 1)
+
++ if(BUILD_SHARED_LIBS)
+ install( TARGETS ftdi
+- DESTINATION bin
+ COMPONENT sharedlibs
+ )
+
++ else()
+ install( TARGETS ftdi-static
+- DESTINATION bin
+ COMPONENT staticlibs
+ )
++ endif()
+
+ install( FILES ${c_headers}
+ DESTINATION include
+ COMPONENT headers
+ )
+
+-endif(${WIN32})
++endif()
diff --git a/ports/libftdi1/CONTROL b/ports/libftdi1/CONTROL new file mode 100644 index 000000000..d282ad9eb --- /dev/null +++ b/ports/libftdi1/CONTROL @@ -0,0 +1,4 @@ +Source: libftdi1
+Version: 1.4
+Build-Depends: libusb
+Description: FTDI USB driver with bitbang mode (v1.4)
diff --git a/ports/libftdi1/cmake-fix.patch b/ports/libftdi1/cmake-fix.patch new file mode 100644 index 000000000..ea541f719 --- /dev/null +++ b/ports/libftdi1/cmake-fix.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake
+index b90e297..6cc97a0 100644
+--- a/cmake/FindUSB1.cmake
++++ b/cmake/FindUSB1.cmake
+@@ -26,7 +26,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+ PATH_SUFFIXES libusb-1.0
+ PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
+
+- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
++ FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 libusb-1.0
+ PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
+
+ include(FindPackageHandleStandardArgs)
diff --git a/ports/libftdi1/exports.def b/ports/libftdi1/exports.def new file mode 100644 index 000000000..f5179c59d --- /dev/null +++ b/ports/libftdi1/exports.def @@ -0,0 +1,67 @@ +EXPORTS
+ convert_baudrate_UT_export
+ ftdi_deinit
+ ftdi_disable_bitbang
+ ftdi_eeprom_build
+ ftdi_eeprom_decode
+ ftdi_eeprom_get_strings
+ ftdi_eeprom_initdefaults
+ ftdi_eeprom_set_strings
+ ftdi_erase_eeprom
+ ftdi_free
+ ftdi_get_eeprom_buf
+ ftdi_get_eeprom_value
+ ftdi_get_error_string
+ ftdi_get_latency_timer
+ ftdi_get_library_version
+ ftdi_init
+ ftdi_list_free
+ ftdi_list_free2
+ ftdi_new
+ ftdi_poll_modem_status
+ ftdi_read_chipid
+ ftdi_read_data
+ ftdi_read_data_get_chunksize
+ ftdi_read_data_set_chunksize
+ ftdi_read_data_submit
+ ftdi_read_eeprom
+ ftdi_read_eeprom_location
+ ftdi_read_pins
+ ftdi_set_baudrate
+ ftdi_set_bitmode
+ ftdi_set_eeprom_buf
+ ftdi_set_eeprom_user_data
+ ftdi_set_eeprom_value
+ ftdi_set_error_char
+ ftdi_set_event_char
+ ftdi_set_interface
+ ftdi_set_latency_timer
+ ftdi_set_line_property
+ ftdi_set_line_property2
+ ftdi_set_usbdev
+ ftdi_setdtr
+ ftdi_setdtr_rts
+ ftdi_setflowctrl
+ ftdi_setrts
+ ftdi_transfer_data_cancel
+ ftdi_transfer_data_done
+ ftdi_usb_close
+ ftdi_usb_find_all
+ ftdi_usb_get_strings
+ ftdi_usb_get_strings2
+ ftdi_usb_open
+ ftdi_usb_open_bus_addr
+ ftdi_usb_open_desc
+ ftdi_usb_open_desc_index
+ ftdi_usb_open_dev
+ ftdi_usb_open_string
+ ftdi_usb_purge_buffers
+ ftdi_usb_purge_rx_buffer
+ ftdi_usb_purge_tx_buffer
+ ftdi_usb_reset
+ ftdi_write_data
+ ftdi_write_data_get_chunksize
+ ftdi_write_data_set_chunksize
+ ftdi_write_data_submit
+ ftdi_write_eeprom
+ ftdi_write_eeprom_location
diff --git a/ports/libftdi1/portfile.cmake b/ports/libftdi1/portfile.cmake new file mode 100644 index 000000000..4007e9122 --- /dev/null +++ b/ports/libftdi1/portfile.cmake @@ -0,0 +1,47 @@ +include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2"
+ FILENAME "libftdi1-1.4.tar.bz2"
+ SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ REF 1.4
+ PATCHES
+ cmake-fix.patch
+ win32.patch
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTS=OFF
+ -DDOCUMENTATION=OFF
+ -DEXAMPLES=OFF
+ -DPYTHON_BINDINGS=OFF
+ -DLINK_PYTHON_LIBRARY=OFF
+
+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Confuse=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Libintl=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libftdi1 TARGET_PATH share/libftdi1)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libftdi1)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libftdi1/LICENSE ${CURRENT_PACKAGES_DIR}/share/libftdi1/copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/libftdi1/win32.patch b/ports/libftdi1/win32.patch new file mode 100644 index 000000000..8cf35c920 --- /dev/null +++ b/ports/libftdi1/win32.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9fd86a6..e1e848c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -18,9 +18,14 @@ message(STATUS "Detected git snapshot version: ${SNAPSHOT_VERSION}")
+ configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h" @ONLY)
+
+ # Targets
++if(WIN32)
++set(c_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.c ${CMAKE_CURRENT_SOURCE_DIR}/exports.def CACHE INTERNAL "List of c sources" )
++else()
+ set(c_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.c ${CMAKE_CURRENT_SOURCE_DIR}/ftdi_stream.c CACHE INTERNAL "List of c sources" )
++endif()
+ set(c_headers ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.h CACHE INTERNAL "List of c headers" )
+
++if(BUILD_SHARED_LIBS)
+ add_library(ftdi1 SHARED ${c_sources})
+
+ math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases
+@@ -38,7 +43,7 @@ install ( TARGETS ftdi1
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ )
+
+-if ( STATICLIBS )
++else()
+ add_library(ftdi1-static STATIC ${c_sources})
+ target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES})
+ set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")
diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL index 35bf69bf8..1d16b2f27 100644 --- a/ports/libgd/CONTROL +++ b/ports/libgd/CONTROL @@ -1,5 +1,6 @@ Source: libgd
-Version: 2.2.5-1
+Version: 2.2.5-3
+Homepage: https://github.com/libgd/libgd
Description: Open source code library for the dynamic creation of images by programmers.
Default-Features: fontconfig, freetype, jpeg, png, tiff, webp
diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index 346f00977..6ef2127d5 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -65,9 +65,9 @@ vcpkg_configure_cmake( -DENABLE_FREETYPE=${ENABLE_FREETYPE} -DENABLE_WEBP=${ENABLE_WEBP} -DENABLE_FONTCONFIG=${ENABLE_FONTCONFIG} + -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS} ) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/libgeotiff/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch b/ports/libgeotiff/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch deleted file mode 100644 index 93476fd2f..000000000 --- a/ports/libgeotiff/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 77b4bf4e649d55b1f1df38494114727f972ec806 Mon Sep 17 00:00:00 2001 -From: Howard Butler <hobu.inc@gmail.com> -Date: Mon, 11 Dec 2017 15:21:56 +0000 -Subject: [PATCH 1/5] Updates to CMake configuration to align with other CMake - norms (BUILD_SHARED_LIBS mostly) - -git-svn-id: https://svn.osgeo.org/metacrs/geotiff/trunk/libgeotiff@2801 4e78687f-474d-0410-85f9-8d5e500ac6b2 -Signed-off-by: Hiroshi Miura <miurahr@linux.com> ---- - CMakeLists.txt | 22 ++-------------------- - cmake/project-config.cmake.in | 5 ++++- - 2 files changed, 6 insertions(+), 21 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0c70973..55ececf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,6 @@ PROJECT(GeoTIFF) - - SET(GEOTIFF_LIB_NAME geotiff) - SET(GEOTIFF_LIBRARY_TARGET geotiff_library) --SET(GEOTIFF_ARCHIVE_TARGET geotiff_archive) - - ############################################################################## - # CMake settings -@@ -416,32 +415,15 @@ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/epsg_incode_header.h" - - SET(XTIFF_SOURCES libxtiff/xtiff.c) - --#--- --# Static libgeotiff archive --# NOTE: Did not put XTIFF_SOURCES in static lib because libxtiff.a is written out --# currently. --#--- - if (MSVC OR CMAKE_CONFIGURATION_TYPES) - # For multi-config systems and for Visual Studio, the debug versions - # of the libraries have a _d suffix. - set (CMAKE_DEBUG_POSTFIX _d) - endif () - --ADD_LIBRARY(${GEOTIFF_ARCHIVE_TARGET} STATIC -- ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES}) --SET_TARGET_PROPERTIES(${GEOTIFF_ARCHIVE_TARGET} PROPERTIES -- OUTPUT_NAME ${GEOTIFF_LIB_NAME}) -- --# Shared libgeotiff library --ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET} SHARED -+ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET} - ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES} ${XTIFF_SOURCES}) - --# Windows: --IF(WIN32 AND MSVC) -- SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES IMPORT_SUFFIX "_i.lib") --ENDIF(WIN32 AND MSVC) -- -- - # Unix, linux: - IF(UNIX) - SET_TARGET_PROPERTIES( -@@ -478,7 +460,7 @@ TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET} - # LIBRARY DESTINATION ${GEOTIFF_LIB_DIR} - # ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR}) - --INSTALL( TARGETS ${GEOTIFF_ARCHIVE_TARGET} ${GEOTIFF_LIBRARY_TARGET} -+INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET} - EXPORT depends - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib -diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in -index 6b5499f..dc5b999 100644 ---- a/cmake/project-config.cmake.in -+++ b/cmake/project-config.cmake.in -@@ -32,8 +32,11 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin") - - message (STATUS " include directory: \${@PROJECT_NAME@_INCLUDE_DIRS}") - -+if(BUILD_SHARED_LIBS) - set (@PROJECT_NAME@_SHARED_LIBRARIES @GEOTIFF_LIBRARY_TARGET@) --set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_ARCHIVE_TARGET@) -+else() -+set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_LIBRARY_TARGET@) -+endif() - # Read in the exported definition of the library - include ("${_DIR}/@PROJECT_NAME_LOWER@-depends.cmake") - --- -2.16.1 - diff --git a/ports/libgeotiff/0002-Fix-directory-output.patch b/ports/libgeotiff/0002-Fix-directory-output.patch deleted file mode 100644 index d6b79e54c..000000000 --- a/ports/libgeotiff/0002-Fix-directory-output.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2b60f0a2c264bf3730e89739384a6d50991b2fc4 Mon Sep 17 00:00:00 2001 -From: Hiroshi Miura <miurahr@linux.com> -Date: Wed, 14 Feb 2018 12:31:53 +0900 -Subject: [PATCH 2/5] Fix directory output - -Signed-off-by: Hiroshi Miura <miurahr@linux.com> ---- - cmake/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 47a2b00..b41f2fa 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -10,8 +10,8 @@ if (NOT WIN32) - set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") - set (PROJECT_ROOT_DIR "../../..") - else () -- set (INSTALL_CMAKE_DIR "cmake") -- set (PROJECT_ROOT_DIR "..") -+ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}") -+ set (PROJECT_ROOT_DIR "../..") - endif () - - configure_file (project-config.cmake.in project-config.cmake @ONLY) --- -2.16.1 - diff --git a/ports/libgeotiff/0004-Fix-libxtiff-installation.patch b/ports/libgeotiff/0004-Fix-libxtiff-installation.patch deleted file mode 100644 index f7da51ab0..000000000 --- a/ports/libgeotiff/0004-Fix-libxtiff-installation.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 3a7c42f304ec3bb149e31bbd21c9c84048c3047c Mon Sep 17 00:00:00 2001 -From: Hiroshi Miura <miurahr@linux.com> -Date: Thu, 15 Feb 2018 13:11:01 +0900 -Subject: [PATCH 4/5] Fix libxtiff installation - -Signed-off-by: Hiroshi Miura <miurahr@linux.com> ---- - CMakeLists.txt | 9 ++------- - libxtiff/CMakeLists.txt | 9 --------- - 2 files changed, 2 insertions(+), 16 deletions(-) - delete mode 100644 libxtiff/CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e2fe3d..c52cfb4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -354,11 +354,6 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1) - # INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR}) - INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include) - --############################################################################### --# Build libxtiff library -- --ADD_SUBDIRECTORY(libxtiff) -- - ############################################################################### - # Build libgeotiff library - -@@ -406,6 +401,8 @@ FOREACH(epsg_csv_file ${GEOTIFF_CSV_DATA}) - ENDIF() - ENDFOREACH() - -+SET(XTIFF_SOURCES libxtiff/xtiff.c) -+ - SET(EPSG_INCODE_EXPLANATION - "This file is autogenerated by CMake, based on the INCODE_EPSG_* options specified during configure.\n - Choosing an EPSG CSV file for inclusion into code will run csv/csv2c.py on the file and include the\n -@@ -414,8 +411,6 @@ STRING(REPLACE ";" "\n" EPSG_INCLUDEFILE_POINTER_STRING "${epsg_includefile_poin - FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/epsg_incode_header.h" - "/* ${EPSG_INCODE_EXPLANATION} */\n${epsg_includefile_externconst}; \n\n/* Pointers to csv data included in code */\nstatic const datafile_t files[] = {\n${EPSG_INCLUDEFILE_POINTER_STRING}\n { NULL, NULL }};") - --SET(XTIFF_SOURCES libxtiff/xtiff.c) -- - if (MSVC OR CMAKE_CONFIGURATION_TYPES) - # For multi-config systems and for Visual Studio, the debug versions - # of the libraries have a _d suffix. -diff --git a/libxtiff/CMakeLists.txt b/libxtiff/CMakeLists.txt -deleted file mode 100644 -index a0bbb96..0000000 ---- a/libxtiff/CMakeLists.txt -+++ /dev/null -@@ -1,9 +0,0 @@ --############################################################################### --# --# CMake configuration file to build libxtiff library --# --# Author: Mateusz Loskot <mateusz@loskot.net> --# --############################################################################### -- --ADD_LIBRARY(xtiff STATIC xtiff.c) --- -2.16.1 - diff --git a/ports/libgeotiff/0005-Control-shared-library-build-with-option.patch b/ports/libgeotiff/0005-Control-shared-library-build-with-option.patch deleted file mode 100644 index ed9a4e88a..000000000 --- a/ports/libgeotiff/0005-Control-shared-library-build-with-option.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 84e537f3bd0db74b22ffebb3746d292daf4f4e59 Mon Sep 17 00:00:00 2001 -From: Hiroshi Miura <miurahr@linux.com> -Date: Thu, 15 Feb 2018 13:17:14 +0900 -Subject: [PATCH 5/5] Control shared library build with option - -Signed-off-by: Hiroshi Miura <miurahr@linux.com> ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c52cfb4..5890203 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,14 +5,15 @@ - # Author: Mateusz Loskot <mateusz@loskot.net> - # - ############################################################################### -+CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0) - PROJECT(GeoTIFF) - - SET(GEOTIFF_LIB_NAME geotiff) - SET(GEOTIFF_LIBRARY_TARGET geotiff_library) -+option(BUILD_SHARE_LIBS "Set ON to build shared library." ON) - - ############################################################################## - # CMake settings --CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) - - SET(CMAKE_COLOR_MAKEFILE ON) - --- -2.16.1 - diff --git a/ports/libgeotiff/0006-Fix-utility-link-error.patch b/ports/libgeotiff/0006-Fix-utility-link-error.patch deleted file mode 100644 index ef0963b26..000000000 --- a/ports/libgeotiff/0006-Fix-utility-link-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2625b4a85b6cacf9b6ede3cf30af16eb795044e9 Mon Sep 17 00:00:00 2001 -From: Hiroshi Miura <miurahr@linux.com> -Date: Sat, 24 Feb 2018 08:36:31 +0900 -Subject: [PATCH 6/6] Fix utility link error - -Signed-off-by: Hiroshi Miura <miurahr@linux.com> ---- - bin/CMakeLists.txt | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt -index 583ae36..6c6cc21 100644 ---- a/bin/CMakeLists.txt -+++ b/bin/CMakeLists.txt -@@ -6,10 +6,6 @@ - # - ############################################################################### - --INCLUDE_DIRECTORIES( -- . -- ${CMAKE_SOURCE_DIR}) -- - IF(WIN32 AND MSVC) - SET(GETOPT_SOURCE getopt.c) - ENDIF() -@@ -22,12 +18,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build") - - FOREACH(utility ${GEOTIFF_UTILITIES}) - ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE}) -- TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET}) -+ TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET}) - ENDFOREACH() - - ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE}) - TARGET_LINK_LIBRARIES(geotifcp -- xtiff - ${GEOTIFF_LIBRARY_TARGET} - ${JPEG_LIBRARIES} - ${ZLIB_LIBRARIES}) --- -2.16.1 - diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index edfa7f0cb..2e8d4836c 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,4 +1,5 @@ Source: libgeotiff -Version: 1.4.2-7 -Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags. +Version: 1.4.2-9 +Homepage: https://download.osgeo.org/geotiff/libgeotiff +Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags. Build-Depends: tiff, proj4, zlib, libjpeg-turbo diff --git a/ports/libgeotiff/cmakelists.patch b/ports/libgeotiff/cmakelists.patch new file mode 100644 index 000000000..689c6df5b --- /dev/null +++ b/ports/libgeotiff/cmakelists.patch @@ -0,0 +1,124 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0c70973..617978c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,22 +190,6 @@ IF(WITH_TIFF) + endif () + + IF(TIFF_FOUND) +- # Confirm required API is available +- INCLUDE(CheckFunctionExists) +- SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES}) +- +- CHECK_FUNCTION_EXISTS(TIFFOpen HAVE_TIFFOPEN) +- IF(NOT HAVE_TIFFOPEN) +- SET(TIFF_FOUND) # ReSET to NOT found for TIFF library +- MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFOpen function not found") +- ENDIF() +- +- CHECK_FUNCTION_EXISTS(TIFFMergeFieldInfo HAVE_TIFFMERGEFIELDINFO) +- IF(NOT HAVE_TIFFMERGEFIELDINFO) +- SET(TIFF_FOUND) # ReSET to NOT found for TIFF library +- MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFMergeFieldInfo function not found. libtiff 3.6.0 Beta or later required. Please upgrade or use an older version of libgeotiff") +- ENDIF() +- + INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) + ADD_DEFINITIONS(-DHAVE_TIFF=1) + ENDIF(TIFF_FOUND) +@@ -354,11 +338,6 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1) + # INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR}) + INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include) + +-############################################################################### +-# Build libxtiff library +- +-ADD_SUBDIRECTORY(libxtiff) +- + ############################################################################### + # Build libgeotiff library + +@@ -427,13 +406,9 @@ if (MSVC OR CMAKE_CONFIGURATION_TYPES) + set (CMAKE_DEBUG_POSTFIX _d) + endif () + +-ADD_LIBRARY(${GEOTIFF_ARCHIVE_TARGET} STATIC +- ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES}) +-SET_TARGET_PROPERTIES(${GEOTIFF_ARCHIVE_TARGET} PROPERTIES +- OUTPUT_NAME ${GEOTIFF_LIB_NAME}) + + # Shared libgeotiff library +-ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET} SHARED ++ADD_LIBRARY(${GEOTIFF_LIBRARY_TARGET} + ${GEOTIFF_LIB_SOURCES} ${GEOTIFF_LIB_CSV_SOURCES} ${XTIFF_SOURCES}) + + # Windows: +@@ -478,7 +453,7 @@ TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET} + # LIBRARY DESTINATION ${GEOTIFF_LIB_DIR} + # ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR}) + +-INSTALL( TARGETS ${GEOTIFF_ARCHIVE_TARGET} ${GEOTIFF_LIBRARY_TARGET} ++INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET} + EXPORT depends + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib +diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt +index 7b12341..b6b1d0c 100644 +--- a/bin/CMakeLists.txt ++++ b/bin/CMakeLists.txt +@@ -6,9 +6,6 @@ + # + ############################################################################### + +-INCLUDE_DIRECTORIES( +- . +- ${CMAKE_SOURCE_DIR}) + + IF(WIN32 AND MSVC) + SET(GETOPT_SOURCE getopt.c) +@@ -22,12 +19,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build") + + FOREACH(utility ${GEOTIFF_UTILITIES}) + ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE}) +- TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET}) ++ TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET}) + ENDFOREACH() + + ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE}) + TARGET_LINK_LIBRARIES(geotifcp +- xtiff + ${GEOTIFF_LIBRARY_TARGET} + ${JPEG_LIBRARIES} + ${ZLIB_LIBRARIES}) +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 47a2b00..ffbd004 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -6,13 +6,8 @@ + # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative + # path to the root from there. (Note that the whole install tree can + # be relocated.) +-if (NOT WIN32) +- set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}") +- set (PROJECT_ROOT_DIR "../../..") +-else () +- set (INSTALL_CMAKE_DIR "cmake") +- set (PROJECT_ROOT_DIR "..") +-endif () ++ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}") ++ set (PROJECT_ROOT_DIR "../..") + + configure_file (project-config.cmake.in project-config.cmake @ONLY) + configure_file (project-config-version.cmake.in +diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in +index 6b5499f..e4ddd11 100644 +--- a/cmake/project-config.cmake.in ++++ b/cmake/project-config.cmake.in +@@ -33,7 +33,7 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin") + message (STATUS " include directory: \${@PROJECT_NAME@_INCLUDE_DIRS}") + + set (@PROJECT_NAME@_SHARED_LIBRARIES @GEOTIFF_LIBRARY_TARGET@) +-set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_ARCHIVE_TARGET@) ++set (@PROJECT_NAME@_STATIC_LIBRARIES @GEOTIFF_LIBRARY_TARGET@) + # Read in the exported definition of the library + include ("${_DIR}/@PROJECT_NAME_LOWER@-depends.cmake") + diff --git a/ports/libgeotiff/geotiff-config.patch b/ports/libgeotiff/geotiff-config.patch new file mode 100644 index 000000000..284c64146 --- /dev/null +++ b/ports/libgeotiff/geotiff-config.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in +index 0dd376aca..0615081bd 100644 +--- a/cmake/project-config.cmake.in ++++ b/cmake/project-config.cmake.in +@@ -23,6 +23,12 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") + message (STATUS
+ "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}")
+
++#Find dependencies
++if(@WITH_PROJ4@)
++ include(CMakeFindDependencyMacro)
++ find_dependency(PROJ4)
++endif()
++
+ # Tell the user project where to find our headers and libraries
+ get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+ get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index fc79fe15d..1e4bb3370 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -1,12 +1,11 @@ include(vcpkg_common_functions) set(LIBGEOTIFF_VERSION 1.4.2) -set(LIBGEOTIFF_HASH 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb) vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" FILENAME "libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" - SHA512 ${LIBGEOTIFF_HASH} + SHA512 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb ) vcpkg_extract_source_archive_ex( @@ -14,11 +13,8 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} REF ${LIBGEOTIFF_VERSION} PATCHES - 0001-Updates-to-CMake-configuration-to-align-with-other-C.patch - 0002-Fix-directory-output.patch - 0004-Fix-libxtiff-installation.patch - 0005-Control-shared-library-build-with-option.patch - 0006-Fix-utility-link-error.patch + cmakelists.patch + geotiff-config.patch ) # Delete FindPROJ4.cmake @@ -32,35 +28,40 @@ vcpkg_configure_cmake( -DWITH_PROJ4=ON -DWITH_ZLIB=ON -DWITH_JPEG=ON - OPTIONS_RELEASE -DWITH_UTILITIES=ON - OPTIONS_DEBUG -DWITH_UTILITIES=OFF + -DWITH_UTILITIES=ON ) vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libgeotiff/copyright COPYONLY) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) else() file(GLOB GEOTIFF_UTILS ${CURRENT_PACKAGES_DIR}/bin/*.exe) + file(GLOB GEOTIFF_UTILS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(REMOVE ${GEOTIFF_UTILS_DEBUG}) endif() file(COPY ${GEOTIFF_UTILS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/libgeotiff) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libgeotiff) +file(REMOVE ${GEOTIFF_UTILS}) -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" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) endif() -# Move and cleanup doc files -file(RENAME ${CURRENT_PACKAGES_DIR}/doc ${CURRENT_PACKAGES_DIR}/share/libgeotiff/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) - vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/GeoTIFF) +file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-config-version.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff) +file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff) +file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-depends-release.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff) +file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-depends-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff) +file(INSTALL ${CURRENT_PACKAGES_DIR}/share/libgeotiff/geotiff-depends.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/geotiff) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgeotiff RENAME copyright) + +file(RENAME ${CURRENT_PACKAGES_DIR}/doc ${CURRENT_PACKAGES_DIR}/share/libgeotiff/doc) diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL index f44900b72..5c396d473 100644 --- a/ports/libgit2/CONTROL +++ b/ports/libgit2/CONTROL @@ -1,4 +1,5 @@ Source: libgit2
-Version: 0.27.4-2
+Version: 0.28.2
+Homepage: https://github.com/libgit2/libgit2
Build-Depends: openssl (!windows&&!uwp)
Description: Git linkable library
diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 0982e5be1..711da201e 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -8,8 +8,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libgit2/libgit2
- REF v0.27.4
- SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
+ REF b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3 + SHA512 2a992759c0892300eff6d4e823367e2cfc5bcaa6e37a0e87de45a16393c53ccd286f47f37d38c104e79eed8688b9834ada00000b2d6894f89773f75c83e23022
HEAD_REF master
)
diff --git a/ports/libgta/CONTROL b/ports/libgta/CONTROL index 344c44c4d..d338243cf 100644 --- a/ports/libgta/CONTROL +++ b/ports/libgta/CONTROL @@ -1,4 +1,5 @@ Source: libgta Version: 1.0.8-1 +Homepage: https://download.savannah.nongnu.org/releases/gta Description: Libgta is a portable library that implements the Generic Tagged Array (GTA) file format. Build-Depends: bzip2, zlib, liblzma diff --git a/ports/libharu/CONTROL b/ports/libharu/CONTROL index 72778aa6b..f8d2ca29a 100644 --- a/ports/libharu/CONTROL +++ b/ports/libharu/CONTROL @@ -1,4 +1,5 @@ Source: libharu -Version: 2017-08-15-d84867ebf9f-6 +Version: 2017-08-15-8 +Homepage: https://github.com/libharu/libharu Description: libharu - free PDF library Build-Depends: zlib, libpng diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 7855dedc7..962550ca8 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -19,22 +19,32 @@ vcpkg_from_github( ${SHADING_PR} ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBHPDF_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "shared" LIBHPDF_SHARED) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) + set(VCPKG_BUILD_STATIC_LIBS OFF) +else() + set(VCPKG_BUILD_SHARED_LIBS OFF) + set(VCPKG_BUILD_STATIC_LIBS ON) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DLIBHPDF_STATIC=${LIBHPDF_STATIC} - -DLIBHPDF_SHARED=${LIBHPDF_SHARED} + -DLIBHPDF_STATIC=${VCPKG_BUILD_STATIC_LIBS} + -DLIBHPDF_SHARED=${VCPKG_BUILD_SHARED_LIBS} ) vcpkg_install_cmake() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib ${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib) + else() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a ${CURRENT_PACKAGES_DIR}/lib/libhpdf.a) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a) + endif() endif() file(REMOVE_RECURSE diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index a5e4d0cc4..c24bac49d 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,3 +1,4 @@ Source: libiconv Version: 1.15-5 +Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libics/CONTROL b/ports/libics/CONTROL index 5f98c9614..115540291 100644 --- a/ports/libics/CONTROL +++ b/ports/libics/CONTROL @@ -1,3 +1,3 @@ Source: libics
-Version: 1.6.2
+Version: 1.6.3 Description: Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.
\ No newline at end of file diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake index 9bcf997ed..f0d27363a 100644 --- a/ports/libics/portfile.cmake +++ b/ports/libics/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO svi-opensource/libics
- REF 8d8d2dbe72450cbaf88080b6c0e24a7a4a58009e
- SHA512 739668b4d51ddb67d50ed1d41bd6965b90b5e4eafc7ec19e2f1d668f48af6e237f6a1872673e3fec5888efe94c2b321295c4de9502aba1f677fc6d0e0399c141
+ REF b9532b738ad7f17569dfcaae74eb53d3c2959394 + SHA512 a7c0d89125570021494feaf0a187e3a1695e92c85a03d59ac9729618cdddb2ae13af94e4ce93241acbbb9d28465f75297bf03f2c46061bb7a0bba7ec28a23da4
HEAD_REF master
PATCHES
cmakelists.patch
diff --git a/ports/libideviceactivation/CONTROL b/ports/libideviceactivation/CONTROL index 2d5e23661..cbc1aef46 100644 --- a/ports/libideviceactivation/CONTROL +++ b/ports/libideviceactivation/CONTROL @@ -1,4 +1,4 @@ Source: libideviceactivation
-Version: 1.0.38-1
+Version: 1.2.68 Description: A library to handle the activation process of iOS devices
Build-Depends: libimobiledevice, libxml2, curl
\ No newline at end of file diff --git a/ports/libideviceactivation/libcurl_d.patch b/ports/libideviceactivation/libcurl_d.patch new file mode 100644 index 000000000..69f1bf53b --- /dev/null +++ b/ports/libideviceactivation/libcurl_d.patch @@ -0,0 +1,22 @@ +diff --git a/libideviceactivation.vcxproj b/libideviceactivation.vcxproj +index ba473f7a..47a20d15 100644 +--- a/libideviceactivation.vcxproj ++++ b/libideviceactivation.vcxproj +@@ -76,7 +76,7 @@ + <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> +- <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>libcurl-d.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> +@@ -89,7 +89,7 @@ + <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> +- <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>libcurl-d.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> diff --git a/ports/libideviceactivation/libcurl_imp.patch b/ports/libideviceactivation/libcurl_imp.patch new file mode 100644 index 000000000..bf1bfefac --- /dev/null +++ b/ports/libideviceactivation/libcurl_imp.patch @@ -0,0 +1,40 @@ +diff --git a/libideviceactivation.vcxproj b/libideviceactivation.vcxproj +index ba473f7a..47a20d15 100644 +--- a/libideviceactivation.vcxproj ++++ b/libideviceactivation.vcxproj +@@ -76,7 +76,7 @@ + <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> +- <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>libcurl-d_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> +@@ -89,7 +89,7 @@ + <ProgramDataBaseFileName>$(OutDir)$(ProjectName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> +- <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>libcurl-d_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> +@@ -106,7 +106,7 @@ + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> +- <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>libcurl_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> +@@ -123,7 +123,7 @@ + <Link> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> +- <AdditionalDependencies>libcurl.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> ++ <AdditionalDependencies>libcurl_imp.lib;libxml2.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemGroup> diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake index 7a462834e..a904b52ef 100644 --- a/ports/libideviceactivation/portfile.cmake +++ b/ports/libideviceactivation/portfile.cmake @@ -5,11 +5,23 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/libideviceactivation
- REF 1.0.38
- SHA512 2fd2d5636e83a6740251dca58c04429628f47661a56e573fc14f45ef68c54990717515305902cf04759a7c8fd19e66a30c8eb2ea20e6257d2c5405b690ea25a6
+ REF v1.2.68 + SHA512 c2742bba2d90c21e853255c9ef1b9a63560c3e65541a0a3daaace9b0c48d236b7947008dbcd6e42622251015b686758ebc6b564e379d831cb4f52af812430140
HEAD_REF msvc-master
)
+if(${VCPKG_LIBRARY_LINKAGE} MATCHES dynamic)
+ vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES
+ libcurl_imp.patch)
+else()
+ vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES
+ libcurl_d.patch)
+endif()
+
vcpkg_install_msbuild(
SOURCE_PATH ${SOURCE_PATH}
PROJECT_SUBPATH libideviceactivation.sln
diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL index 5fcac82b6..01d89d69b 100644 --- a/ports/libidn2/CONTROL +++ b/ports/libidn2/CONTROL @@ -1,4 +1,5 @@ Source: libidn2 Version: 2.1.1-1 Build-Depends: libiconv +Homepage: https://www.gnu.org/software/libidn/ 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. diff --git a/ports/libimobiledevice/CONTROL b/ports/libimobiledevice/CONTROL index b6d3c2960..0a6a21bf8 100644 --- a/ports/libimobiledevice/CONTROL +++ b/ports/libimobiledevice/CONTROL @@ -1,4 +1,4 @@ Source: libimobiledevice
-Version: 1.2.1.215-1
+Version: 1.2.76 Description: A cross-platform protocol library to communicate with iOS devices
Build-Depends: libplist, libusbmuxd, openssl, dirent, getopt
\ No newline at end of file diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake index 4bc505163..f91cad8cc 100644 --- a/ports/libimobiledevice/portfile.cmake +++ b/ports/libimobiledevice/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/libimobiledevice
- REF 1.2.1.215
- SHA512 192ac12eb4fdf518a934cb8061d4a40e48f483e969e34167f2a5346efac1d745e4041eff84d7175d106b1a3b3f806d5e69643daa1459e48e69bc9c38d722be3c
+ REF d6b24aae971b990d2777a88ec3a1e31b40d6152f + SHA512 75e45162fecd80464846ff51c9b3e722017f738de8f6b55e9f41f5eadcd93730b12512087d427badbc0c2b54a76a66359a472ab5bc5be5fa02826db1171565d0
HEAD_REF msvc-master
)
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 88f6e689a..d64af9bb4 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,4 @@ Source: libjpeg-turbo -Version: 1.5.3-2 +Version: 2.0.2 +Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo 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. 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 bd10a21bb..ceb90b51d 100644 --- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch +++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch @@ -1,205 +1,248 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 131b437..c29e604 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,6 +62,9 @@ option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE) - option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_SIMD=0 WITH_TURBOJPEG=0 WITH_ARITH_ENC=0 WITH_ARITH_DEC=0)" FALSE) - option(ENABLE_STATIC "Build static libraries" TRUE) - option(ENABLE_SHARED "Build shared libraries" TRUE) -+option(ENABLE_EXECUTABLES "Build executables" TRUE) -+option(INSTALL_DOCS "Install doc files" TRUE) -+option(INSTALL_HEADERS "Install header files" TRUE) - - if(WITH_12BIT) - set(WITH_SIMD FALSE) -@@ -279,14 +282,16 @@ if(WITH_TURBOJPEG) - target_link_libraries(turbojpeg jpeg-static) - set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "") - -- add_executable(tjunittest tjunittest.c tjutil.c) -- target_link_libraries(tjunittest turbojpeg) -+ if(ENABLE_EXECUTABLES) -+ add_executable(tjunittest tjunittest.c tjutil.c) -+ target_link_libraries(tjunittest turbojpeg) - -- add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c -- wrppm.c) -- target_link_libraries(tjbench turbojpeg jpeg-static) -- set_property(TARGET tjbench PROPERTY COMPILE_FLAGS -- "-DBMP_SUPPORTED -DPPM_SUPPORTED") -+ add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c -+ wrppm.c) -+ target_link_libraries(tjbench turbojpeg jpeg-static) -+ set_property(TARGET tjbench PROPERTY COMPILE_FLAGS -+ "-DBMP_SUPPORTED -DPPM_SUPPORTED") -+ endif() - endif() - - if(ENABLE_STATIC) -@@ -299,14 +304,16 @@ if(WITH_TURBOJPEG) - add_dependencies(turbojpeg-static simd) - endif() - -- add_executable(tjunittest-static tjunittest.c tjutil.c) -- target_link_libraries(tjunittest-static turbojpeg-static) -+ if(ENABLE_EXECUTABLES) -+ add_executable(tjunittest-static tjunittest.c tjutil.c) -+ target_link_libraries(tjunittest-static turbojpeg-static) - -- add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c -- wrbmp.c wrppm.c) -- target_link_libraries(tjbench-static turbojpeg-static jpeg-static) -- set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS -- "-DBMP_SUPPORTED -DPPM_SUPPORTED") -+ add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c -+ wrbmp.c wrppm.c) -+ target_link_libraries(tjbench-static turbojpeg-static jpeg-static) -+ set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS -+ "-DBMP_SUPPORTED -DPPM_SUPPORTED") -+ endif() - endif() - endif() - -@@ -318,7 +325,7 @@ else() - set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) - endif() - --if(ENABLE_STATIC) -+if(ENABLE_STATIC AND ENABLE_EXECUTABLES) - add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c - ${CJPEG_BMP_SOURCES}) - set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) -@@ -334,10 +341,11 @@ if(ENABLE_STATIC) - set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_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() - - # - # Tests -@@ -917,24 +925,30 @@ add_custom_target(installer - - if(WITH_TURBOJPEG) - if(ENABLE_SHARED) -- install(TARGETS turbojpeg tjbench -+ install(TARGETS turbojpeg - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) -+ if(ENABLE_EXECUTABLES) -+ install(TARGETS tjbench -+ RUNTIME DESTINATION bin) -+ endif() - endif() - if(ENABLE_STATIC) - install(TARGETS turbojpeg-static ARCHIVE DESTINATION lib) -- if(NOT ENABLE_SHARED) -+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static.exe - DESTINATION bin RENAME tjbench.exe) - endif() - endif() -- install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include) -+ if(INSTALL_HEADERS) -+ install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include) -+ endif() - endif() - - if(ENABLE_STATIC) - install(TARGETS jpeg-static ARCHIVE DESTINATION lib) -- if(NOT ENABLE_SHARED) -+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe - DESTINATION bin RENAME cjpeg.exe) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe -@@ -944,17 +958,23 @@ if(ENABLE_STATIC) - endif() - endif() - --install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin) -+if(ENABLE_EXECUTABLES) -+ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin) -+endif() - --install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md -- ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt -- ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt -- ${CMAKE_SOURCE_DIR}/wizard.txt -- DESTINATION doc) -+if(INSTALL_DOCS) -+ install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md -+ ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt -+ ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt -+ ${CMAKE_SOURCE_DIR}/wizard.txt -+ DESTINATION doc) -+endif() - --install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h -- ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h -- DESTINATION include) -+if(INSTALL_HEADERS) -+ install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h -+ ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h -+ DESTINATION include) -+endif() - - configure_file("${CMAKE_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" - "cmake_uninstall.cmake" IMMEDIATE @ONLY) - -diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt -index d423cce..9da7c6e 100644 ---- a/sharedlib/CMakeLists.txt -+++ b/sharedlib/CMakeLists.txt -@@ -50,24 +50,31 @@ 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 "-DUSE_SETMODE") -+ add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c) -+ target_link_libraries(jpegtran jpeg) -+ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "-DUSE_SETMODE") - --add_executable(jcstest ../jcstest.c) --target_link_libraries(jcstest jpeg) -+ add_executable(jcstest ../jcstest.c) -+ target_link_libraries(jcstest jpeg) - --install(TARGETS jpeg cjpeg djpeg jpegtran -+ install(TARGETS cjpeg djpeg jpegtran -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) -+endif() -+ -+install(TARGETS jpeg - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b9d2d40..c868862 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -143,6 +143,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
+ boolean_number(ENABLE_SHARED)
+ option(ENABLE_STATIC "Build static libraries" TRUE)
+ boolean_number(ENABLE_STATIC)
++option(ENABLE_EXECUTABLES "Build executables" TRUE)
++boolean_number(ENABLE_EXECUTABLES)
++option(INSTALL_DOCS "Install doc files" TRUE)
++boolean_number(INSTALL_DOCS)
++option(INSTALL_HEADERS "Install header files" TRUE)
++boolean_number(INSTALL_HEADERS)
+ option(REQUIRE_SIMD "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" FALSE)
+ boolean_number(REQUIRE_SIMD)
+ option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE)
+@@ -593,18 +599,20 @@ 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()
+
+ if(ENABLE_STATIC)
+ add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
+@@ -616,14 +624,16 @@ 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()
+ endif()
+ endif()
+ endif()
+@@ -639,7 +649,7 @@ else()
+ set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
+ endif()
+
+-if(ENABLE_STATIC)
++if(ENABLE_STATIC AND ENABLE_EXECUTABLES)
+ add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
+ ${CJPEG_BMP_SOURCES})
+ set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
+@@ -655,9 +665,10 @@ 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()
+
+
+ ###############################################################################
+@@ -1328,10 +1339,14 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
+
+ if(WITH_TURBOJPEG)
+ if(ENABLE_SHARED)
+- install(TARGETS turbojpeg tjbench
++ install(TARGETS 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})
++ endif()
+ if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
+ CMAKE_C_LINKER_SUPPORTS_PDB)
+ install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
+@@ -1341,7 +1356,7 @@ if(WITH_TURBOJPEG)
+ if(ENABLE_STATIC)
+ install(TARGETS turbojpeg-static ARCHIVE
+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- if(NOT ENABLE_SHARED)
++ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
+ if(MSVC_IDE)
+ set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
+ else()
+@@ -1351,13 +1366,15 @@ 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})
++ endif()
+ endif()
+
+ if(ENABLE_STATIC)
+ install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+- if(NOT ENABLE_SHARED)
++ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
+ if(MSVC_IDE)
+ set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
+ else()
+@@ -1372,21 +1389,25 @@ 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})
++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()
+ 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
+@@ -1397,10 +1418,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})
++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})
++endif()
+
+ include(cmakescripts/BuildPackages.cmake)
+
+diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
+index a5c4e39..794c2af 100644
+--- a/sharedlib/CMakeLists.txt
++++ b/sharedlib/CMakeLists.txt
+@@ -71,27 +71,35 @@ 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)
++endif()
+
+-install(TARGETS jpeg cjpeg djpeg jpegtran
++install(TARGETS jpeg
+ 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})
++endif()
+ if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
+ CMAKE_C_LINKER_SUPPORTS_PDB)
+ install(FILES "$<TARGET_PDB_FILE:jpeg>"
diff --git a/ports/libjpeg-turbo/linux-cmake.patch b/ports/libjpeg-turbo/linux-cmake.patch deleted file mode 100644 index 48a04279f..000000000 --- a/ports/libjpeg-turbo/linux-cmake.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c29e604..6e467be 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,10 +29,6 @@ pad_number(VERSION_MINOR 3) - pad_number(VERSION_REVISION 3) - set(LIBJPEG_TURBO_VERSION_NUMBER ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_REVISION}) - --if(NOT WIN32) -- message(FATAL_ERROR "Platform not supported by this build system. Use autotools instead.") --endif() -- - string(TIMESTAMP BUILD "%Y%m%d") - - # This does nothing except when using MinGW. CMAKE_BUILD_TYPE has no meaning -@@ -166,8 +162,10 @@ endif() - - if(64BIT) - message(STATUS "64-bit build") -+ add_compile_options(-DSIZEOF_SIZE_T=8) - else() - message(STATUS "32-bit build") -+ add_compile_options(-DSIZEOF_SIZE_T=4) - endif() - - if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 002818c47..a4fbb5b66 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -1,21 +1,16 @@ include(vcpkg_common_functions) -vcpkg_download_distfile(GETENV_PATCH - URLS "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff" - FILENAME "libjpeg-turbo-bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff" - SHA512 4cd064521b5e4baba4adf972f9f574f6dd43a2cd3e3ad143ca2cdf0f165024406d4fd2ed094124d0c17c5370394140e82fdd892d3cdc49609acdf8f79db1758c -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo - REF 1.5.3 - SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7 + REF 2.0.2 + SHA512 4dcde37ba014500cee69f7d49b359112655c177cf2c0003b4693bfe25f8a55147e9a87f58d31b4fc952a7faed6fecd5087220fd879110ade326922991f11c423 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch - linux-cmake.patch - "${GETENV_PATCH}" + + #workaround for vcpkg bug see #5697 on github for more information + workaround_cmake_system_processor.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) @@ -51,23 +46,43 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Rename libraries for static builds -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") -elseif(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") + endif() + 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/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") + + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() +else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") + endif() endif() file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo ) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/copyright) -vcpkg_copy_pdbs() + +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(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) +file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) +if(EXE OR DEBUG_EXE) + file(REMOVE ${EXE} ${DEBUG_EXE}) +endif() + 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(RENAME ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/copyright) + +vcpkg_copy_pdbs() vcpkg_test_cmake(PACKAGE_NAME JPEG MODULE) diff --git a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch new file mode 100644 index 000000000..613504dfa --- /dev/null +++ b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b2f137a..3754095 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,7 +40,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
diff --git a/ports/libkml/CONTROL b/ports/libkml/CONTROL index b5ea568c7..7e54d2c1c 100644 --- a/ports/libkml/CONTROL +++ b/ports/libkml/CONTROL @@ -1,4 +1,5 @@ Source: libkml Version: 1.3.0-2 +Homepage: https://github.com/libkml/libkml Description: Reference implementation of OGC KML 2.2 Build-Depends: zlib, expat, minizip, uriparser, boost-smart-ptr diff --git a/ports/liblemon/CONTROL b/ports/liblemon/CONTROL index c21960b72..1ec6050e0 100644 --- a/ports/liblemon/CONTROL +++ b/ports/liblemon/CONTROL @@ -1,3 +1,3 @@ -Source: liblemon
-Version: 1.3.1-4
-Description: Library for Efficient Modeling and Optimization in Networks
+Source: liblemon +Version: 2019-06-13 +Description: Library for Efficient Modeling and Optimization in Networks diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake index b41322a87..960b09987 100644 --- a/ports/liblemon/portfile.cmake +++ b/ports/liblemon/portfile.cmake @@ -2,12 +2,12 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(VERSION 1.3.1) +set(VERSION ed2c21cbd6ef) vcpkg_download_distfile(ARCHIVE - URLS "http://lemon.cs.elte.hu/pub/sources/lemon-${VERSION}.zip" + URLS "http://lemon.cs.elte.hu/hg/lemon/archive/${VERSION}.zip" FILENAME "lemon-${VERSION}.zip" - SHA512 86d15914b8c3cd206a20c37dbe3b8ca4b553060567a07603db7b6f8dd7dcf9cb043cca31660ff1b7fb77e359b59fac5ca0aab57fd415fda5ecca0f42eade6567 + SHA512 029640e4f791a18068cb2e2b4e794d09822d9d56fb957eb3e2cceae3a30065c0041a31c465637cfcadf7b2473564070b34adc88513439cdf9046831854e2aa70 ) vcpkg_extract_source_archive_ex( @@ -38,6 +38,7 @@ file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblemon/) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblemon) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) # Handle copyright diff --git a/ports/liblo/CONTROL b/ports/liblo/CONTROL index b5c4f6861..b2fc4def7 100644 --- a/ports/liblo/CONTROL +++ b/ports/liblo/CONTROL @@ -1,3 +1,4 @@ Source: liblo -Version: 0.29-1 +Version: 0.30 +Homepage: https://github.com/radarsat1/liblo Description: liblo is an implementation of the Open Sound Control protocol for POSIX systems
\ No newline at end of file diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake index 4dae62903..27e41af18 100644 --- a/ports/liblo/portfile.cmake +++ b/ports/liblo/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO radarsat1/liblo - REF 0.29 - SHA512 45648f2b2280e056b045dc0f08491baa7c154a983af95cf79438ac8fafd8f03a44c337a4beb0e01dce1f4d7352a03dc9088244d8db77dcdbfa6e39874dd6250f + REF 0.30 + SHA512 d36c141c513f869e6d1963bd0d584030038019b8be0b27bb9a684722b6e7a38e942ad2ee7c2e67ac13b965560937aad97259435ed86034aa2dc8cb92d23845d8 HEAD_REF master ) diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL index 0d2d95b1d..995b9fbd6 100644 --- a/ports/liblsl/CONTROL +++ b/ports/liblsl/CONTROL @@ -1,3 +1,3 @@ Source: liblsl
-Version: 1.13.0-b4
+Version: 1.13.0-b6
Description: C++ lsl library for multi-modal time-synched data transmission over the local network
diff --git a/ports/liblsl/fix-runtime-destination.patch b/ports/liblsl/fix-runtime-destination.patch deleted file mode 100644 index a2bdbfbbe..000000000 --- a/ports/liblsl/fix-runtime-destination.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5832a0e6..497dacd1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -170,7 +170,7 @@ endif() - install(TARGETS lsl
- COMPONENT liblsl
- EXPORT "${PROJECT_NAME}Config"
-- RUNTIME DESTINATION ${LSLPREFIX}lib
-+ RUNTIME DESTINATION ${LSLPREFIX}bin
- LIBRARY DESTINATION ${LSLPREFIX}lib
- INCLUDES DESTINATION ${LSLPREFIX}include
- ARCHIVE DESTINATION ${LSLPREFIX}lib
diff --git a/ports/liblsl/hardcode-version.patch b/ports/liblsl/hardcode-version.patch deleted file mode 100644 index e7343271e..000000000 --- a/ports/liblsl/hardcode-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73e4a7a0..0f8e19f4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,26 +106,6 @@ if(LSL_NO_FANCY_LIBNAME) - set(CMAKE_DEBUG_POSTFIX "") - endif() - --# try to find out which revision is currently checked out --find_package(Git) --if(GIT_FOUND) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --tags HEAD -- WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" -- OUTPUT_VARIABLE lslgitrevision -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} rev-parse --symbolic-full-name --abbrev-ref @ -- WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" -- OUTPUT_VARIABLE lslgitbranch -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ) -- message(STATUS "Git version information: ${lslgitbranch}/${lslgitrevision}") --else() -- set(lslgitrevision "unknown") -- set(lslgitbranch "unknown") --endif() - set(LSL_VERSION_INFO "\"git:${lslgitrevision}/branch:${lslgitbranch}/build:${CMAKE_BUILD_TYPE}/compiler:${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}/boost:\" BOOST_LIB_VERSION") - set_source_files_properties("src/lsl_freefuncs_c.cpp" PROPERTIES COMPILE_DEFINITIONS LSL_LIBRARY_INFO_STR=${LSL_VERSION_INFO}) - diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index d8670d7e3..1b6890a14 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -5,10 +5,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO sccn/liblsl
- REF v1.13.0-b4 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake
- SHA512 19bc587afcff315385e7bab1f88cf4edd315acfda61a630b23ffe4c59bc0f5aa570f0a979071f2b60009bb4d4b8ce08c98c414dc5b88042556b2501f4b8dcb79
+ REF 1.13.0-b6 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake
+ SHA512 fb98cdd73de5f13e97f639ba3f2f836d46ce28cdcb2246584728f296eb647e2c9c069534470a603b10d7dc34ab8978bf246e2187428ab231a925feb0b7024c89
HEAD_REF master
- PATCHES hardcode-version.patch fix-runtime-destination.patch
)
vcpkg_configure_cmake(
@@ -18,7 +17,7 @@ vcpkg_configure_cmake( -DLSL_BUILD_STATIC=OFF
-DLSL_UNIXFOLDERS=ON
-DLSL_NO_FANCY_LIBNAME=ON
- -Dlslgitrevision="v1.13.0-b4"
+ -Dlslgitrevision="1.13.0-b6"
-Dlslgitbranch="master"
)
diff --git a/ports/liblzma/CMakeLists.txt b/ports/liblzma/CMakeLists.txt index 6b84c004a..a9927c2b6 100644 --- a/ports/liblzma/CMakeLists.txt +++ b/ports/liblzma/CMakeLists.txt @@ -1,22 +1,15 @@ cmake_minimum_required(VERSION 3.0) -project(liblzma) +project(LibLZMA) -add_definitions(-DHAVE_CONFIG_H) -if(BUILD_SHARED_LIBS) - add_definitions(-DLIBLZMADLL_EXPORTS) - add_definitions(-DDLL_EXPORT) -endif() - -if(NOT MSVC) - add_definitions(-DHAVE_VISIBILITY=1) -endif() +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/liblzma" CACHE PATH "Path where cmake configs will be installed") +set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Append a suffix to debug libraries") -if(WIN32) - include_directories(windows/vs2017) -else() - include_directories(${CMAKE_CURRENT_BINARY_DIR}) +if(NOT WIN32) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config.h - """ + " #define TUKLIB_SYMBOL_PREFIX lzma_ #define ASSUME_RAM 128 #define HAVE_CHECK_CRC32 1 @@ -58,19 +51,10 @@ else() #define PACKAGE_NAME \"XZ Utils\" #define PACKAGE_URL \"http://tukaani.org/xz/\" #define SIZEOF_SIZE_T (sizeof(size_t)) -""") +") endif() -include_directories(src/liblzma/common) -include_directories(src/common) -include_directories(src/liblzma/api) -include_directories(src/liblzma/check) -include_directories(src/liblzma/delta) -include_directories(src/liblzma/lz) -include_directories(src/liblzma/lzma) -include_directories(src/liblzma/rangecoder) -include_directories(src/liblzma/simple) -add_library(lzma +add_library(LibLZMA src/common/tuklib_cpucores.c src/common/tuklib_physmem.c src/liblzma/check/check.c @@ -143,14 +127,56 @@ add_library(lzma src/liblzma/simple/simple_decoder.c src/liblzma/simple/simple_encoder.c src/liblzma/simple/sparc.c - src/liblzma/simple/x86.c) + src/liblzma/simple/x86.c +) -install(TARGETS lzma - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) +if(MSVC) + target_include_directories(LibLZMA PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/windows/vs2017>) +else() + target_compile_definitions(LibLZMA PRIVATE -DHAVE_VISIBILITY=1) +endif() -if(NOT LIBLZMA_SKIP_HEADERS) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma DESTINATION include) - install(FILES ${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma.h DESTINATION include) +if(BUILD_SHARED_LIBS) + target_compile_definitions(LibLZMA PRIVATE -DDLL_EXPORT) + target_compile_definitions(LibLZMA PUBLIC -DLIBLZMADLL_EXPORTS) +else() + target_compile_definitions(LibLZMA PUBLIC -DLZMA_API_STATIC) endif() +target_compile_definitions(LibLZMA PUBLIC -DHAVE_CONFIG_H) + +target_include_directories(LibLZMA PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/common> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/common> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/check> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/delta> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/lz> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/rangecoder> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/simple> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/lzma> + $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/src/liblzma/api> + $<INSTALL_INTERFACE:${INSTALL_INCLUDE_DIR}> +) + +set_target_properties(LibLZMA PROPERTIES OUTPUT_NAME "lzma") + +set_target_properties(LibLZMA PROPERTIES PUBLIC_HEADER +"${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/base.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/bcj.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/block.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/check.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/container.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/delta.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/filter.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/hardware.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/index.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/index_hash.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/lzma12.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/stream_flags.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/version.h;${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma/vli.h" +) + +install(TARGETS LibLZMA EXPORT LibLZMATargets + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}/lzma" +) + +install(FILES "${PROJECT_SOURCE_DIR}/src/liblzma/api/lzma.h" + DESTINATION "${INSTALL_INCLUDE_DIR}" +) + +install(EXPORT LibLZMATargets + FILE LibLZMAConfig.cmake + NAMESPACE LibLZMA:: + DESTINATION "${INSTALL_CMAKE_DIR}" +) diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL index c94576a3f..967b3b16c 100644 --- a/ports/liblzma/CONTROL +++ b/ports/liblzma/CONTROL @@ -1,3 +1,4 @@ -Source: liblzma
-Version: 5.2.4-1
-Description: Compression library with an API similar to that of zlib.
+Source: liblzma +Version: 5.2.4-2 +Homepage: https://github.com/xz-mirror/xz +Description: Compression library with an API similar to that of zlib. diff --git a/ports/liblzma/auto-define-lzma-api-static.patch b/ports/liblzma/auto-define-lzma-api-static.patch deleted file mode 100644 index d897e2457..000000000 --- a/ports/liblzma/auto-define-lzma-api-static.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lzma.h b/lzma.h -index ce675a7..ac0fc98 100644 ---- a/lzma.h -+++ b/lzma.h -@@ -187,6 +187,9 @@ - * need to worry about LZMA_API_STATIC. Also the calling convention is - * omitted on Cygwin but not on MinGW. - */ -+ -+#define LZMA_API_STATIC -+ - #ifndef LZMA_API_IMPORT - # if !defined(LZMA_API_STATIC) && defined(_WIN32) && !defined(__GNUC__) - # define LZMA_API_IMPORT __declspec(dllimport) diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 5534b10e4..e7260309b 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -15,21 +15,67 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS_DEBUG - -DLIBLZMA_SKIP_HEADERS=ON ) vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/auto-define-lzma-api-static.patch) +file(APPEND ${CURRENT_PACKAGES_DIR}/share/liblzma/LibLZMAConfig.cmake +" +include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) +find_path(LibLZMA_INCLUDE_DIR + NAMES lzma.h + PATH_SUFFIXES lzma +) +if(NOT LibLZMA_LIBRARY) + find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma LZMA LibLZMA PATHS \${_IMPORT_PREFIX}/lib/) + find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad LZMAd LibLZMAd PATHS \${_IMPORT_PREFIX}/debug/lib/) + 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() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/liblzma/COPYING ${CURRENT_PACKAGES_DIR}/share/liblzma/copyright) +## 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 \"\") +") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(APPEND ${CURRENT_PACKAGES_DIR}/share/liblzma/LibLZMAConfig.cmake "add_definitions(-DLZMA_API_STATIC)") +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma RENAME copyright) diff --git a/ports/liblzma/usage b/ports/liblzma/usage deleted file mode 100644 index 6f5a281a5..000000000 --- a/ports/liblzma/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package liblzma is compatible with built-in CMake targets:
-
- find_package(LibLZMA REQUIRED)
- target_include_directories(main PRIVATE ${LIBLZMA_INCLUDE_DIRS})
- target_link_libraries(main PRIVATE ${LIBLZMA_LIBRARIES})
diff --git a/ports/liblzma/vcpkg-cmake-wrapper.cmake b/ports/liblzma/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..b7572d736 --- /dev/null +++ b/ports/liblzma/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,4 @@ +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") +_find_package(${ARGS} CONFIG) diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 0eff30a4b..986eb5d23 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,3 +1,4 @@ Source: libmariadb
-Version: 3.0.2-1
+Version: 3.0.10-1
+Homepage: https://github.com/MariaDB/mariadb-connector-c
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
diff --git a/ports/libmariadb/disable-test-build.patch b/ports/libmariadb/disable-test-build.patch new file mode 100644 index 000000000..c877fb50b --- /dev/null +++ b/ports/libmariadb/disable-test-build.patch @@ -0,0 +1,34 @@ +diff --git a/unittest/libmariadb/CMakeLists.txt b/unittest/libmariadb/CMakeLists.txt
+index 9cea916..a39ba94 100644
+--- a/unittest/libmariadb/CMakeLists.txt
++++ b/unittest/libmariadb/CMakeLists.txt
+@@ -58,16 +58,16 @@ ENDIF()
+
+ ADD_LIBRARY(ma_getopt ma_getopt.c)
+
+-FOREACH(API_TEST ${API_TESTS})
+- IF (NOT TARGET ${API_TEST})
+- ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+- ENDIF()
+- TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
+- ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
+- SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 180)
+-ENDFOREACH(API_TEST)
+-
+-FOREACH(API_TEST ${MANUAL_TESTS})
+- ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+- TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
+-ENDFOREACH()
++#FOREACH(API_TEST ${API_TESTS})
++# IF (NOT TARGET ${API_TEST})
++# ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
++# ENDIF()
++# TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++# ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
++# SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 180)
++#ENDFOREACH(API_TEST)
++#
++#FOREACH(API_TEST ${MANUAL_TESTS})
++# ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
++# TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++#ENDFOREACH()
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 95b852698..0089ec0a3 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -8,10 +8,12 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO MariaDB/mariadb-connector-c
- REF v3.0.2
- SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
+ REF v3.0.10 + SHA512 43f89ead531d1b2f6ede943486bf39f606124762309c294b0f3e185937aef7439cb345103fc065e7940ed64c01ca1bf16940cd2fb0d80da60f39009c3b5a910b
HEAD_REF master
- PATCHES md.patch
+ PATCHES
+ md.patch
+ disable-test-build.patch
)
vcpkg_configure_cmake(
diff --git a/ports/libmaxminddb/CONTROL b/ports/libmaxminddb/CONTROL index a075cdb55..f8b7f85be 100644 --- a/ports/libmaxminddb/CONTROL +++ b/ports/libmaxminddb/CONTROL @@ -1,3 +1,3 @@ Source: libmaxminddb
-Version: 1.3.2-1
+Version: 1.3.2-2
Description: C library for the MaxMind DB file format
\ No newline at end of file diff --git a/ports/libmaxminddb/fix-linux-build.patch b/ports/libmaxminddb/fix-linux-build.patch new file mode 100644 index 000000000..334b0f64c --- /dev/null +++ b/ports/libmaxminddb/fix-linux-build.patch @@ -0,0 +1,19 @@ +diff --git a/include/maxminddb.h b/include/maxminddb.h +index de1fdf8..1d17bc3 100644 +--- a/include/maxminddb.h ++++ b/include/maxminddb.h +@@ -24,11 +24,12 @@ extern "C" { + #include <stdio.h> + #include <sys/types.h> + ++/* libmaxminddb package version from configure */ ++#define PACKAGE_VERSION "1.3.2" ++ + #ifdef _WIN32 + #include <winsock2.h> + #include <ws2tcpip.h> +-/* libmaxminddb package version from configure */ +-#define PACKAGE_VERSION "1.3.2" + + typedef ADDRESS_FAMILY sa_family_t; + diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index f2b17342f..bbc13472e 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF 1.3.2
SHA512 43ff5f4e3a413772cd315412afc1070fb80280405d8845dc9d94a795265a71007c6c182dc01da8e14bf7b8ab8defe05714bec543faa956e7fb0f0a7756e7df48
HEAD_REF master
+ PATCHES fix-linux-build.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/libmicrohttpd/CONTROL b/ports/libmicrohttpd/CONTROL index 101470530..8bc6ac229 100644 --- a/ports/libmicrohttpd/CONTROL +++ b/ports/libmicrohttpd/CONTROL @@ -1,3 +1,4 @@ Source: libmicrohttpd
-Version: 0.9.55-2
+Version: 0.9.63
+Homepage: https://www.gnu.org/software/libmicrohttpd/
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
diff --git a/ports/libmicrohttpd/portfile.cmake b/ports/libmicrohttpd/portfile.cmake index 45d995777..51f4780a9 100644 --- a/ports/libmicrohttpd/portfile.cmake +++ b/ports/libmicrohttpd/portfile.cmake @@ -2,11 +2,11 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libmicrohttpd-0.9.55) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libmicrohttpd-0.9.63) vcpkg_download_distfile(ARCHIVE - URLS "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz" - FILENAME "libmicrohttpd-0.9.55.tar.gz" - SHA512 b410e7253d7c98c40b5e8b8dcd1f93bcbb05c88717190e8dae73073d36465e8e5cfa53c6c5098de60051a5ec64dc423fd94f4b06537d8146b744aa99f5a0b173 + URLS "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.63.tar.gz" + FILENAME "libmicrohttpd-0.9.63.tar.gz" + SHA512 cb99e7af84fb6d7c0fd3894a9dc0fbff14959b35347506bd3211a65bbfad36455007b9e67493e97c9d8394834408df10eeabdc7758573e6aae0ba6f5f87afe17 ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/libmikmod/CONTROL b/ports/libmikmod/CONTROL index 820a861c6..57d399a26 100644 --- a/ports/libmikmod/CONTROL +++ b/ports/libmikmod/CONTROL @@ -1,4 +1,5 @@ Source: libmikmod Version: 3.3.11.1-2 +Homepage: https://sourceforge.net/projects/mikmod/ Description: Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm. Build-Depends: openal-soft diff --git a/ports/libmodbus/CONTROL b/ports/libmodbus/CONTROL index ef880d2a0..44cededd2 100644 --- a/ports/libmodbus/CONTROL +++ b/ports/libmodbus/CONTROL @@ -1,3 +1,3 @@ Source: libmodbus
-Version: 3.1.4-2
+Version: 3.1.4-3
Description: libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol
diff --git a/ports/libmodbus/portfile.cmake b/ports/libmodbus/portfile.cmake index 95e3b8720..3b5e27c2a 100644 --- a/ports/libmodbus/portfile.cmake +++ b/ports/libmodbus/portfile.cmake @@ -19,10 +19,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
vcpkg_copy_pdbs()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmodbus 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/libmodplug/CONTROL b/ports/libmodplug/CONTROL index 2a6cb4638..c486d4eb9 100644 --- a/ports/libmodplug/CONTROL +++ b/ports/libmodplug/CONTROL @@ -1,3 +1,4 @@ Source: libmodplug
Version: 0.8.9.0-4
+Homepage: https://github.com/Konstanty/libmodplug
Description: The ModPlug mod file playing library.
diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 287616088..01b1081d6 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -15,7 +15,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) else()
vcpkg_from_github(ARCHIVE
OUT_SOURCE_PATH SOURCE_PATH
- REPO JackBister/libmodplug
+ REPO Konstanty/libmodplug
REF ${MODPLUG_HASH}
SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
PATCHES
diff --git a/ports/libmspack/CONTROL b/ports/libmspack/CONTROL index cf08e5acc..de476a430 100644 --- a/ports/libmspack/CONTROL +++ b/ports/libmspack/CONTROL @@ -1,4 +1,5 @@ Source: libmspack Version: 0.10.1 Build-Depends: +Homepage: https://www.cabextract.org.uk/libmspack Description: libmspack is a portable library for some loosely related Microsoft compression formats. diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL index 12060296d..4de343cb3 100644 --- a/ports/libmupdf/CONTROL +++ b/ports/libmupdf/CONTROL @@ -1,4 +1,5 @@ -Source: libmupdf
-Version: 1.12.0-2
-Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec
-Description: a lightweight PDF, XPS, and E-book library
+Source: libmupdf +Version: 1.12.0-2 +Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec +Homepage: https://github.com/ArtifexSoftware/mupdf +Description: a lightweight PDF, XPS, and E-book library diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index b2a56c808..0569b5505 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -9,7 +9,8 @@ vcpkg_from_github( SHA512 893a1958e34355acf73624e9c47f4a97adf13d5fe33604ac384df9ac22a56ef7c18e02143eaffc3c2a08f460e4c71fee00c094b6d6696f8446977bb18f65e3da HEAD_REF master PATCHES - "${CURRENT_PORT_DIR}/Fix-error-C2169.patch" + Fix-error-C2169.patch + remove_opj_defines.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/libmupdf/remove_opj_defines.patch b/ports/libmupdf/remove_opj_defines.patch new file mode 100644 index 000000000..ec591d367 --- /dev/null +++ b/ports/libmupdf/remove_opj_defines.patch @@ -0,0 +1,16 @@ +diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c +index 65699ba..ea84778 100644 +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -445,11 +445,6 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w + + #else /* HAVE_LURATECH */ + +-#define OPJ_STATIC +-#define OPJ_HAVE_INTTYPES_H +-#if !defined(_MSC_VER) || _MSC_VER >= 1600 +-#define OPJ_HAVE_STDINT_H +-#endif + #define USE_JPIP + + #include <openjpeg.h> diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL index 007718af7..37c42943e 100644 --- a/ports/libmysql/CONTROL +++ b/ports/libmysql/CONTROL @@ -1,4 +1,5 @@ Source: libmysql -Version: 8.0.4-3 +Version: 8.0.4-4 +Homepage: https://github.com/mysql/mysql-server Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib Description: A MySQL client library for C development. diff --git a/ports/libmysql/linux_libmysql.patch b/ports/libmysql/linux_libmysql.patch new file mode 100644 index 000000000..42dfa73d8 --- /dev/null +++ b/ports/libmysql/linux_libmysql.patch @@ -0,0 +1,18 @@ +diff --git a/configure.cmake b/configure.cmake +index 1f3d8e2..9e45f48 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -456,7 +456,11 @@ IF(NOT HAVE_FCNTL_NONBLOCK) + ENDIF() + + IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC) +- STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor) ++ IF(${CMAKE_SYSTEM_PROCESSOR}) ++ STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor) ++ ELSE() ++ STRING(TOLOWER ${CMAKE_HOST_SYSTEM_PROCESSOR} processor) ++ ENDIF() + IF(processor MATCHES "86" OR processor MATCHES "amd64" OR processor MATCHES "x64") + IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS") + # The loader in some Solaris versions has a bug due to which it refuses to + diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index dfd38c41c..e179ca714 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -10,6 +10,10 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND NOT CMAKE_SYSTEM_NAME OR CMAKE_S message(FATAL_ERROR "Oracle has dropped support in libmysql for 32-bit Windows.") endif() +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + message(WARNING "libmysql needs ncurses on LINUX, please install ncurses first.\nOn Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates it is ncurses-devel.") +endif() + include(vcpkg_common_functions) vcpkg_from_github( @@ -18,13 +22,10 @@ vcpkg_from_github( REF mysql-8.0.4 SHA512 8d9129e7670e88df14238299052a5fe6d4f3e40bf27ef7a3ca8f4f91fb40507b13463e9bd24435b34e5d06c5d056dfb259fb04e77cc251b188eea734db5642be HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/ignore-boost-version.patch - ${CMAKE_CURRENT_LIST_DIR}/system-libs.patch + ignore-boost-version.patch + system-libs.patch + linux_libmysql.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_65_0) @@ -100,13 +101,13 @@ else() ${CURRENT_PACKAGES_DIR}/lib/mysqlclient.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mysqlclient.lib) - # correct the dll directory
+ # correct the dll directory if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/bin/libmysql.dll) file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/bin/libmysql.pdb) endif() -
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.dll) @@ -120,4 +121,4 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h "${_contents}") # copy license file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmysql) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright)
\ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmysql/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmysql/copyright) diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL index 7a33f1423..2d542c41d 100644 --- a/ports/libnice/CONTROL +++ b/ports/libnice/CONTROL @@ -1,4 +1,5 @@ Source: libnice Version: 0.1.15 +Homepage: https://nice.freedesktop.org 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). Build-Depends: glib, openssl diff --git a/ports/libnoise/CONTROL b/ports/libnoise/CONTROL new file mode 100644 index 000000000..53009a450 --- /dev/null +++ b/ports/libnoise/CONTROL @@ -0,0 +1,3 @@ +Source: libnoise
+Version: 1.0.0
+Description: A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques.
diff --git a/ports/libnoise/portfile.cmake b/ports/libnoise/portfile.cmake new file mode 100644 index 000000000..28465f585 --- /dev/null +++ b/ports/libnoise/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions)
+
+set( LIBNOISE_VERSION "1.0.0" )
+set( LIBNOISE_COMMIT "d7e68784a2b24c632868506780eba336ede74ecd" )
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO RobertHue/libnoise
+ REF ${LIBNOISE_COMMIT}
+ SHA512 8c4d654acb4ae3d90ee62ebdf0447f876022dcb887ebfad88f39b09d29183a58e6fc1b1f1d03edff804975c8befcc6eda33c44797495285aae338c2e869a14d7
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+# Include files should not be duplicated into the /debug/include directory.
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/libnoise)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/libnoise/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libnoise/copyright)
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME libnoise)
\ No newline at end of file diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL index 5913d752b..24f7d18b9 100644 --- a/ports/libodb-boost/CONTROL +++ b/ports/libodb-boost/CONTROL @@ -1,4 +1,4 @@ Source: libodb-boost -Version: 2.4.0-1 +Version: 2.4.0-2 Description: Description: Boost support for the ODB ORM library Build-Depends: libodb diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake index 3f8dfc061..212e6b01a 100644 --- a/ports/libodb-boost/portfile.cmake +++ b/ports/libodb-boost/portfile.cmake @@ -17,7 +17,7 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) -vcpkg_build_cmake() + vcpkg_install_cmake() file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_boostConfig-debug.cmake LIBODB_DEBUG_TARGETS) diff --git a/ports/libodb-mysql/CONTROL b/ports/libodb-mysql/CONTROL index 3a728cb58..fe5a28e8a 100644 --- a/ports/libodb-mysql/CONTROL +++ b/ports/libodb-mysql/CONTROL @@ -1,4 +1,5 @@ Source: libodb-mysql Version: 2.4.0-2 +Homepage: https://www.codesynthesis.com/products/odb/ Description: MySQL support for the ODB ORM library Build-Depends: libodb, libmysql
\ No newline at end of file diff --git a/ports/libodb-pgsql/CONTROL b/ports/libodb-pgsql/CONTROL index f89d1f37c..d35291135 100644 --- a/ports/libodb-pgsql/CONTROL +++ b/ports/libodb-pgsql/CONTROL @@ -1,4 +1,5 @@ Source: libodb-pgsql -Version: 2.4.0-1 +Version: 2.4.0-2 +Homepage: https://www.codesynthesis.com/products/odb/ Description: Description: PostgreSQL support for the ODB ORM library Build-Depends: libodb, libpq diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake index cef945c73..3e31f2aa7 100644 --- a/ports/libodb-pgsql/portfile.cmake +++ b/ports/libodb-pgsql/portfile.cmake @@ -17,7 +17,7 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) -vcpkg_build_cmake() + vcpkg_install_cmake() file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_pgsqlConfig-debug.cmake LIBODB_DEBUG_TARGETS) diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL index 6a98869bd..a8d9ef41f 100644 --- a/ports/libodb-sqlite/CONTROL +++ b/ports/libodb-sqlite/CONTROL @@ -1,4 +1,5 @@ Source: libodb-sqlite -Version: 2.4.0-2 +Version: 2.4.0-3 +Homepage: https://www.codesynthesis.com/products/odb/ Description: Sqlite support for the ODB ORM library Build-Depends: libodb, sqlite3 diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index 143d32efb..b301169a7 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -25,7 +25,7 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) -vcpkg_build_cmake() + vcpkg_install_cmake() file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake LIBODB_DEBUG_TARGETS) diff --git a/ports/libodb/CONTROL b/ports/libodb/CONTROL index 28a9f85f4..049a1bd12 100644 --- a/ports/libodb/CONTROL +++ b/ports/libodb/CONTROL @@ -1,3 +1,4 @@ Source: libodb -Version: 2.4.0-3 +Version: 2.4.0-4 +Homepage: https://www.codesynthesis.com/products/odb/ Description: ODB library, base runtime for the ODB ORM solution diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 017979dc4..1ca5d4a1a 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -25,7 +25,7 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) -vcpkg_build_cmake() + vcpkg_install_cmake() file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") diff --git a/ports/libogg/0001-Install-CMake-package-config-module.patch b/ports/libogg/0001-Install-CMake-package-config-module.patch deleted file mode 100644 index 2a33a641e..000000000 --- a/ports/libogg/0001-Install-CMake-package-config-module.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 0d3c307cee6e8135c84f3f7755bbc10dfd26e02b Mon Sep 17 00:00:00 2001 -From: evpobr <evpobr@gmail.com> -Date: Sat, 16 Feb 2019 11:50:16 +0500 -Subject: [PATCH] Install CMake package config module - ---- - CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++------ - 1 file changed, 34 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ab14a2..9f5ee5a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,10 @@ --cmake_minimum_required(VERSION 2.8.7) -+cmake_minimum_required(VERSION 2.8.12) - project(libogg) - - # Required modules - include(GNUInstallDirs) - include(CheckIncludeFiles) -+include(CMakePackageConfigHelpers) - - # Build options - option(BUILD_SHARED_LIBS "Build shared library" OFF) -@@ -80,18 +81,24 @@ if(BUILD_FRAMEWORK) - set(BUILD_SHARED_LIBS TRUE) - endif() - --include_directories(include ${CMAKE_CURRENT_BINARY_DIR}/include) --add_library(ogg ${OGG_HEADERS} ${OGG_SOURCES}) -+add_library(Ogg ${OGG_HEADERS} ${OGG_SOURCES}) -+ -+target_include_directories(Ogg -+ PUBLIC -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> -+) - - get_version_info(OGG_VERSION_INFO "LIB_CURRENT" "LIB_AGE" "LIB_REVISION") - set_target_properties( -- ogg PROPERTIES -+ Ogg PROPERTIES - SOVERSION ${OGG_VERSION_INFO} - PUBLIC_HEADER "${OGG_HEADERS}" - ) - - if(BUILD_FRAMEWORK) -- set_target_properties(ogg PROPERTIES -+ set_target_properties(Ogg PROPERTIES - FRAMEWORK TRUE - FRAMEWORK_VERSION ${PROJECT_VERSION} - MACOSX_FRAMEWORK_IDENTIFIER org.xiph.ogg -@@ -100,17 +107,38 @@ if(BUILD_FRAMEWORK) - XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" - OUTPUT_NAME Ogg - ) -+else() -+ set_target_properties(Ogg PROPERTIES OUTPUT_NAME ogg) - endif() - - configure_pkg_config_file(ogg.pc.in) - --install(TARGETS ogg -+set(CMAKE_INSTALL_PACKAGEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Ogg) -+ -+install(TARGETS Ogg -+ EXPORT OggConfig - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ogg - ) -+install(EXPORT OggConfig -+ NAMESPACE Ogg:: -+ DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} -+) -+ -+if(CMAKE_VERSION VERSION_LESS 3.11) -+ write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMajorVersion) -+else() -+ write_basic_package_version_file(OggConfigVersion.cmake COMPATIBILITY SameMinorVersion) -+endif() -+ -+install( -+ FILES ${CMAKE_CURRENT_BINARY_DIR}/OggConfigVersion.cmake -+ DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} -+) -+ - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ogg.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) --- -2.20.1.windows.1 - diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL index 965e4e46f..497ec9a6d 100644 --- a/ports/libogg/CONTROL +++ b/ports/libogg/CONTROL @@ -1,3 +1,4 @@ -Source: libogg
-Version: 1.3.3-2
-Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.
+Source: libogg +Version: 1.3.3-4 +Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. +Homepage: https://github.com/xiph/ogg diff --git a/ports/libogg/missing_usize64.patch b/ports/libogg/missing_usize64.patch new file mode 100644 index 000000000..556bc2a54 --- /dev/null +++ b/ports/libogg/missing_usize64.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c31a3c..c3c060a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,6 +63,7 @@ set(USIZE16 uint16_t)
+ set(SIZE32 int32_t)
+ set(USIZE32 uint32_t)
+ set(SIZE64 int64_t)
++set(USIZE64 uint64_t)
+
+ configure_file(include/ogg/config_types.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/ogg/config_types.h @ONLY)
+
diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index 3a37e1744..0b3b8be7b 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -1,27 +1,28 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/ogg - REF v1.3.3 - SHA512 0bd6095d647530d4cb1f509eb5e99965a25cc3dd9b8125b93abd6b248255c890cf20710154bdec40568478eb5c4cde724abfb2eff1f3a04e63acef0fbbc9799b + REF 6ccfcc2dce48c0d430b45064d0e13c962a64c42f + SHA512 441950d541f626a2e668efab4ed429c453534ef0334aad410013f07870a4a99e347f7a7eed335d77af41f02ce3dd600564d982e4c976a0c4cb76c19b1231d39e HEAD_REF master - PATCHES 0001-Install-CMake-package-config-module.patch + PATCHES + missing_usize64.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -DINSTALL_DOCS=0 -DINSTALL_PKG_CONFIG_MODULE=0 ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Ogg TARGET_PATH share/Ogg) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ogg TARGET_PATH share/ogg) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libogg RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/libopenmpt/CONTROL b/ports/libopenmpt/CONTROL index b12a2ee64..32fa988d1 100644 --- a/ports/libopenmpt/CONTROL +++ b/ports/libopenmpt/CONTROL @@ -1,4 +1,5 @@ Source: libopenmpt Version: 2017-01-28-cf2390140 +Homepage: https://github.com/OpenMPT/openmpt Description: a library to render tracker music Build-Depends: zlib, mpg123, libogg, libvorbis, portaudio, libflac diff --git a/ports/libopusenc/CMakeLists.txt b/ports/libopusenc/CMakeLists.txt index 10f425821..4ab1a4e9d 100644 --- a/ports/libopusenc/CMakeLists.txt +++ b/ports/libopusenc/CMakeLists.txt @@ -11,7 +11,8 @@ add_library(opusenc src/opus_header.c src/opusenc.c src/picture.c - src/resample.c) + src/resample.c + src/unicode_support.c) get_filename_component(FOLDER ${CMAKE_CURRENT_SOURCE_DIR} NAME) string(REPLACE "libopusenc-" "" VERSION ${FOLDER}) diff --git a/ports/libopusenc/CONTROL b/ports/libopusenc/CONTROL index 93b2a7544..844b22d49 100644 --- a/ports/libopusenc/CONTROL +++ b/ports/libopusenc/CONTROL @@ -1,4 +1,5 @@ Source: libopusenc -Version: 0.1-1 +Version: 0.2.1 +Homepage: https://github.com/xiph/libopusenc Description: Library for encoding .opus audio files and live streams. Build-Depends: opus diff --git a/ports/libopusenc/portfile.cmake b/ports/libopusenc/portfile.cmake index d41880e01..f3c226aea 100644 --- a/ports/libopusenc/portfile.cmake +++ b/ports/libopusenc/portfile.cmake @@ -6,8 +6,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/libopusenc - REF v0.1 - SHA512 6abc5cd9e87ad41409f844d350cf43ee0067ad05a768aa9ef1d726a7e98ef9b006cbc42a6601d05a51dba6386a1361751a9a367a902c52eff8b4e56c3bf8a04b + REF v0.2.1 + SHA512 9681421a967b93770796dd3503c00e1418de86438d2bfe77011dc68f6db5d666508d33c0df7308db3b7ea18f5e1b14a3115fd63837987e16347ec801c3771d26 HEAD_REF master) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/libp7-baical/CONTROL b/ports/libp7-baical/CONTROL index ea1739798..698334f58 100644 --- a/ports/libp7-baical/CONTROL +++ b/ports/libp7-baical/CONTROL @@ -1,3 +1,4 @@ Source: libp7-baical -Version: 4.4-3 +Version: 4.4-4 +Homepage: https://baical.net/ Description: P7 is a library for high-speed sending telemetry & trace data from application diff --git a/ports/libp7-baical/portfile.cmake b/ports/libp7-baical/portfile.cmake index 3edc89c47..fcc51caed 100644 --- a/ports/libp7-baical/portfile.cmake +++ b/ports/libp7-baical/portfile.cmake @@ -26,7 +26,6 @@ vcpkg_configure_cmake( PREFER_NINJA ) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/libpff/CMakeLists.txt b/ports/libpff/CMakeLists.txt new file mode 100644 index 000000000..276db5d80 --- /dev/null +++ b/ports/libpff/CMakeLists.txt @@ -0,0 +1,81 @@ +cmake_minimum_required(VERSION 3.12) + +project(libpff C) + +find_package(zlib REQUIRED) + +if(MSVC) + add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) + add_compile_definitions(_CRT_NONSTDC_NO_DEPRECATE) +endif() + +add_compile_definitions(HAVE_LOCAL_LIBCERROR) +add_compile_definitions(HAVE_LOCAL_LIBCTHREADS) +add_compile_definitions(HAVE_LOCAL_LIBCDATA) +add_compile_definitions(HAVE_LOCAL_LIBCLOCALE) +add_compile_definitions(HAVE_LOCAL_LIBCNOTIFY) +add_compile_definitions(HAVE_LOCAL_LIBCSPLIT) +add_compile_definitions(HAVE_LOCAL_LIBCFILE) +add_compile_definitions(HAVE_LOCAL_LIBCPATH) +add_compile_definitions(HAVE_LOCAL_LIBUNA) +add_compile_definitions(HAVE_LOCAL_LIBBFIO) +add_compile_definitions(HAVE_LOCAL_LIBFCACHE) +add_compile_definitions(HAVE_LOCAL_LIBFDATA) +add_compile_definitions(HAVE_LOCAL_LIBFDATETIME) +add_compile_definitions(HAVE_LOCAL_LIBFGUID) +add_compile_definitions(HAVE_LOCAL_LIBFWNT) +add_compile_definitions(HAVE_LOCAL_LIBFMAPI) +add_compile_definitions(HAVE_LOCAL_LIBFVALUE) +add_compile_definitions(ZLIB_DLL) + +add_compile_definitions(LIBPFF_DLL_EXPORT) + +if(MSVC) + set(LIB_RC libpff/libpff.rc) +endif() + + +include(GNUInstallDirs) +include(CMakePackageConfigHelpers) + +# Add CMake find_package() integration +set(PROJECT_TARGET_NAME "unofficial-${PROJECT_NAME}") +set(CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") +set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/generated/${PROJECT_TARGET_NAME}Config.cmake") +set(TARGETS_EXPORT_NAME "${PROJECT_TARGET_NAME}Targets") +set(NAMESPACE "unofficial-libpff::") + +# Source files +file(GLOB LIB_SRC lib*/*.c) + +# Headers +file(GLOB LIB_INST_HEADERS include/libpff/*.h) + +add_library(${PROJECT_NAME} ${LIB_SRC} ${LIB_RC}) + +target_include_directories(${PROJECT_NAME} PRIVATE ./include ./common) +target_include_directories(${PROJECT_NAME} PRIVATE ./libbfio ./libcdata ./libcerror ./libcfile ./libclocale ./libcnotify) +target_include_directories(${PROJECT_NAME} PRIVATE ./libcpath ./libcsplit ./libcthreads ./libfcache ./libfdata ./libfdatetime) +target_include_directories(${PROJECT_NAME} PRIVATE ./libfguid ./libfmapi ./libfvalue ./libfwnt ./libuna) + +target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB) + +install(TARGETS ${PROJECT_NAME} + EXPORT ${TARGETS_EXPORT_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + INCLUDES DESTINATION include) + +install(FILES ${LIB_INST_HEADERS} DESTINATION include/libpff) +install(FILES include/libpff.h DESTINATION include) + + +# Generate and install unofficial-libpffConfig.cmake +configure_package_config_file("Config.cmake.in" "${PROJECT_CONFIG}" INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}") +install(FILES "${PROJECT_CONFIG}" DESTINATION "${CONFIG_INSTALL_DIR}") + +# Generate and install unofficial-libpffTargets*.cmake +install(EXPORT ${TARGETS_EXPORT_NAME} + NAMESPACE ${NAMESPACE} + DESTINATION "${CONFIG_INSTALL_DIR}") diff --git a/ports/libpff/CONTROL b/ports/libpff/CONTROL new file mode 100644 index 000000000..8520aa188 --- /dev/null +++ b/ports/libpff/CONTROL @@ -0,0 +1,4 @@ +Source: libpff +Version: 2018-07-14-1 +Build-Depends: zlib +Description: Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format. diff --git a/ports/libpff/Config.cmake.in b/ports/libpff/Config.cmake.in new file mode 100644 index 000000000..bd6bd4532 --- /dev/null +++ b/ports/libpff/Config.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
+check_required_components("@PROJECT_NAME@")
diff --git a/ports/libpff/portfile.cmake b/ports/libpff/portfile.cmake new file mode 100644 index 000000000..6d327d8a5 --- /dev/null +++ b/ports/libpff/portfile.cmake @@ -0,0 +1,39 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +set(LIB_VERSION 20180714) +set(LIB_FILENAME libpff-experimental-${LIB_VERSION}.tar.gz) + +# Release distribution file contains configured sources, while the source code in the repository does not. +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/libyal/libpff/releases/download/${LIB_VERSION}/${LIB_FILENAME}" + FILENAME "${LIB_FILENAME}" + SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1 +) + + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIB_VERSION} +) + + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_configure_cmake( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libpff TARGET_PATH share/unofficial-libpff) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# License and man +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libpff" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/libplist/CONTROL b/ports/libplist/CONTROL index bb7db384c..9189b4f48 100644 --- a/ports/libplist/CONTROL +++ b/ports/libplist/CONTROL @@ -1,3 +1,3 @@ Source: libplist
-Version: 2.0.1.197-2
+Version: 1.2.77 Description: A library to handle Apple Property List format in binary or XML
diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake index 51549e4ca..5b6ce749c 100644 --- a/ports/libplist/portfile.cmake +++ b/ports/libplist/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/libplist
- REF 2.0.1.197
- SHA512 55e1817c61d608b11646eb9c28c445f9ee801c7beb2121bd810235561117262adb73dbecb23b9ef5b0c54b0fc8089e0a46acc0e8f4845329a50a663ab004052c
+ REF f279ef534ab5adeb81f063dee5e8a8fc3ca6d3ab + SHA512 52001a46935693e3ac5f0b8c3d13d9bf51c5f34189f6f006bd697d7e965f402460060708c4fb54ed43f49a217ac442fcb8dca252fcbccd3e6a154b6c9a8c2104
HEAD_REF msvc-master
PATCHES dllexport.patch
)
@@ -21,3 +21,7 @@ vcpkg_install_msbuild( LICENSE_SUBPATH COPYING.lesser
REMOVE_ROOT_INCLUDES
)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
\ No newline at end of file diff --git a/ports/libpng-apng/CONTROL b/ports/libpng-apng/CONTROL index 81db06eee..cb199b9fe 100644 --- a/ports/libpng-apng/CONTROL +++ b/ports/libpng-apng/CONTROL @@ -1,4 +1,5 @@ Source: libpng-apng -Version: 1.6.36-1 +Version: 1.6.37 Build-Depends: zlib +Homepage: https://github.com/glennrp/libpng Description: libpng-apng is a library implementing an interface for reading and writing (A)PNG ((Animated) Portable Network Graphics) format files. This is backward compatible with the regular libpng, both in library usage and format. diff --git a/ports/libpng/CONTROL b/ports/libpng/CONTROL index d5a6b559c..f813439d8 100644 --- a/ports/libpng/CONTROL +++ b/ports/libpng/CONTROL @@ -1,4 +1,5 @@ Source: libpng -Version: 1.6.37 +Version: 1.6.37-2 Build-Depends: zlib +Homepage: https://github.com/glennrp/libpng Description: libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files. diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index d6b35bf23..7262d34c7 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -7,8 +7,7 @@ vcpkg_from_github( SHA512 ccb3705c23b2724e86d072e2ac8cfc380f41fadfd6977a248d588a8ad57b6abe0e4155e525243011f245e98d9b7afbe2e8cc7fd4ff7d82fcefb40c0f48f88918 HEAD_REF master PATCHES - "use-abort-on-all-platforms.patch" - "skip-install-symlink.patch" + use-abort-on-all-platforms.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -45,15 +44,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() endif() -# Remove CMake config files as they are incorrectly generated and everyone uses built-in FindPNG anyway. -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libpng ${CURRENT_PACKAGES_DIR}/debug/lib/libpng) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpng) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/) + file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libpng) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libpng/LICENSE ${CURRENT_PACKAGES_DIR}/share/libpng/copyright) vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/png) endif() diff --git a/ports/libpng/skip-install-symlink.patch b/ports/libpng/skip-install-symlink.patch deleted file mode 100644 index c31177d7e..000000000 --- a/ports/libpng/skip-install-symlink.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48c6fa2..589e5f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -868,7 +868,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-- if(PNG_SHARED)
-+ if(PNG_SHARED AND NOT SKIP_INSTALL_SYMLINK)
- # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
- if(CYGWIN OR MINGW)
- CREATE_SYMLINK(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-@@ -881,7 +881,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
- endif(NOT WIN32)
- endif(PNG_SHARED)
-
-- if(PNG_STATIC)
-+ if(PNG_STATIC AND NOT SKIP_INSTALL_SYMLINK)
- if(NOT WIN32 OR CYGWIN OR MINGW)
- CREATE_SYMLINK( libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
- install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/ports/libpng/usage b/ports/libpng/usage deleted file mode 100644 index 19203399c..000000000 --- a/ports/libpng/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package libpng is compatible with built-in CMake targets:
-
- find_package(PNG REQUIRED)
- target_link_libraries(main PRIVATE PNG::PNG)
diff --git a/ports/libpq/CMakeLists.txt b/ports/libpq/CMakeLists.txt index 13c129317..3d5d6e508 100644 --- a/ports/libpq/CMakeLists.txt +++ b/ports/libpq/CMakeLists.txt @@ -141,7 +141,7 @@ endif() target_link_libraries(libpq PRIVATE OpenSSL::SSL) if(WIN32) - target_link_libraries(libpq PRIVATE ws2_32 secur32 advapi32 shell32) + target_link_libraries(libpq PRIVATE ws2_32 secur32 advapi32 shell32 crypt32) endif() target_include_directories(libpq PRIVATE src/include src/port ${CMAKE_CURRENT_BINARY_DIR}/include) set_target_properties(libpq PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index ac0793b13..f6c0ce34e 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,4 +1,5 @@ Source: libpq -Version: 9.6.1-6 +Version: 9.6.1-7 +Homepage: https://www.postgresql.org/ Description: The official database access API of postgresql Build-Depends: openssl, zlib (linux) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 7b23aed32..5dd4e197c 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,11 +1,19 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/postgresql-9.6.3) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "${PORT} currently only supports being built for desktop") +endif() + vcpkg_download_distfile(ARCHIVE URLS "https://ftp.postgresql.org/pub/source/v9.6.3/postgresql-9.6.3.tar.bz2" FILENAME "postgresql-9.6.3.tar.bz2" SHA512 97141972e154e6b0e756ee6a4e20f26e82022a9fd4c56305314a3a5567a79ece638e4ac3d513b46138737ae6bd27a098f30013a94767db151181aac9c01290a1 ) -vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL index 900b21f52..8653afe5a 100644 --- a/ports/libpqxx/CONTROL +++ b/ports/libpqxx/CONTROL @@ -1,4 +1,5 @@ Source: libpqxx -Version: 6.4.3 +Version: 6.4.4 +Homepage: https://github.com/jtv/libpqxx Description: The official C++ client API for PostgreSQL Build-Depends: libpq diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index e8eaee1f0..944698ceb 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 6.4.3 - SHA512 d2d54adf4f498cba0ec20bb37b7a32d18b25e298d81b1884aecb3edec99beca6a10683478e6ca02953ace0b20d335a87b926bf77cbe3cb40822cf12649ea65c5 + REF 6.4.4 + SHA512 a168dbc7af210c711fa9f0f6e20d9d3abea167d412a642f591b104a109f11f4c262a27b6919340d405400a58baf7bcc663f7d3ec1b4ecd03f0a4b6c2960b5099 HEAD_REF master PATCHES fix-deprecated-bug.patch diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL index c9e66ef18..add042b7e 100644 --- a/ports/libqglviewer/CONTROL +++ b/ports/libqglviewer/CONTROL @@ -1,4 +1,4 @@ Source: libqglviewer
-Version: 2.7.1-1
+Version: 2.7.0 Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.
Build-Depends: qt5-base
diff --git a/ports/libqglviewer/portfile.cmake b/ports/libqglviewer/portfile.cmake index f57092521..7a7cc9fdf 100644 --- a/ports/libqglviewer/portfile.cmake +++ b/ports/libqglviewer/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO GillesDebunne/libQGLViewer
- REF 28a23f14997dc2e08990b884c07075b48979cac7
- SHA512 58058543e07857f8b1480301b72f789290eee2d65382bee29773bcc1e3f45cedcee33b762bdb870b6cae8a0daab38ebdecde40e2f02720cf0f6fcf10f2007f25
+ REF 781d914c003466b342b45d19266a9613fc0e7e0e + SHA512 0586020c159fa4b3acb3ea3fa0a361bcc757d840298d7a436c356d0929b5ace3da4d054e3c0d107a499076413336e3b9a2f35750e6bf0add9320cc52a5c7afd5
HEAD_REF master
PATCHES "use-default-config-on-all-platforms.patch"
)
diff --git a/ports/libqrencode/CONTROL b/ports/libqrencode/CONTROL index 056d6a92b..9bfd8fa85 100644 --- a/ports/libqrencode/CONTROL +++ b/ports/libqrencode/CONTROL @@ -1,4 +1,5 @@ Source: libqrencode -Version: 4.0.0-2 +Version: 4.0.2 Build-Depends: libpng, libiconv +Homepage: https://github.com/fukuchi/libqrencode Description: libqrencode - a fast and compact QR Code encoding library diff --git a/ports/libqrencode/portfile.cmake b/ports/libqrencode/portfile.cmake index 72af0103e..cfcd4650a 100644 --- a/ports/libqrencode/portfile.cmake +++ b/ports/libqrencode/portfile.cmake @@ -3,15 +3,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fukuchi/libqrencode - REF v4.0.0 - SHA512 0e4855c7983d4c73eb4a7f9cb081679547957c9f4a30cb943f2ae25e3a6496a202d3489f46e248386499d05a68c6a36e24f64af57ef4d6f447ef3a39e08374ee + REF v4.0.2 + SHA512 847e32bd13358319f3beabde103b5335a6e11c3f9275425b74e89a00b0ee4d67af8a428f12acc8b80a0419382480e5aeb02e58602a69ee750c21b28f357af6bc HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/remove-deprecated-attribute.patch + PATCHES remove-deprecated-attribute.patch ) vcpkg_configure_cmake( diff --git a/ports/librabbitmq/CONTROL b/ports/librabbitmq/CONTROL index f8c686735..38287971d 100644 --- a/ports/librabbitmq/CONTROL +++ b/ports/librabbitmq/CONTROL @@ -1,4 +1,5 @@ -Source: librabbitmq
-Version: 0.8.0-1
-Build-Depends: openssl
-Description: A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.
+Source: librabbitmq +Version: 0.9.0 +Build-Depends: openssl +Homepage: https://github.com/alanxz/rabbitmq-c +Description: A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker. diff --git a/ports/librabbitmq/fix-uwpwarning.patch b/ports/librabbitmq/fix-uwpwarning.patch new file mode 100644 index 000000000..896145970 --- /dev/null +++ b/ports/librabbitmq/fix-uwpwarning.patch @@ -0,0 +1,13 @@ +diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt
+index bd5369a..f6d703f 100644
+--- a/librabbitmq/CMakeLists.txt
++++ b/librabbitmq/CMakeLists.txt
+@@ -113,7 +113,7 @@ set(RABBITMQ_SOURCES
+ ${AMQP_SSL_SRCS}
+ )
+
+-add_definitions(-DAMQP_BUILD)
++add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS)
+
+ set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT})
+
diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index cea0af218..79463c26c 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -3,9 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alanxz/rabbitmq-c - REF v0.8.0 - SHA512 54e1c98a6b0eb7de848c9fac13dcde6455a6f71acee9e62a96c171f0e3e1cf860a70837f07b633d1a55b1ffd3d33ed7186b52495fa4c6e755b69a7e728eb9f1a + REF 77e3805d1662034339c3c19bcdaaa62a56c1fa7e + SHA512 f20a841d184a2448b12c59b551ac5f1bf70a4cc0e0226fe803bab64bd6e26be5f275fb36717b3abb614e88212668cb87de5f9f749fc17ff565b2fe15f66c090e HEAD_REF master + PATCHES + fix-uwpwarning.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/libraqm/CMakeLists.txt b/ports/libraqm/CMakeLists.txt new file mode 100644 index 000000000..f50153e63 --- /dev/null +++ b/ports/libraqm/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.11)
+
+project(raqm)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_MODULE_PATH}")
+
+find_package(Freetype REQUIRED)
+find_package(Fribidi REQUIRED)
+find_package(harfbuzz CONFIG REQUIRED)
+
+find_path(HARFBUZZ_INCLUDE_DIRS
+ NAMES hb.h
+ PATH_SUFFIXES harfbuzz)
+find_path(FREETYPE_ADDITIONAL_INCLUDE_DIRS NAMES ft2build.h)
+add_library(raqm ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.c ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h)
+
+target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_ADDITIONAL_INCLUDE_DIRS})
+target_include_directories(raqm SYSTEM PUBLIC ${FREETYPE_INCLUDE_DIRS})
+target_include_directories(raqm SYSTEM PUBLIC ${HARFBUZZ_INCLUDE_DIRS})
+target_include_directories(raqm SYSTEM PUBLIC ${FRIBIDI_INCLUDE_DIR})
+
+target_link_libraries(raqm PRIVATE Freetype::Freetype)
+target_link_libraries(raqm PRIVATE harfbuzz::harfbuzz ${FRIBIDI_LIBRARY})
+
+install(TARGETS raqm
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+)
+
+set(RAQM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+set(RAQM_LIBRARY raqm)
+set(RAQM_LIBRARIES ${HARFBUZZ_LIBRARY} ${FRIBIDI_LIBRARY} ${RAQM_LIBRARY})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/raqm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
diff --git a/ports/libraqm/CONTROL b/ports/libraqm/CONTROL new file mode 100644 index 000000000..131527a4a --- /dev/null +++ b/ports/libraqm/CONTROL @@ -0,0 +1,4 @@ +Source: libraqm
+Version: 0.6.0
+Description: A library for complex text layout
+Build-Depends: freetype, harfbuzz, fribidi
\ No newline at end of file diff --git a/ports/libraqm/FindFribidi.cmake b/ports/libraqm/FindFribidi.cmake new file mode 100644 index 000000000..a12bdb60e --- /dev/null +++ b/ports/libraqm/FindFribidi.cmake @@ -0,0 +1,12 @@ +find_path(FRIBIDI_INCLUDE_DIR
+ NAMES fribidi/fribidi.h)
+
+set(FRIBIDI_INCLUDE_DIR "${FRIBIDI_INCLUDE_DIR}/fribidi")
+find_library(FRIBIDI_LIBRARY NAMES fribidi)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FriBidi
+ FOUND_VAR FRIBIDI_FOUND
+ REQUIRED_VARS FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIR
+ VERSION_VAR FRIBIDI_VERSION_STRING
+)
\ No newline at end of file diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake new file mode 100644 index 000000000..067f63dde --- /dev/null +++ b/ports/libraqm/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO HOST-Oman/libraqm
+ REF v0.6.0
+ SHA512 cd223d97b80e9d2cf26a5b68fbb84a87e53df819f12ffd06f84f1786a2207b34828d0888058a40c1d89a1466bb68b75dd326e25415afab029d51e1ed98f6a924
+ 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(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraqm RENAME copyright)
+
+# Post-build test for cmake libraries
+vcpkg_test_cmake(PACKAGE_NAME raqm)
diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL index 8dc420fda..1d0c17203 100644 --- a/ports/libraw/CONTROL +++ b/ports/libraw/CONTROL @@ -1,4 +1,5 @@ Source: libraw -Version: 0.19.0-3 +Version: 201903-1 Build-Depends: lcms, jasper +Homepage: https://www.libraw.org Description: raw image decoder library diff --git a/ports/libraw/findlibraw_debug_fix.patch b/ports/libraw/findlibraw_debug_fix.patch index a09eca537..294963eb6 100644 --- a/ports/libraw/findlibraw_debug_fix.patch +++ b/ports/libraw/findlibraw_debug_fix.patch @@ -1,6 +1,6 @@ --- a/cmake/modules/FindLibRaw.cmake 2016-11-02 07:09:50.000000000 +0100 -+++ b/cmake/modules/FindLibRaw.cmake 2018-06-02 02:50:10.501142400 +0200 -@@ -31,18 +31,34 @@ ++++ b/cmake/modules/FindLibRaw.cmake 2019-06-03 22:05:28.759307500 +0200 +@@ -31,18 +31,36 @@ PATH_SUFFIXES libraw ) @@ -18,6 +18,8 @@ + ${PC_LIBRAW_LIBRARY_DIRS} + ) + ++INCLUDE(SelectLibraryConfigurations) ++ +select_library_configurations(LibRaw) + +FIND_LIBRARY(LibRaw_r_LIBRARY_RELEASE NAMES raw_r diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index e62079ad3..d834b80e9 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -1,10 +1,17 @@ include(vcpkg_common_functions) +# Update to latest LibRaw-201903 snapshot at d4f05dd1b9b2d44c8f7e82043cbad3c724db2416 +# LibRaw publishes: +# - snapshots every 5-7 months (in master branch) +# - releases (0.18, 0.19, etc.) every 1-1.5 years. +# - security hotfixes for releases (0.19.1, 0.19.2, etc.) +# Hence, from user point of view, it is practical to refer to the latest snapshot, +# instead of the latest release. vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LibRaw/LibRaw - REF 0.19.0 - SHA512 4fbcce6567463cff1784d0ab9e908906acf79ad3d5af3d52d231f99941b3c3e5daf9049ce2d32a56ba7ec523138ad0c1ff8b61d38fe33abcf1aa6deafd4927f2 + REF d4f05dd1b9b2d44c8f7e82043cbad3c724db2416 + SHA512 5794521f535163afd7815ad005295301c5e0e2f8b2f34ef0a911d9dd1572c1f456b292777548203f9767957a55782b5bc9041c033190d25d1e9b4240d7df32b9 HEAD_REF master ) diff --git a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch new file mode 100644 index 000000000..fa1884a2e --- /dev/null +++ b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch @@ -0,0 +1,254 @@ +diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
+index 3c80458..e8d3bf5 100644
+--- a/apps/ocspcheck/CMakeLists.txt
++++ b/apps/ocspcheck/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-if(NOT MSVC)
+-
+ set(
+ OCSPCHECK_SRC
+ http.c
+@@ -13,13 +11,27 @@ else()
+ set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
+ endif()
+
++check_function_exists(getopt HAVE_GETOPT)
++if(HAVE_GETOPT)
++ add_definitions(-DHAVE_GETOPT)
++else()
++ set(GETOPT_SRC compat/getopt.c)
++endif()
++
++check_function_exists(ftruncate HAVE_FTRUNCATE)
++if(HAVE_FTRUNCATE)
++ add_definitions(-DHAVE_FTRUNCATE)
++else()
++ set(FTRUNCATE_SRC compat/ftruncate.c)
++endif()
++
+ if(NOT "${OPENSSLDIR}" STREQUAL "")
+ add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
+ else()
+ add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
+ endif()
+
+-add_executable(ocspcheck ${OCSPCHECK_SRC})
++add_executable(ocspcheck ${OCSPCHECK_SRC} ${GETOPT_SRC} ${FTRUNCATE_SRC})
+ target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat)
+ target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
+
+@@ -28,5 +40,3 @@ if(ENABLE_LIBRESSL_INSTALL)
+ install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+
+ endif(ENABLE_LIBRESSL_INSTALL)
+-
+-endif()
+diff --git a/apps/ocspcheck/compat/ftruncate.c b/apps/ocspcheck/compat/ftruncate.c
+new file mode 100644
+index 0000000..e825e50
+--- /dev/null
++++ b/apps/ocspcheck/compat/ftruncate.c
+@@ -0,0 +1,17 @@
++/*
++ * Public domain
++ *
++ * Kinichiro Inoguchi <inoguchi@openbsd.org>
++ */
++
++#ifdef _WIN32
++
++#include <unistd.h>
++
++int
++ftruncate(int fd, off_t length)
++{
++ return _chsize(fd, length);
++}
++
++#endif
+diff --git a/apps/ocspcheck/compat/getopt.c b/apps/ocspcheck/compat/getopt.c
+new file mode 100644
+index 0000000..ff05743
+--- /dev/null
++++ b/apps/ocspcheck/compat/getopt.c
+@@ -0,0 +1,131 @@
++/*
++ * Public domain
++ *
++ * EternalPhane <eternalphane@gmail.com>
++ */
++
++#include <stdlib.h>
++#include <string.h>
++
++#include "getopt.h"
++
++char *optarg = NULL;
++int optind = 0, optopt = '?';
++
++typedef int bool;
++#define true 1
++#define false 0
++
++static int nonopt_begin = 0, nonopt_end = 0;
++
++void clear_buf();
++
++void permute(char *const argv[])
++{
++ static char* buf = NULL;
++ if (!argv && buf)
++ return free(buf);
++ if (!buf)
++ atexit(clear_buf);
++ if (nonopt_begin == nonopt_end)
++ {
++ nonopt_begin = nonopt_end = optind;
++ return;
++ }
++ int nonopt_size = nonopt_end - nonopt_begin,
++ opt_size = optind - nonopt_end;
++ if (nonopt_size <= opt_size)
++ {
++ if (!realloc(buf, nonopt_size))
++ free(buf), buf = malloc(nonopt_size);
++ memcpy(buf, nonopt_begin, nonopt_size);
++ memmove(nonopt_begin, nonopt_end, opt_size);
++ memcpy(nonopt_begin + opt_size, buf, nonopt_size);
++ }
++ else
++ {
++ if (!realloc(buf, opt_size))
++ free(buf), buf = malloc(opt_size);
++ memcpy(buf, nonopt_end, opt_size);
++ memmove(nonopt_begin + opt_size, nonopt_begin, nonopt_size);
++ memcpy(nonopt_begin, buf, opt_size);
++ }
++ nonopt_begin += opt_size;
++ nonopt_end = optind;
++}
++
++void clear_buf()
++{
++ permute(NULL);
++}
++
++int getopt(int argc, char *const argv[], const char *optstring)
++{
++ static char *nextchar = NULL;
++ static bool posixly_correct = false, always_return_nonopt = false;
++ if (optind >= argc)
++ return -1;
++ if (!optind)
++ {
++ nonopt_begin = nonopt_end = 0;
++ posixly_correct = '+' == optstring[0] || getenv("POSIXLY_CORRECT");
++ always_return_nonopt = '-' == optstring[0];
++ if (posixly_correct || always_return_nonopt)
++ optstring++;
++ }
++ if (!nextchar || !*nextchar)
++ {
++ if (!posixly_correct && !always_return_nonopt)
++ {
++ int temp = optind++;
++ for (;;)
++ {
++ if (++temp >= argc || !strcmp("--", argv[temp]))
++ {
++ permute(argv);
++ if (temp < argc)
++ {
++ optind = temp + 1;
++ permute(argv);
++ }
++ optind = nonopt_begin;
++ return -1;
++ }
++ if ('-' == argv[temp][0] && argv[temp][1])
++ break;
++ }
++ if (temp > optind)
++ {
++ permute(argv);
++ nonopt_end = optind = temp;
++ }
++ nextchar = argv[optind] + 1;
++ }
++ else
++ {
++ if (++optind >= argc || !strcmp("--", argv[optind]))
++ return -1;
++ if ('-' != argv[optind][0] || !argv[optind][1])
++ return posixly_correct ? -1 : (optarg = argv[optind++], 1);
++ }
++ }
++ const char *temp = strchr(optstring, *nextchar++);
++ if (!temp)
++ return optopt = *(nextchar - 1), '?';
++ if (':' == temp[1])
++ {
++ bool err = false;
++ if (':' == temp[2])
++ optarg = *nextchar ? nextchar : NULL;
++ else if (*nextchar)
++ optarg = nextchar;
++ else if ('-' != argv[++optind][0])
++ optarg = argv[optind];
++ else
++ return nextchar = argv[optind] + 1,
++ optopt = *temp,
++ ':' == optstring[0] ? ':' : '?';
++ nextchar += strlen(nextchar);
++ }
++ return *temp;
++}
+diff --git a/apps/ocspcheck/compat/getopt.h b/apps/ocspcheck/compat/getopt.h
+new file mode 100644
+index 0000000..ada142e
+--- /dev/null
++++ b/apps/ocspcheck/compat/getopt.h
+@@ -0,0 +1,15 @@
++/*
++ * Public domain
++ *
++ * EternalPhane <eternalphane@gmail.com>
++ */
++
++#ifndef GETOPT_H__
++#define GETOPT_H__
++
++extern char *optarg;
++extern int optind, opterr, optopt;
++
++int getopt(int argc, char *const argv[], const char *optstring);
++
++#endif
+\ No newline at end of file
+diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c
+index 551a8fa..c608578 100644
+--- a/apps/ocspcheck/ocspcheck.c
++++ b/apps/ocspcheck/ocspcheck.c
+@@ -519,6 +519,10 @@ main(int argc, char **argv)
+ ssize_t written, w;
+ short port;
+
++#ifndef HAVE_GETOPT
++#include "getopt.h"
++#endif
++
+ while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) {
+ switch (ch) {
+ case 'C':
+diff --git a/include/compat/unistd.h b/include/compat/unistd.h
+index f521b94..f11db44 100644
+--- a/include/compat/unistd.h
++++ b/include/compat/unistd.h
+@@ -23,6 +23,7 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset);
+ #include <io.h>
+ #include <process.h>
+
++#define STDIN_FILENO 0
+ #define STDOUT_FILENO 1
+ #define STDERR_FILENO 2
+
diff --git a/ports/libressl/0002-suppress-msvc-warnings.patch b/ports/libressl/0002-suppress-msvc-warnings.patch new file mode 100644 index 000000000..7a5bf0038 --- /dev/null +++ b/ports/libressl/0002-suppress-msvc-warnings.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6a7554..b20fd4b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -111,6 +111,11 @@ if(WIN32)
+ set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32)
+ endif()
+
++if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912)
++ message(STATUS "Setting /Qspectre switch")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre")
++endif()
++
+ if(MSVC)
+ add_definitions(-Dinline=__inline)
+ message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler")
+@@ -123,16 +128,29 @@ if(MSVC)
+ "C4127" # conditional expression is constant
+ "C4146" # unary minus operator applied to unsigned type,
+ # result still unsigned
++ "C4242" # 'identifier' : conversion from 'type1' to 'type2',
++ # possible loss of data
+ "C4244" # 'argument' : conversion from 'type1' to 'type2',
+ # possible loss of data
+ "C4245" # 'conversion' : conversion from 'type1' to 'type2',
+ # signed/unsigned mismatch
++ "C4255" # 'function' : no function prototype given:
++ # converting '()' to '(void)'
+ "C4267" # 'var' : conversion from 'size_t' to 'type',
+ # possible loss of data
++ "C4388" # 'expression': signed/unsigned mismatch
+ "C4389" # 'operator' : signed/unsigned mismatch
++ "C4464" # relative include path contains '..'
++ "C4668" # 'symbol' is not defined as a preprocessor macro,
++ # replacing with '0' for 'directives'
+ "C4706" # assignment within conditional expression
++ "C4710" # 'function' : function not inlined
++ "C4711" # function 'function' selected for inline expansion
++ "C4820" # 'bytes' bytes padding added after construct 'member_name'
+ "C4996" # The POSIX name for this item is deprecated.
+ # Instead, use the ISO C and C++ conformant name
++ "C5045" # Compiler will insert Spectre mitigation for memory load
++ # if /Qspectre switch specified
+ )
+ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
+ add_definitions(-D_CRT_SUPPRESS_RESTRICT)
+
diff --git a/ports/libressl/CONTROL b/ports/libressl/CONTROL new file mode 100644 index 000000000..2cb09fb6c --- /dev/null +++ b/ports/libressl/CONTROL @@ -0,0 +1,6 @@ +Source: libressl
+Version: 2.9.1-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.
+
+Feature: tools
+Description: Build openssl and ocspcheck executables
diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake new file mode 100644 index 000000000..5c8e5b964 --- /dev/null +++ b/ports/libressl/portfile.cmake @@ -0,0 +1,90 @@ +cmake_minimum_required(VERSION 3.13)
+
+if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h")
+ message(WARNING "Can't build libressl if openssl is installed. Please remove openssl, and try install libressl again if you need it. Build will continue since libressl is a subset of openssl")
+ set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+ return()
+endif()
+
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+ message(FATAL_ERROR "${PORT} does not support ARM")
+endif()
+
+include(vcpkg_common_functions)
+
+set(LIBRESSL_VERSION 2.9.1)
+set(LIBRESSL_HASH 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354)
+
+vcpkg_download_distfile(
+ LIBRESSL_SOURCE_ARCHIVE
+ URLS https://ftp.openbsd.org/pub/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}
+ PATCHES
+ 0001-enable-ocspcheck-on-msvc.patch
+ 0002-suppress-msvc-warnings.patch
+)
+
+set(LIBRESSL_APPS OFF)
+if("tools" IN_LIST FEATURES)
+ set(LIBRESSL_APPS ON)
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DLIBRESSL_APPS=${LIBRESSL_APPS}
+ -DLIBRESSL_TESTS=OFF
+ OPTIONS_DEBUG
+ -DLIBRESSL_APPS=OFF
+)
+
+vcpkg_install_cmake()
+
+if(LIBRESSL_APPS)
+ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+ set(EXECUTABLE_SUFFIX .exe)
+ endif()
+ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl")
+ file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl${EXECUTABLE_SUFFIX}")
+ file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ocspcheck${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/ocspcheck${EXECUTABLE_SUFFIX}")
+ vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl")
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/bin"
+ "${CURRENT_PACKAGES_DIR}/debug/bin"
+ )
+endif()
+file(REMOVE_RECURSE
+ "${CURRENT_PACKAGES_DIR}/etc/ssl/certs"
+ "${CURRENT_PACKAGES_DIR}/share/man"
+ "${CURRENT_PACKAGES_DIR}/debug/include"
+ "${CURRENT_PACKAGES_DIR}/debug/share"
+)
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
+ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+endif()
+
+vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+if((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic"))
+ 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}")
+ endforeach()
+endif()
diff --git a/ports/librtmp/CONTROL b/ports/librtmp/CONTROL index 957f5ee16..f43270e5d 100644 --- a/ports/librtmp/CONTROL +++ b/ports/librtmp/CONTROL @@ -1,4 +1,5 @@ Source: librtmp Version: 2.4-1 Build-Depends: zlib, openssl +Homepage: https://rtmpdump.mplayerhq.hu Description: RTMPDump Real-Time Messaging Protocol API diff --git a/ports/libsamplerate/CONTROL b/ports/libsamplerate/CONTROL index d8a8f5f4e..dc0bf20dc 100644 --- a/ports/libsamplerate/CONTROL +++ b/ports/libsamplerate/CONTROL @@ -1,3 +1,4 @@ Source: libsamplerate Version: 0.1.9.0 +Homepage: https://www.mega-nerd.com/SRC Description: Sample Rate Converter for audio diff --git a/ports/libsndfile/CONTROL b/ports/libsndfile/CONTROL index d448f694c..2547637a8 100644 --- a/ports/libsndfile/CONTROL +++ b/ports/libsndfile/CONTROL @@ -1,8 +1,9 @@ Source: libsndfile -Version: 1.0.29-6830c42-5 +Version: 1.0.29-8 Description: Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo +Homepage: https://github.com/erikd/libsndfile Default-Features: external-libs Feature: external-libs -Description: Support OGG and FLAC audio files +Description: Support Ogg Vorbis and FLAC audio files Build-Depends: libogg, libflac, libvorbis diff --git a/ports/libsndfile/fix-install-path.patch b/ports/libsndfile/fix-install-path.patch new file mode 100644 index 000000000..38c6ff734 --- /dev/null +++ b/ports/libsndfile/fix-install-path.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cc35414..d629adf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -641,12 +641,12 @@ if (ENABLE_PACKAGE_CONFIG) + LibSndFileConfig.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) + +- install(EXPORT LibSndFileTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) ++ install(EXPORT LibSndFileTargets DESTINATION share/libsndfile) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/LibSndFileConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/LibSndFileConfigVersion.cmake + DESTINATION +- ${CMAKE_INSTALL_PACKAGEDIR}) ++ share/libsndfile) + + elseif (NOT ENABLE_PACKAGE_CONFIG) + +@@ -698,9 +698,9 @@ set (html_DATA + doc/embedded_files.html + doc/octave.html + doc/tutorial.html) +-install (FILES ${html_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR}) ++#install (FILES ${html_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/libsndfile) + +-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sndfile.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sndfile.pc DESTINATION share/libsndfile/pkgconfig) + + # + # Testing diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index 1ba590fd7..1e86fbffb 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -7,8 +7,9 @@ vcpkg_from_github( SHA512 b13c5d7bc27218eff8a8c4ce89a964b4920b1d3946e4843e60be965d77ec205845750a82bf654a7c2c772bf3a24f6ff5706881b24ff12115f2525c8134b6d0b9 HEAD_REF master PATCHES - "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize.patch" - "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize-addendum.patch" + uwp-createfile-getfilesize.patch + uwp-createfile-getfilesize-addendum.patch + fix-install-path.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" CRT_LIB_STATIC) @@ -25,15 +26,22 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_EXAMPLES=0 -DBUILD_REGTEST=0 -DBUILD_TESTING=0 -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DDISABLE_EXTERNAL_LIBS=${SNDFILE_WITHOUT_EXTERNAL_LIBS} - OPTIONS_RELEASE -DBUILD_PROGRAMS=${BUILD_EXECUTABLES} - # Setting ENABLE_PACKAGE_CONFIG=0 has no effect - OPTIONS_DEBUG -DBUILD_PROGRAMS=0 + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_REGTEST=OFF + -DBUILD_TESTING=OFF + -DENABLE_BOW_DOCS=OFF + -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} + -DBUILD_STATIC_LIBS=${BUILD_STATIC} + -DDISABLE_EXTERNAL_LIBS=${SNDFILE_WITHOUT_EXTERNAL_LIBS} + OPTIONS_RELEASE + -DBUILD_PROGRAMS=${BUILD_EXECUTABLES} + OPTIONS_DEBUG + -DBUILD_PROGRAMS=0 ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_fixup_cmake_targets() # Fix applied for 6830c421899e32f8d413a903a21a9b6cf384d369 file(READ "${CURRENT_PACKAGES_DIR}/share/libsndfile/LibSndFileTargets.cmake" _contents) @@ -44,11 +52,23 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/libsndfile ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") + set(SHARED_LIB_SUFFIX ".dll") +else() + set(EXECUTABLE_SUFFIX) + set(SHARED_LIB_SUFFIX) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libsndfile-1${SHARED_LIB_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libnsdfile-1${SHARED_LIB_SUFFIX}) +endif() + if(BUILD_EXECUTABLES) - file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) + file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}) file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE ${TOOLS}) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL index a994a1729..333f08031 100644 --- a/ports/libsodium/CONTROL +++ b/ports/libsodium/CONTROL @@ -1,3 +1,4 @@ Source: libsodium -Version: 1.0.17-2 +Version: 1.0.18 Description: A modern and easy-to-use crypto library +Homepage: https://github.com/jedisct1/libsodium diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index b8321c6ac..2d61a4550 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libsodium - REF 1.0.17 - SHA512 faf6ab57d113b6b1614b51390823a646f059018327b6f493e9e918a908652d0932a75a1a6683032b7a3869f516f387d67acdf944568387feddff7b2f5b6e77d6 + REF 1.0.18 + SHA512 727fe50a5fb1df86ec5d807770f408a52609cbeb8510b4f4183b2a35a537905719bdb6348afcb103ff00ce946a8094ac9559b6e3e5b2ccc2a2d0c08f75577eeb HEAD_REF master ) @@ -40,6 +40,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string( ${CURRENT_PACKAGES_DIR}/include/sodium/export.h diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index bb19a0605..55d3f4577 100644 --- a/ports/libspatialite/CONTROL +++ b/ports/libspatialite/CONTROL @@ -1,5 +1,6 @@ Source: libspatialite -Version: 4.3.0a-2 +Version: 4.3.0a-3 +Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 59a1499f4..b73733ff2 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -33,10 +33,10 @@ else() set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libgeos_c.lib ${CURRENT_INSTALLED_DIR}/lib/libgeos.lib") set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libgeos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libgeosd.lib") set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzma.lib ws2_32.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") endif() -set(LIBS_ALL_DBG +set(LIBS_ALL_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \ ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \ ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ @@ -46,7 +46,7 @@ set(LIBS_ALL_DBG ${GEOS_LIBS_DBG} \ ${CURRENT_INSTALLED_DIR}/debug/lib/projd.lib" ) -set(LIBS_ALL_REL +set(LIBS_ALL_REL "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \ ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \ ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ diff --git a/ports/libsquish/CONTROL b/ports/libsquish/CONTROL index 9cc2e5097..1e193d1b1 100644 --- a/ports/libsquish/CONTROL +++ b/ports/libsquish/CONTROL @@ -1,3 +1,3 @@ Source: libsquish
-Version: 1.15
+Version: 1.15-1
Description: Open source DXT compression library.
diff --git a/ports/libsquish/portfile.cmake b/ports/libsquish/portfile.cmake index dbebf9566..02fdc4f90 100644 --- a/ports/libsquish/portfile.cmake +++ b/ports/libsquish/portfile.cmake @@ -30,6 +30,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
)
vcpkg_install_cmake()
diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL index 9f652f461..a819253d0 100644 --- a/ports/libssh/CONTROL +++ b/ports/libssh/CONTROL @@ -1,5 +1,6 @@ Source: libssh Version: 0.7.6-1 +Homepage: https://www.libssh.org/ Description: libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol on client and server side Build-Depends: openssl diff --git a/ports/libssh2/CONTROL b/ports/libssh2/CONTROL index 4a95c72b6..b8579332e 100644 --- a/ports/libssh2/CONTROL +++ b/ports/libssh2/CONTROL @@ -1,4 +1,5 @@ Source: libssh2 -Version: 1.8.0-4 +Version: 1.8.2 Build-Depends: zlib, openssl +Homepage: https://www.libssh2.org Description: The SSH library diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index e080cf81e..e8a4e3565 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 - REF libssh2-1.8.0 - SHA512 c157db0628126d6348ed52a698fbdd7e20b54b6115123bd7d238f02fda5c68ca7a1585aed8a2376df0840f4a3823743133996192001ae54864ab53c954b938e7 + REF libssh2-1.8.2 + SHA512 f676f8c2d1c66cd086ad5a1d328e3eb3a033afd4511577451c5664a4e0c4c1ea006fa1885f332fb2b3842b2eb30456322efdd2abf97c2f148c2be0d53e3e5624 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch" ) diff --git a/ports/libstemmer/CONTROL b/ports/libstemmer/CONTROL index a5275ea71..a1949a2be 100644 --- a/ports/libstemmer/CONTROL +++ b/ports/libstemmer/CONTROL @@ -1,3 +1,4 @@ Source: libstemmer
Version: 2017-9-4
+Homepage: https://snowball.tartarus.org/
Description: Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval
diff --git a/ports/libstk/CONTROL b/ports/libstk/CONTROL index e8f1382b5..1de9780e1 100644 --- a/ports/libstk/CONTROL +++ b/ports/libstk/CONTROL @@ -1,3 +1,3 @@ Source: libstk -Version: 4.6.0-2 +Version: 4.6.1 Description: The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. diff --git a/ports/libstk/portfile.cmake b/ports/libstk/portfile.cmake index 1d8ec73f1..84b929773 100644 --- a/ports/libstk/portfile.cmake +++ b/ports/libstk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/stk - REF v4.6.0 - SHA512 8e40dbd9e2b315df769262889fdf15b4a67843984d27a1f939d8bc6e820abb662eeae3b934fa81097222c67f7922681fe170006bebe5597cbd51b0a8624a6733 + REF 4.6.1 + SHA512 61d4db7b4a45446e231dedc13e139cb488e2ce805278f0b20aa95e69ddb1fa9be549ab5f1fe24c69aa865ebc2940d5fba6e3819a1a7fb1d68e236131fcfb4cac HEAD_REF master ) diff --git a/ports/libtheora/CONTROL b/ports/libtheora/CONTROL index 7324f0526..6c5f93b2c 100644 --- a/ports/libtheora/CONTROL +++ b/ports/libtheora/CONTROL @@ -1,4 +1,5 @@ Source: libtheora -Version: 1.2.0alpha1-20170719~vcpkg1-1 +Version: 1.2.0alpha1-20170719~vcpkg1-3 +Homepage: https://github.com/xiph/theora Description: Theora is a free and open video compression format from the Xiph.org Foundation. Build-Depends: libogg diff --git a/ports/libtheora/FindOGG.cmake b/ports/libtheora/FindOGG.cmake index fc0d15feb..ba3c8b1b6 100644 --- a/ports/libtheora/FindOGG.cmake +++ b/ports/libtheora/FindOGG.cmake @@ -1,6 +1,6 @@ find_path(OGG_INCLUDE_DIR NAMES ogg/ogg.h) -find_library(OGG_LIBRARY NAMES ogg) +find_library(OGG_LIBRARY NAMES ogg libogg) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OGG DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR) diff --git a/ports/libtheora/portfile.cmake b/ports/libtheora/portfile.cmake index 9312d6685..50e6fc653 100644 --- a/ports/libtheora/portfile.cmake +++ b/ports/libtheora/portfile.cmake @@ -31,7 +31,6 @@ vcpkg_configure_cmake( -DUSE_X86=${THEORA_X86_OPT} ) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/libtins/CONTROL b/ports/libtins/CONTROL index e2a7f43a2..4bd5d3755 100644 --- a/ports/libtins/CONTROL +++ b/ports/libtins/CONTROL @@ -1,4 +1,4 @@ Source: libtins -Version: 4.0-2 +Version: 4.0-3 Description: High-level, multiplatform C++ network packet sniffing and crafting library Build-Depends: winpcap (windows) diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake index 6890fe64c..1839d118c 100644 --- a/ports/libtins/portfile.cmake +++ b/ports/libtins/portfile.cmake @@ -10,16 +10,22 @@ vcpkg_from_github( 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_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DLIBTINS_BUILD_SHARED=${LIBTINS_BUILD_SHARED} + -DLIBTINS_ENABLE_PCAP=${ENABLE_PCAP} ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/libtins) +vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL index 519d08553..2fe8e85ed 100644 --- a/ports/libtorrent/CONTROL +++ b/ports/libtorrent/CONTROL @@ -1,4 +1,5 @@ Source: libtorrent -Version: 1.2.0-1 +Version: 2019-04-19 +Homepage: https://github.com/arvidn/libtorrent Description: An efficient feature complete C++ BitTorrent implementation Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index fb84c9794..bc05d14c7 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -3,10 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF libtorrent_1_2_0 - SHA512 2dae77f32cf3da388edece7e64b8d9cf359cca735a101d96bb18fb06573fd1d84c303e5bebd370f637d7c73010ea2d99e38748b2259ce02ae8f0dbc0c4f01518 + REF 76c2794923c4c101ff715be11d794f7fefc6c524 + SHA512 3e154857bb56318ebe725326e1832aa387dc85840be80ebe76c0265e8fded43bc3006d528784c8805e30c3fba41b4108ccf81170870d1686dc499048367563ea HEAD_REF master - PATCHES add-datetime-to-boost-libs.patch + PATCHES + add-datetime-to-boost-libs.patch + windows-boost-1.70.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTORRENT_SHARED) diff --git a/ports/libtorrent/windows-boost-1.70.patch b/ports/libtorrent/windows-boost-1.70.patch new file mode 100644 index 000000000..b0bf1f642 --- /dev/null +++ b/ports/libtorrent/windows-boost-1.70.patch @@ -0,0 +1,13 @@ +diff --git a/src/ip_notifier.cpp b/src/ip_notifier.cpp
+index 37e5623..daa25f8 100644
+--- a/src/ip_notifier.cpp
++++ b/src/ip_notifier.cpp
+@@ -380,7 +380,7 @@ struct ip_change_notifier_impl final : ip_change_notifier
+ }
+ else
+ {
+- m_hnd.get_io_service().post([cb, err]()
++ lt::get_io_service(m_hnd).post([cb, err]()
+ { cb(error_code(err, system_category())); });
+ }
+ }
diff --git a/ports/libudis86/CONTROL b/ports/libudis86/CONTROL index 661ad7859..8e67b89cc 100644 --- a/ports/libudis86/CONTROL +++ b/ports/libudis86/CONTROL @@ -1,3 +1,4 @@ Source: libudis86 Version: 2018-01-28-56ff6c87 +Homepage: https://github.com/vmt/udis86 Description: Disassembler Library for x86 and x86-64 diff --git a/ports/libunibreak/CONTROL b/ports/libunibreak/CONTROL index a59c7b44a..12e393322 100644 --- a/ports/libunibreak/CONTROL +++ b/ports/libunibreak/CONTROL @@ -1,3 +1,4 @@ Source: libunibreak
-Version: 4.0-2
+Version: 4.2
+Homepage: https://github.com/adah1972/libunibreak
Description: an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.
diff --git a/ports/libunibreak/portfile.cmake b/ports/libunibreak/portfile.cmake index 321fbd654..c054ce685 100644 --- a/ports/libunibreak/portfile.cmake +++ b/ports/libunibreak/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adah1972/libunibreak - REF libunibreak_4_0 - SHA512 f11295133a1c65f365a5287f7377f69ac7998f19b06d44818fb55c8a5ba3edabc36de8d1b7c0d38db9d982f0e443d0a751f6d51841865094122df4cd74c9af3b + REF 15b579aac410b7c11ba596f4a9abbf405a187e34 + SHA512 a46196ad276134dad19fbc4ad49a2f4a4563137e30657b0f06cee9e6b4dab803723ae270f9682c4b8245c9d10297ce44b7bfb08bfa16894552cdb916fc758c02 HEAD_REF master ) diff --git a/ports/libusb-win32/CONTROL b/ports/libusb-win32/CONTROL index eba6e283d..a85b6a11c 100644 --- a/ports/libusb-win32/CONTROL +++ b/ports/libusb-win32/CONTROL @@ -1,3 +1,4 @@ Source: libusb-win32 -Version: 1.2.6.0-1 +Version: 1.2.6.0-2 +Homepage: https://sourceforge.net/projects/libusb-win32 Description: Allows user space applications to access many USB device on Windows. diff --git a/ports/libusb-win32/portfile.cmake b/ports/libusb-win32/portfile.cmake index a93b39bca..df12a9179 100644 --- a/ports/libusb-win32/portfile.cmake +++ b/ports/libusb-win32/portfile.cmake @@ -21,7 +21,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) -vcpkg_build_cmake() vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/libusb/CONTROL b/ports/libusb/CONTROL index f7eabbc22..e4229daed 100644 --- a/ports/libusb/CONTROL +++ b/ports/libusb/CONTROL @@ -1,3 +1,4 @@ Source: libusb -Version: 1.0.22-2 +Version: 1.0.22-3 +Homepage: https://github.com/libusb/libusb Description: a cross-platform library to access USB devices diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index d2a96c73b..d5047841f 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -1,7 +1,11 @@ include(vcpkg_common_functions) -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "Error: UWP builds are currently not supported.") +if (VCPKG_CMAKE_SYSTEM_NAME) + message(FATAL_ERROR "Error: the port is unsupported on your platform. Please open an issue on github.com/Microsoft/vcpkg to request a fix") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + message("${PORT} currently requires the following tools and libraries from the system package manager:\n autoreconf\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoreconf libudev-dev") endif() vcpkg_from_github( @@ -11,28 +15,96 @@ vcpkg_from_github( SHA512 b1fed66aafa82490889ee488832c6884a95d38ce7b28fb7c3234b9bce1f749455d7b91cde397a0abc25101410edb13ab2f9832c59aa7b0ea8c19ba2cf4c63b00 HEAD_REF master PATCHES - "${CMAKE_CURRENT_LIST_DIR}/fix_c2001.patch" + fix_c2001.patch ) -if(VCPKG_PLATFORM_TOOLSET MATCHES "v141") - set(MSVS_VERSION 2017) -else() - set(MSVS_VERSION 2015) -endif() +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(MSVS_VERSION 2017) #they are abi compatible, so it should work + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") + set(MSVS_VERSION 2017) + else() + set(MSVS_VERSION 2015) + endif() + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LIBUSB_PROJECT_TYPE dll) + else() + set(LIBUSB_PROJECT_TYPE static) + endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(LIBUSB_PROJECT_TYPE dll) + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj + LICENSE_SUBPATH COPYING + ) else() - set(LIBUSB_PROJECT_TYPE static) -endif() + set(BASH /bin/bash) -vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj - LICENSE_SUBPATH COPYING -) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + # Copy sources + message(STATUS "Copying source files...") + file(GLOB PORT_SOURCE_FILES ${SOURCE_PATH}/*) + foreach(SOURCE_FILE ${PORT_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + endforeach() + message(STATUS "Copying source files... done") + # Configure release + message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + execute_process( + COMMAND "${BASH} --noprofile --norc -c \"./autogen.sh\"" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + execute_process( + COMMAND "${BASH} --noprofile --norc -c \"./configure --prefix=${CURRENT_PACKAGES_DIR}\"" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + # Copy sources + message(STATUS "Copying source files...") + file(GLOB PORT_SOURCE_FILES ${SOURCE_PATH}/*) + foreach(SOURCE_FILE ${PORT_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + endforeach() + message(STATUS "Copying source files... done") + # Configure debug + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + execute_process( + COMMAND "${BASH} --noprofile --norc -c \"./autogen.sh\"" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + execute_process( + COMMAND "${BASH} --noprofile --norc -c \"./configure --prefix=${CURRENT_PACKAGES_DIR}/debug\"" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + # Build release + message(STATUS "Package ${TARGET_TRIPLET}-rel") + execute_process( + COMMAND "${BASH} --noprofile --norc -c \"make install\"" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + message(STATUS "Package ${TARGET_TRIPLET}-rel done") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + # Build debug + message(STATUS "Package ${TARGET_TRIPLET}-dbg") + execute_process( + COMMAND "${BASH} --noprofile --norc -c \"make install\"" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + message(STATUS "Package ${TARGET_TRIPLET}-dbg done") + endif() +endif() file(INSTALL ${SOURCE_PATH}/libusb/libusb.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/libusb-1.0 ) + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL index 3773d17f9..05faa6a1c 100644 --- a/ports/libusbmuxd/CONTROL +++ b/ports/libusbmuxd/CONTROL @@ -1,4 +1,4 @@ Source: libusbmuxd
-Version: 1.0.107-2
+Version: 1.2.77 Description: A client library to multiplex connections from and to iOS devices
Build-Depends: libplist
diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake index c4d338b19..9a03b5e53 100644 --- a/ports/libusbmuxd/portfile.cmake +++ b/ports/libusbmuxd/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/libusbmuxd
- REF 1.0.109
- SHA512 104205ebcac96765f4bf0b42dbe5df084be4f87fc64454b4e02049fbd18caf9282d070f8949935977eda76fba68b6a909571afea58d4ad4091f02d0e6b7a08e0
+ REF a4422aa65f3635d99c3b80fad18f093ef3c5f653 + SHA512 9446bbcd6b901e6183f6e86d7fe7301c01182ae5b9330182fbca529bb1db54250cd6012256a420d457a7243388811c94bb2ecf5a0747238714d00b3850e60e8e
HEAD_REF msvc-master
PATCHES dllexport.patch
)
@@ -24,3 +24,6 @@ vcpkg_install_msbuild( )
file(REMOVE "${CURRENT_PACKAGES_DIR}/include/Makefile.am")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
\ No newline at end of file diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL index d868ef177..f50e6fbea 100644 --- a/ports/libuv/CONTROL +++ b/ports/libuv/CONTROL @@ -1,3 +1,4 @@ Source: libuv -Version: 1.28.0 +Version: 1.29.1 +Homepage: https://github.com/libuv/libuv Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 3bc566726..ba7cdfeb0 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.28.0 - SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53 + REF d16e6094e1eb3b0b5981ef1dd7e03ec4d466944d + SHA512 338d25fec26ab69d300141086de825edabc5e65c50b6d9cf0e2f8f1937a930e4ecf4460ba2789cef64a85ad4a63c9b5f2a482ee2498c542f73e5915bbff6170f HEAD_REF v1.x ) diff --git a/ports/libvorbis/CONTROL b/ports/libvorbis/CONTROL index d60bd25af..33a300957 100644 --- a/ports/libvorbis/CONTROL +++ b/ports/libvorbis/CONTROL @@ -1,4 +1,5 @@ Source: libvorbis -Version: 1.3.6-9eadecc-1 +Version: 1.3.6-9eadecc-3 +Homepage: https://github.com/xiph/vorbis Description: Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format. Build-Depends: libogg diff --git a/ports/libvorbis/ogg.patch b/ports/libvorbis/ogg.patch new file mode 100644 index 000000000..323e2c7e2 --- /dev/null +++ b/ports/libvorbis/ogg.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bbc045ba..a23630f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,10 +57,10 @@ if(NOT OGG_ROOT) + find_package(PkgConfig QUIET) + pkg_check_modules(PC_OGG QUIET ogg) + find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${PC_OGG_INCLUDE_DIRS} PATH_SUFFIXES ogg) +- find_library(OGG_LIBRARIES NAMES ogg HINTS ${PC_OGG_LIBRARY_DIRS}) ++ find_library(OGG_LIBRARIES NAMES ogg libogg HINTS ${PC_OGG_LIBRARY_DIRS}) + else() + find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${OGG_ROOT}/include PATH_SUFFIXES ogg) +- find_library(OGG_LIBRARIES NAMES ogg HINTS ${OGG_ROOT}/lib ${OGG_ROOT}/lib64) ++ find_library(OGG_LIBRARIES NAMES ogg libogg HINTS ${OGG_ROOT}/lib ${OGG_ROOT}/lib64) + endif() + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(OGG DEFAULT_MSG OGG_INCLUDE_DIRS OGG_LIBRARIES) diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake index 504aeaf22..0e1ef5d42 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -8,27 +8,12 @@ vcpkg_from_github( PATCHES 0001-Dont-export-vorbisenc-functions.patch 0002-Allow-deprecated-functions.patch + ogg.patch ) -file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" OGG_INCLUDE) -foreach(LIBNAME ogg.lib libogg.a libogg.dylib libogg.so) - if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/${LIBNAME}" OR EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/${LIBNAME}") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/${LIBNAME}" OGG_LIB_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/${LIBNAME}" OGG_LIB_DBG) - break() - endif() -endforeach() - -if(NOT OGG_LIB_REL) - message(FATAL_ERROR "Could not find libraries for dependency libogg!") -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DOGG_INCLUDE_DIRS=${OGG_INCLUDE} - OPTIONS_RELEASE -DOGG_LIBRARIES=${OGG_LIB_REL} - OPTIONS_DEBUG -DOGG_LIBRARIES=${OGG_LIB_DBG} ) vcpkg_install_cmake() @@ -38,4 +23,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/libvorbis/copyright COPYONLY) -vcpkg_copy_pdbs() +vcpkg_copy_pdbs() diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index 50d23a717..5aa726c1e 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,3 +1,4 @@ Source: libvpx
-Version: 1.7.0-2
+Version: 1.7.0-3
+Homepage: https://github.com/webmproject/libvpx
Description: The reference software implementation for the video coding formats VP8 and VP9.
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 009a0161d..1290d415a 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -78,9 +78,13 @@ vcpkg_build_msbuild( if(VCPKG_CRT_LINKAGE STREQUAL dynamic) file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpxmd.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpxmdd.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" RENAME "vpxmd.pdb") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" RENAME "vpxmdd.pdb") else() file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpxmt.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpxmtd.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Release/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" RENAME "vpxmt.pdb") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${LIBVPX_ARCH_DIR}/Debug/vpx/vpx.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" RENAME "vpxmtd.pdb") endif() if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) @@ -96,6 +100,5 @@ file( RENAME "vpx") - file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libvpx) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libvpx/LICENSE ${CURRENT_PACKAGES_DIR}/share/libvpx/copyright) diff --git a/ports/libwebm/CONTROL b/ports/libwebm/CONTROL index 959d5bb24..c2d9d878f 100644 --- a/ports/libwebm/CONTROL +++ b/ports/libwebm/CONTROL @@ -1,3 +1,4 @@ Source: libwebm -Version: 1.0.0.27-4 +Version: 1.0.0.27-5 +Homepage: https://github.com/webmproject/libwebm Description: WebM File Parser diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index 9817a5bc3..024933ec5 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -21,21 +21,13 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${LIBWEBM_CRT_LINKAGE} + -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_install_cmake() -if((NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/libwebm.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libwebmd.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/webm.lib ${CURRENT_PACKAGES_DIR}/debug/lib/webmd.lib) -endif() - vcpkg_copy_pdbs() -if((NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/libwebm.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/libwebmd.pdb) -endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(COPY ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebm) diff --git a/ports/libwebp/0001-build-fixes.patch b/ports/libwebp/0001-build-fixes.patch index c25ecbfee..490978727 100644 --- a/ports/libwebp/0001-build-fixes.patch +++ b/ports/libwebp/0001-build-fixes.patch @@ -2,13 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 499ddce..895fda9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -159,6 +159,10 @@ add_definitions(-DHAVE_CONFIG_H) +@@ -159,6 +159,12 @@ add_definitions(-DHAVE_CONFIG_H) if(MSVC) # avoid security warnings for e.g., fopen() used in the examples. add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-DWEBP_HAVE_JUST_SDL_H) + if(BUILD_SHARED_LIBS) + add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\)) ++ else() ++ add_definitions(-DFREEGLUT_STATIC) + endif() else() add_definitions(-Wall) diff --git a/ports/libwebp/0003-remove-missing-symbol.patch b/ports/libwebp/0003-remove-missing-symbol.patch new file mode 100644 index 000000000..218481bbc --- /dev/null +++ b/ports/libwebp/0003-remove-missing-symbol.patch @@ -0,0 +1,13 @@ +diff --git a/examples/gifdec.c b/examples/gifdec.c +index 4219352..ab0592a 100644 +--- a/examples/gifdec.c ++++ b/examples/gifdec.c +@@ -310,7 +310,7 @@ void GIFDisplayError(const GifFileType* const gif, int gif_error) { + #else + (void)gif; + fprintf(stderr, "GIFLib Error %d: ", gif_error); +- PrintGifError(); ++ //PrintGifError(); + fprintf(stderr, "\n"); + #endif + } diff --git a/ports/libwebp/0004-add-missing-linked-library.patch b/ports/libwebp/0004-add-missing-linked-library.patch new file mode 100644 index 000000000..49a34ef4d --- /dev/null +++ b/ports/libwebp/0004-add-missing-linked-library.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a98540c..a3697cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -479,6 +479,10 @@ if(WEBP_BUILD_VWEBP) + ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR}/src + ${OPENGL_INCLUDE_DIR}) ++ if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) ++ find_package(X11 REQUIRED) ++ target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) ++ endif() + install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED) diff --git a/ports/libwebp/0005-fix-static-build.patch b/ports/libwebp/0005-fix-static-build.patch new file mode 100644 index 000000000..f17713efd --- /dev/null +++ b/ports/libwebp/0005-fix-static-build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7585fac..83edb3a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -540,7 +540,7 @@ if(WEBP_BUILD_EXTRAS) + find_package(SDL) + if(SDL_FOUND) + add_executable(vwebp_sdl ${VWEBP_SDL_SRCS}) +- target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) ++ target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp dxguid winmm) + target_include_directories(vwebp_sdl + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/src diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL index ed3ff55ca..90dffdc77 100644 --- a/ports/libwebp/CONTROL +++ b/ports/libwebp/CONTROL @@ -1,8 +1,9 @@ Source: libwebp -Version: 1.0.2-2 +Version: 1.0.2-6 +Homepage: https://github.com/webmproject/libwebp Description: Lossy compression of digital photographic images. Build-Depends: opengl Feature: all Description: enable all webp features -Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut, sdl1 +Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index bae24ddff..11b0b7904 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -9,6 +9,9 @@ vcpkg_from_github( PATCHES 0001-build-fixes.patch 0002-cmake-config-add-backwards-compatibility.patch + 0003-remove-missing-symbol.patch + 0004-add-missing-linked-library.patch + 0005-fix-static-build.patch ) set(WEBP_BUILD_ANIM_UTILS OFF) @@ -30,6 +33,16 @@ if("all" IN_LIST FEATURES) set(WEBP_BUILD_EXTRAS ON) endif() +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + message("WebP currently requires the following library from the system package manager:\n Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(WEBP_BUILD_VWEBP OFF) + set(WEBP_BUILD_EXTRAS OFF) + message("Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP on Mac. It has been disabled together with extras.") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -56,29 +69,59 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/WebP/cmake/" TARGET_PATH "share/WebP/") +vcpkg_fixup_cmake_targets(CONFIG_PATH share/WebP/cmake) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/WebP) +file(GLOB CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/${PORT}/*) +file(COPY ${CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/webp/) + +#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it +if(CMAKE_HOST_WIN32) +set(EXECUTABLE_SUFFIX ".exe") +else() +set(EXECUTABLE_SUFFIX "") +endif() if("all" IN_LIST FEATURES) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto${EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp${EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp${EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp${EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl${EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo${EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux${EXECUTABLE_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality${EXECUTABLE_SUFFIX}) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libwebp/) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality.exe) + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/get_disto${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto${EXECUTABLE_SUFFIX}) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/gif2webp${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp${EXECUTABLE_SUFFIX}) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/img2webp${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp${EXECUTABLE_SUFFIX}) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/vwebp${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp${EXECUTABLE_SUFFIX}) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl${EXECUTABLE_SUFFIX}) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webpinfo${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo${EXECUTABLE_SUFFIX}) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webpmux${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux${EXECUTABLE_SUFFIX}) + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/webp_quality${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality${EXECUTABLE_SUFFIX}) + endif() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libwebp) endif() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebp/COPYING ${CURRENT_PACKAGES_DIR}/share/libwebp/copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp RENAME copyright) diff --git a/ports/libwebsockets/0001-Fix-UWP.patch b/ports/libwebsockets/0001-Fix-UWP.patch deleted file mode 100644 index c4cf22140..000000000 --- a/ports/libwebsockets/0001-Fix-UWP.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/lib/plat/lws-plat-win.c b/lib/plat/lws-plat-win.c -index dd3e95a..eb1690a 100644 ---- a/lib/plat/lws-plat-win.c -+++ b/lib/plat/lws-plat-win.c -@@ -157,7 +157,7 @@ _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi) - { - struct lws_context_per_thread *pt; - WSANETWORKEVENTS networkevents; -- struct lws_pollfd *pfd; -+ struct lws_pollfd *pfd = NULL; - struct lws *wsi; - unsigned int i; - DWORD ev; -@@ -591,6 +591,7 @@ lws_plat_inet_pton(int af, const char *src, void *dst) - return ok ? 1 : -1; - } - -+#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP) - LWS_VISIBLE lws_fop_fd_t - _lws_plat_file_open(const struct lws_plat_file_ops *fops, const char *filename, - const char *vpath, lws_fop_flags_t *flags) -@@ -631,6 +632,49 @@ _lws_plat_file_open(const struct lws_plat_file_ops *fops, const char *filename, - bail: - return NULL; - } -+#else -+LWS_VISIBLE lws_fop_fd_t -+_lws_plat_file_open(const struct lws_plat_file_ops *fops, const char *filename, -+ const char *vpath, lws_fop_flags_t *flags) -+{ -+ HANDLE ret; -+ WCHAR buf[MAX_PATH]; -+ lws_fop_fd_t fop_fd; -+ LARGE_INTEGER llFileSize = {0}; -+ -+ MultiByteToWideChar(CP_UTF8, 0, filename, -1, buf, ARRAY_SIZE(buf)); -+ if (((*flags) & 7) == _O_RDONLY) { -+ ret = CreateFile2(buf, GENERIC_READ, FILE_SHARE_READ, -+ OPEN_EXISTING, NULL); -+ } else { -+ lwsl_err("%s: open for write not implemented\n", __func__); -+ *filelen = 0; -+ ret = LWS_INVALID_FILE; -+ } -+ -+ if (ret == LWS_INVALID_FILE) -+ goto bail; -+ -+ fop_fd = malloc(sizeof(*fop_fd)); -+ if (!fop_fd) -+ goto bail; -+ -+ fop_fd->fops = fops; -+ fop_fd->fd = ret; -+ fop_fd->filesystem_priv = NULL; /* we don't use it */ -+ fop_fd->flags = *flags; -+ fop_fd->len = GetFileSize(ret, NULL); -+ if(GetFileSizeEx(ret, &llFileSize)) -+ fop_fd->len = llFileSize.QuadPart; -+ -+ fop_fd->pos = 0; -+ -+ return fop_fd; -+ -+bail: -+ return NULL; -+} -+#endif - - LWS_VISIBLE int - _lws_plat_file_close(lws_fop_fd_t *fop_fd) -diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h -index 23f8f4d..bc32aef 100644 ---- a/lib/private-libwebsockets.h -+++ b/lib/private-libwebsockets.h -@@ -111,12 +111,23 @@ - #define WIN32_LEAN_AND_MEAN - #endif - -+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) -+#ifndef WINVER -+#define WINVER 0x0602 -+#define _WIN32_WINNT WINVER -+#endif -+ -+#define getenv(x) NULL -+#define _WINSOCK_DEPRECATED_NO_WARNINGS -+#else -+ - #if (WINVER < 0x0501) - #undef WINVER - #undef _WIN32_WINNT - #define WINVER 0x0501 - #define _WIN32_WINNT WINVER - #endif -+#endif - #define LWS_NO_DAEMONIZE - #define LWS_ERRNO WSAGetLastError() - #define LWS_EAGAIN WSAEWOULDBLOCK diff --git a/ports/libwebsockets/CONTROL b/ports/libwebsockets/CONTROL index 449b34fc5..1b091480a 100644 --- a/ports/libwebsockets/CONTROL +++ b/ports/libwebsockets/CONTROL @@ -1,4 +1,5 @@ Source: libwebsockets -Version: 3.1.0 +Version: 3.1.0-2 Build-Depends: zlib, openssl +Homepage: https://github.com/warmcat/libwebsockets 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. diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index b869fcc2a..b2b90cccf 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_from_github( REF v3.1.0 SHA512 e2a4c1b25bc6f028654a63fc01a2732e6c63414868f8d3d01fa477752fdabe0f61e8d271fe7dd2734db0e15b1250f6b0101285b6d694f971ec4bf67ba7ee067c HEAD_REF master - PATCHES - 0001-Fix-UWP.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LWS_WITH_STATIC) @@ -28,7 +26,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake") +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libwebsockets) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) @@ -45,7 +47,9 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-rele file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebsockets) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LICENSE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/copyright) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/lib/websockets.lib) + if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/lib/websockets.lib) + endif() endif () vcpkg_copy_pdbs() diff --git a/ports/libxlsxwriter/0001-fix-build-error.patch b/ports/libxlsxwriter/0001-fix-build-error.patch new file mode 100644 index 000000000..5e00c96de --- /dev/null +++ b/ports/libxlsxwriter/0001-fix-build-error.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe566fe..e76ed46 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -306,31 +306,11 @@ endif()
+
+ include(GNUInstallDirs)
+
+-if(MSVC)
+- if(CMAKE_CL_64)
+- set(MSVC_FOLDER_PREFIX x64)
+- else()
+- set(MSVC_FOLDER_PREFIX Win32)
+- endif()
+-
+- install(TARGETS ${PROJECT_NAME}
+- LIBRARY DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+- ARCHIVE DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+- RUNTIME DESTINATION "bin/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+- )
+- if (NOT BUILD_SHARED_LIBS)
+- install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pdb
+- DESTINATION "lib/${MSVC_FOLDER_PREFIX}/\${CMAKE_INSTALL_CONFIG_NAME}"
+- )
+- endif()
+-
+-else(MSVC)
+- install(TARGETS ${PROJECT_NAME}
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+- )
+-endif(MSVC)
++install(TARGETS ${PROJECT_NAME}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++)
+ install(FILES include/xlsxwriter.h DESTINATION include)
+ install(DIRECTORY include/xlsxwriter
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
diff --git a/ports/libxlsxwriter/0002-fix-uwp-build.patch b/ports/libxlsxwriter/0002-fix-uwp-build.patch new file mode 100644 index 000000000..b6ae20479 --- /dev/null +++ b/ports/libxlsxwriter/0002-fix-uwp-build.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e76ed46..32ffa04 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,6 +211,9 @@ target_sources(${PROJECT_NAME}
+ )
+ target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${ZLIB_LIBRARIES} ${MINIZIP_LIBRARIES})
+ target_compile_definitions(${PROJECT_NAME} PRIVATE ${LXW_PRIVATE_COMPILE_DEFINITIONS})
++if (WINDOWSSTORE)
++ target_compile_definitions(${PROJECT_NAME} PRIVATE -DIOWIN32_USING_WINRT_API)
++endif()
+ target_include_directories(${PROJECT_NAME}
+ PRIVATE ${LXW_PRIVATE_INCLUDE_DIRS}
+ PUBLIC include include/xlsxwriter
diff --git a/ports/libxlsxwriter/CONTROL b/ports/libxlsxwriter/CONTROL new file mode 100644 index 000000000..0cf7ed965 --- /dev/null +++ b/ports/libxlsxwriter/CONTROL @@ -0,0 +1,4 @@ +Source: libxlsxwriter +Version: 0.8.6-1 +Description: Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file. +Build-Depends: zlib diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake new file mode 100644 index 000000000..f60d2f88d --- /dev/null +++ b/ports/libxlsxwriter/portfile.cmake @@ -0,0 +1,33 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jmcnamara/libxlsxwriter + REF RELEASE_0.8.6 + SHA512 60822dc5f87531edc97cf774e234f25229a605d4430061c24b95c387318e6e05dde1b0f2f433cea14c6f84ee901c1dffe0d174bfd7e2a8459f59bcee900097db + HEAD_REF master + PATCHES + 0001-fix-build-error.patch + 0002-fix-uwp-build.patch +) + +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(USE_WINDOWSSTORE ON) +else() + set(USE_WINDOWSSTORE OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DWINDOWSSTORE=${USE_WINDOWSSTORE} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/License.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file diff --git a/ports/libxml2/CONTROL b/ports/libxml2/CONTROL index d4b6c6b1b..7a4b02cea 100644 --- a/ports/libxml2/CONTROL +++ b/ports/libxml2/CONTROL @@ -1,4 +1,5 @@ Source: libxml2 Version: 2.9.9-4 +Homepage: https://xmlsoft.org/ Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform) Build-Depends: zlib, libiconv, liblzma diff --git a/ports/libxmp-lite/CONTROL b/ports/libxmp-lite/CONTROL index bc1b7ef36..cbc01c58f 100644 --- a/ports/libxmp-lite/CONTROL +++ b/ports/libxmp-lite/CONTROL @@ -1,3 +1,4 @@ Source: libxmp-lite
Version: 4.4.1-1
+Homepage: https://sourceforge.net/projects/xmp/
Description: Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL index c329b8705..965079523 100644 --- a/ports/libxslt/CONTROL +++ b/ports/libxslt/CONTROL @@ -1,4 +1,5 @@ Source: libxslt Version: 1.1.29 +Homepage: http://xmlsoft.org/XSLT/ Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT Build-Depends: libxml2 diff --git a/ports/libyaml/0001-fix-version.patch b/ports/libyaml/0001-fix-version.patch deleted file mode 100644 index c2a59d30f..000000000 --- a/ports/libyaml/0001-fix-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1abdd77..60a6b44 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.0)
- project (yaml C)
-
- set (YAML_VERSION_MAJOR 0)
--set (YAML_VERSION_MINOR 1)
--set (YAML_VERSION_PATCH 7)
-+set (YAML_VERSION_MINOR 2)
-+set (YAML_VERSION_PATCH 1)
- set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}")
-
- option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF)
diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL index 1c770b2b9..df8b2b1fe 100644 --- a/ports/libyaml/CONTROL +++ b/ports/libyaml/CONTROL @@ -1,3 +1,3 @@ Source: libyaml
-Version: 0.2.1-1
+Version: 0.2.2 Description: A C library for parsing and emitting YAML.
diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake index 047692719..210fc2d7f 100644 --- a/ports/libyaml/portfile.cmake +++ b/ports/libyaml/portfile.cmake @@ -3,15 +3,16 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO yaml/libyaml
- REF 0.2.1
- SHA512 8b91738183a6d81c2c0381b4279cff9d8f811dac643ce5e08aa869058f5653ad8a2d9d8f9e563b26ad75b617b80b10ccb32753984a50ed684529a90bdd248bff
+ REF 0.2.2
+ SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
HEAD_REF master
- PATCHES 0001-fix-version.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTING=OFF
)
vcpkg_install_cmake()
diff --git a/ports/libzip/CONTROL b/ports/libzip/CONTROL index b3683b1a9..bac06fac9 100644 --- a/ports/libzip/CONTROL +++ b/ports/libzip/CONTROL @@ -1,5 +1,6 @@ Source: libzip Version: rel-1-5-2 +Homepage: https://github.com/nih-at/libzip Build-Depends: zlib Default-Features: openssl, bzip2 Description: A library for reading, creating, and modifying zip archives. diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL index 39c8e4a65..e2f44db66 100644 --- a/ports/live555/CONTROL +++ b/ports/live555/CONTROL @@ -1,3 +1,4 @@ Source: live555 Version: latest +Homepage: https://www.live555.com/liveMedia Description: A complete RTSP server application diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index d4e631680..f700235a6 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,4 +1,5 @@ Source: llvm
-Version: 7.0.0-2
+Version: 7.0.0-3
+Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Build-Depends: atlmfc (windows)
diff --git a/ports/llvm/fix-build-error.patch b/ports/llvm/fix-build-error.patch new file mode 100644 index 000000000..a311fb959 --- /dev/null +++ b/ports/llvm/fix-build-error.patch @@ -0,0 +1,16 @@ +diff --git a/tools/clang/tools/libclang/CMakeLists.txt b/tools/clang/tools/libclang/CMakeLists.txt +index e539c83..09c1ea3 100644 +--- a/tools/clang/tools/libclang/CMakeLists.txt ++++ b/tools/clang/tools/libclang/CMakeLists.txt +@@ -56,10 +56,7 @@ if (TARGET clangTidyPlugin) + endif() + endif () + +-find_library(DL_LIBRARY_PATH dl) +-if (DL_LIBRARY_PATH) +- list(APPEND LIBS dl) +-endif() ++list(APPEND LIBS "${DL_LIBRARY_PATH}") + + option(LIBCLANG_BUILD_STATIC + "Build libclang as a static library (in addition to a shared one)" OFF) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index a471ec1ae..1828ea86e 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -28,7 +28,9 @@ endif() vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake-modules-to-share.patch
+ PATCHES
+ install-cmake-modules-to-share.patch
+ fix-build-error.patch
)
vcpkg_find_acquire_program(PYTHON3)
diff --git a/ports/lmdb/CONTROL b/ports/lmdb/CONTROL index 12b605465..eea847401 100644 --- a/ports/lmdb/CONTROL +++ b/ports/lmdb/CONTROL @@ -1,3 +1,4 @@ Source: lmdb -Version: 0.9.18-4 +Version: 0.9.23-1 +Homepage: https://github.com/LMDB/lmdb Description: LMDB is an extraordinarily fast, memory-efficient database diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake index 3ee4f340a..9dc1aeeb2 100644 --- a/ports/lmdb/portfile.cmake +++ b/ports/lmdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LMDB/lmdb - REF LMDB_0.9.18 - SHA512 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6 + REF LMDB_0.9.23 + SHA512 47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120 HEAD_REF master PATCHES lmdb_45a88275d2a410e683bae4ef44881e0f55fa3c4d.patch ) @@ -18,9 +18,8 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/lmdb) +vcpkg_fixup_cmake_targets() file(INSTALL ${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lmdb RENAME copyright) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/lodepng/CONTROL b/ports/lodepng/CONTROL index 2c881316c..16d0cb794 100644 --- a/ports/lodepng/CONTROL +++ b/ports/lodepng/CONTROL @@ -1,3 +1,4 @@ Source: lodepng
Version: 2018-09-18-2
+Homepage: https://github.com/lvandeve/lodepng
Description: PNG encoder and decoder in C and C++
diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL index dcdae01a5..99771644a 100644 --- a/ports/log4cplus/CONTROL +++ b/ports/log4cplus/CONTROL @@ -1,4 +1,5 @@ Source: log4cplus -Version: REL_2_0_3 +Version: 2.0.4-1 +Homepage: https://github.com/log4cplus/log4cplus Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration Build-Depends: catch diff --git a/ports/log4cplus/fix-usage-error.patch b/ports/log4cplus/fix-usage-error.patch new file mode 100644 index 000000000..4a2753ffc --- /dev/null +++ b/ports/log4cplus/fix-usage-error.patch @@ -0,0 +1,105 @@ +diff --git a/qt4debugappender/CMakeLists.txt b/qt4debugappender/CMakeLists.txt +index 2f28be5..0a98704 100644 +--- a/qt4debugappender/CMakeLists.txt ++++ b/qt4debugappender/CMakeLists.txt +@@ -4,15 +4,17 @@ set (qt4debugappender_sources + if (${BUILD_SHARED_LIBS}) + add_definitions (-D${log4cplus}_EXPORTS) + endif () +-if (UNICODE) +- add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS) +-endif (UNICODE) + + find_package (Qt4 REQUIRED) + include (${QT_USE_FILE}) + + set (qt4debugappender log4cplusqt4debugappender${log4cplus_postfix}) + add_library (${qt4debugappender} ${qt4debugappender_sources}) ++if (UNICODE) ++ target_compile_definitions (${qt4debugappender} PUBLIC UNICODE) ++ target_compile_definitions (${qt4debugappender} PUBLIC _UNICODE) ++ add_definitions (-UMBCS -U_MBCS) ++endif (UNICODE) + target_link_libraries (${qt4debugappender} + ${log4cplus} + ${QT_LIBRARIES} +diff --git a/qt5debugappender/CMakeLists.txt b/qt5debugappender/CMakeLists.txt +index 9570e76..de6fecf 100644 +--- a/qt5debugappender/CMakeLists.txt ++++ b/qt5debugappender/CMakeLists.txt +@@ -4,15 +4,17 @@ set (qt5debugappender_sources + if (${BUILD_SHARED_LIBS}) + add_definitions (-D${log4cplus}_EXPORTS) + endif () +-if (UNICODE) +- add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS) +-endif (UNICODE) + + find_package (Qt5Core REQUIRED) + #include (${QT_USE_FILE}) + + set (qt5debugappender log4cplusqt5debugappender${log4cplus_postfix}) + add_library (${qt5debugappender} ${qt5debugappender_sources}) ++if (UNICODE) ++ target_compile_definitions (${qt5debugappender} PUBLIC UNICODE) ++ target_compile_definitions (${qt5debugappender} PUBLIC _UNICODE) ++ add_definitions (-UMBCS -U_MBCS) ++endif (UNICODE) + target_link_libraries (${qt5debugappender} + ${log4cplus} + ${Qt5Widgets_LIBRARIES} +diff --git a/simpleserver/CMakeLists.txt b/simpleserver/CMakeLists.txt +index e535120..5202f42 100644 +--- a/simpleserver/CMakeLists.txt ++++ b/simpleserver/CMakeLists.txt +@@ -1,14 +1,15 @@ +-if (UNICODE) +- add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS) +-endif (UNICODE) +- + message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}") +- + set (loggingserver_sources loggingserver.cxx) + + message (STATUS "Sources: ${loggingserver_sources}") + +-add_executable (loggingserver ${loggingserver_sources}) +-target_link_libraries (loggingserver ${log4cplus}) ++set (loggingserver loggingserver${log4cplus_postfix}) ++add_executable (${loggingserver} ${loggingserver_sources}) ++if (UNICODE) ++ target_compile_definitions (${loggingserver} PUBLIC UNICODE) ++ target_compile_definitions (${loggingserver} PUBLIC _UNICODE) ++ add_definitions (-UMBCS -U_MBCS) ++endif (UNICODE) ++target_link_libraries (${loggingserver} ${log4cplus}) + +-install(TARGETS loggingserver DESTINATION ${CMAKE_INSTALL_BINDIR}) ++install(TARGETS ${loggingserver} DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b7b7ad8..91e0c63 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -67,9 +67,6 @@ endif () + + # Define _GNU_SOURCE so that functions like `pipe2()` are visible. + add_definitions (-D_GNU_SOURCE=1) +-if (UNICODE) +- add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS) +-endif (UNICODE) + if (WIN32) + add_definitions (-DMINGW_HAS_SECURE_API=1) + add_definitions (-D_WIN32_WINNT=${_WIN32_WINNT}) +@@ -85,6 +82,12 @@ endif (WIN32) + + add_library (${log4cplus} ${log4cplus_sources}) + ++if (UNICODE) ++ target_compile_definitions (${log4cplus} PUBLIC UNICODE) ++ target_compile_definitions (${log4cplus} PUBLIC _UNICODE) ++ add_definitions (-UMBCS -U_MBCS) ++endif (UNICODE) ++ + set (log4cplus_LIBS ${CMAKE_THREAD_LIBS_INIT}) + if (LIBRT) + list (APPEND log4cplus_LIBS ${LIBRT}) diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 672d855de..b2c1035da 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -2,9 +2,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus - REF REL_2_0_3 - SHA512 c4c8887137214a9c66545ffa7f13cbede3db1536916681081f53c0a272cfb17d5e42cdc54c2c1bdd6eb5f86c3c3ce0840cbf827f792848ecb8f97636f1fcddf2 + REF REL_2_0_4 + SHA512 194e37b8de7be377dabe911d1cec831de41f5ce14dd617b5333739a7ab8dbc3061aa24351abe811588db507aa1563a637023b26684fb21bbfc88d24b4e4ce062 HEAD_REF master + PATCHES fix-usage-error.patch ) set(THREADPOOL_REF cc0b6371d3963f7028c2da5fc007733f9f3bf205) diff --git a/ports/loguru/CONTROL b/ports/loguru/CONTROL new file mode 100644 index 000000000..baa9503b0 --- /dev/null +++ b/ports/loguru/CONTROL @@ -0,0 +1,4 @@ +Source: loguru +Version: v2.0.0 +Description: A lightweight and flexible C++ logging library +Build-Depends:
\ No newline at end of file diff --git a/ports/loguru/copyright b/ports/loguru/copyright new file mode 100644 index 000000000..334edabf8 --- /dev/null +++ b/ports/loguru/copyright @@ -0,0 +1,3 @@ +This software is in the public domain. Where that dedication is not recognized, you are granted a perpetual, irrevocable license to copy, modify and distribute it as you see fit. + +That being said, I would appreciate credit! If you find Loguru useful, tweet me at @ernerfeldt mail me at emil.ernerfeldt@gmail.com.
\ No newline at end of file diff --git a/ports/loguru/portfile.cmake b/ports/loguru/portfile.cmake new file mode 100644 index 000000000..80efb0eea --- /dev/null +++ b/ports/loguru/portfile.cmake @@ -0,0 +1,12 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO emilk/loguru + REF v2.0.0 + SHA512 d6358f843689d10a44dc7bf590305cbfb89727e26d971ca4fe439e5468cdb7bcee2aa858368250e9654fb5ecebf63bca9742451881dae78068fecb18f279d988 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/loguru.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/loguru) +file(COPY ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/loguru)
\ No newline at end of file diff --git a/ports/lpeg/CONTROL b/ports/lpeg/CONTROL index 9896815b8..c779b2888 100644 --- a/ports/lpeg/CONTROL +++ b/ports/lpeg/CONTROL @@ -1,4 +1,5 @@ Source: lpeg Version: 1.0.1-3 +Homepage: https://www.inf.puc-rio.br/~roberto/lpeg Description: LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs). Build-Depends: lua diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index 3fa62fe2c..01a1d5a12 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -9,9 +9,6 @@ PROJECT ( lua ) -IF( NOT WIN32 ) - message( FATAL_ERROR "Written for window only" ) -ENDIF() CMAKE_MINIMUM_REQUIRED(VERSION 2.8) @@ -33,21 +30,45 @@ src/ltable.c src/ltablib.c src/ltm.c src/lundump.c src/lutf8lib.c src/lvm.c src/ IF (COMPILE_AS_CPP) SET_SOURCE_FILES_PROPERTIES(${SRC_LIBLUA} src/lua.c src/luac.c PROPERTIES LANGUAGE CXX) +ELSE () + SET (CMAKE_C_STANDARD 99) ENDIF () # append headers to sources to make them show up in MSVC GUI LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA}) -# remove warnings -ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS ) +IF (WIN32) + # remove warnings + ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS ) +ENDIF () + +IF (UNIX) + ADD_DEFINITIONS (-DLUA_USE_POSIX) + FIND_LIBRARY (LIB_MATH NAMES m) + IF (LIB_MATH) + LINK_LIBRARIES (${LIB_MATH}) + ENDIF () +ENDIF () #DLL ADD_LIBRARY ( lua ${SRC_LIBLUA} ) -IF (BUILD_SHARED_LIBS) +IF (BUILD_SHARED_LIBS AND WIN32) TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL ) ENDIF () +IF (UNIX) + IF (APPLE) + TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_USE_DLOPEN) + ELSE () + FIND_LIBRARY (LIB_DLOPEN NAMES dl) + IF (LIB_DLOPEN) + TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_USE_DLOPEN) + TARGET_LINK_LIBRARIES (lua ${LIB_DLOPEN}) + ENDIF () + ENDIF () +ENDIF () + INSTALL ( TARGETS lua RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib @@ -59,6 +80,21 @@ IF (NOT DEFINED SKIP_INSTALL_TOOLS) ADD_EXECUTABLE ( luai src/lua.c ) # interpreter TARGET_LINK_LIBRARIES ( luai lua ) SET_TARGET_PROPERTIES ( luai PROPERTIES OUTPUT_NAME lua PDB_NAME luai ) + IF (UNIX) + IF (CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + SET (_LIB_READLINE_NAME edit) + ELSE () + SET (_LIB_READLINE_NAME readline) + ENDIF () + FIND_LIBRARY (LIB_READLINE NAMES ${_LIB_READLINE_NAME}) + IF (LIB_READLINE) + TARGET_COMPILE_DEFINITIONS (luai PUBLIC -DLUA_USE_READLINE) + TARGET_LINK_LIBRARIES(luai ${LIB_READLINE}) + IF (_LIB_READLINE_NAME STREQUAL edit) + TARGET_INCLUDE_DIRECTORIES (luai PUBLIC /usr/include/edit) + ENDIF () + ENDIF () + ENDIF () INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/lua ) ENDIF () diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL index 836ae345a..738aabdfd 100644 --- a/ports/lua/CONTROL +++ b/ports/lua/CONTROL @@ -1,3 +1,4 @@ Source: lua -Version: 5.3.4-4 +Version: 5.3.5-1 +Homepage: https://www.lua.org Description: a powerful, fast, lightweight, embeddable scripting language diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index a1dcbd379..e3c972ac4 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -7,13 +7,16 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lua-5.3.4) vcpkg_download_distfile(ARCHIVE - URLS "http://www.lua.org/ftp/lua-5.3.4.tar.gz" - FILENAME "lua-5.3.4.tar.gz" - SHA512 739e31f82e6a60fa99910c2005e991b3a1e21339af52847f653cb190b30842054d189ca116ffcfdf9b36e07888c9ce5642b1dd2988cc7eff9f8789f9a2e34997 + URLS "https://www.lua.org/ftp/lua-5.3.5.tar.gz" + FILENAME "lua-5.3.5.tar.gz" + SHA512 4f9516acc4659dfd0a9e911bfa00c0788f0ad9348e5724fe8fb17aac59e9c0060a64378f82be86f8534e49c6c013e7488ad17321bafcc787831d3d67406bd0f4 +) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES vs2015-impl-c99.patch ) -vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -30,13 +33,15 @@ vcpkg_configure_cmake( vcpkg_install_cmake() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - 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}") + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) + 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}") + endif() endif() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lua) # Handle copyright -file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua/copyright) vcpkg_copy_pdbs() diff --git a/ports/lua/vs2015-impl-c99.patch b/ports/lua/vs2015-impl-c99.patch new file mode 100644 index 000000000..e281e83cf --- /dev/null +++ b/ports/lua/vs2015-impl-c99.patch @@ -0,0 +1,11 @@ +--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -54,7 +54,7 @@
+
+ #if defined(LUA_USE_WINDOWS)
+ #define LUA_DL_DLL /* enable support for DLL */
+-#define LUA_USE_C89 /* broadly, Windows is C89 */
++//#define LUA_USE_C89 /* broadly, Windows is C89 */
+ #endif
+
+
diff --git a/ports/luabridge/CONTROL b/ports/luabridge/CONTROL index 595e3b113..7c2a41aa4 100644 --- a/ports/luabridge/CONTROL +++ b/ports/luabridge/CONTROL @@ -1,3 +1,3 @@ Source: luabridge
-Version: 2.1-1
+Version: 2.3.1 Description: A lightweight, dependency-free library for binding Lua to C++
diff --git a/ports/luabridge/portfile.cmake b/ports/luabridge/portfile.cmake index 6ff91dd3a..9b9ccbb42 100644 --- a/ports/luabridge/portfile.cmake +++ b/ports/luabridge/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vinniefalco/LuaBridge - REF 2.1 - SHA512 062efda16fe43a02bcc757aaebba839e0ec72a9a3b7bf1e5bc1427a54d664a52197c8bcd4ac584f0d04cce812c0f078e257716e8bca016bcabda82c2c332ac04 + REF 2.3.1 + SHA512 6478410ec5863f40087f023a68c585b4c84974aa27dd522552094f6c823bee9820edc77685a9932b5d7d74f26cced4d624810dbfbaa3694f55c0b7803d2d5216 HEAD_REF master ) diff --git a/ports/luafilesystem/CONTROL b/ports/luafilesystem/CONTROL index 4ff18cda4..d6d96910c 100644 --- a/ports/luafilesystem/CONTROL +++ b/ports/luafilesystem/CONTROL @@ -1,4 +1,5 @@ Source: luafilesystem Version: 1.7.0.2 +Homepage: https://github.com/keplerproject/luafilesystem Description: LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution. Build-Depends: lua diff --git a/ports/luajit/CONTROL b/ports/luajit/CONTROL index e81524ec7..fb9c9d646 100644 --- a/ports/luajit/CONTROL +++ b/ports/luajit/CONTROL @@ -1,3 +1,4 @@ Source: luajit
Version: 2.0.5-1
+Homepage: https://github.com/LuaJIT/LuaJIT
Description: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
diff --git a/ports/luasocket/CONTROL b/ports/luasocket/CONTROL index 30a45083f..e50ca87fb 100644 --- a/ports/luasocket/CONTROL +++ b/ports/luasocket/CONTROL @@ -1,4 +1,5 @@ Source: luasocket -Version: 2019-03-29 +Version: 2019-05-07 +Homepage: https://github.com/diegonehab/luasocket 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. Build-Depends: lua diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index a7ed86cf8..0f4bfbf6d 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO diegonehab/luasocket - REF c89a931cc31f219d51dd32a8a253d5ee3fbd31be - SHA512 1769bc6aed41f129a7e7f8c64497476fc89dc69a227a4610c6330c3138b9cdc3c2fc87a925efc13ba840153b681cc4d66001faddb5b3085f430050c52bd5e564 + REF 733af884f1aa18ff469bf3c4d18810e815853211 + SHA512 632d66a9460636758428261b5b0d8669a90492de716915c07d1d1bf66c795bc9599f9edcd4345bbc3ef06830d670303b6cfb56c206e022b4bc5307fec2a20395 HEAD_REF master) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt index b082ab374..b36a3574e 100644 --- a/ports/lz4/CMakeLists.txt +++ b/ports/lz4/CMakeLists.txt @@ -6,21 +6,44 @@ if(BUILD_SHARED_LIBS) endif() add_definitions(-DXXH_NAMESPACE=LZ4_) +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Install prefix") +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/lz4" CACHE PATH "Path where cmake configs will be installed") + +file(GLOB LZ4_HEADERS lib/*.h) + add_library(lz4 + ${LZ4_HEADERS} lib/lz4.c lib/lz4frame.c lib/lz4hc.c - lib/xxhash.c) + lib/xxhash.c +) + +target_include_directories(lz4 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/lib> $<INSTALL_INTERFACE:include>) +set_target_properties(lz4 PROPERTIES PUBLIC_HEADER ${LZ4_HEADERS}) install(TARGETS lz4 - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -if(NOT LZ4_SKIP_INCLUDES) - install(FILES - lib/lz4.h - lib/lz4frame.h - lib/lz4hc.h - DESTINATION include) -endif() + EXPORT lz4Config + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" + PUBLIC_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + PRIVATE_HEADER DESTINATION "${INSTALL_INCLUDE_DIR}" + COMPONENT dev +) + +FILE(GLOB lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/*.h") +list(REMOVE_ITEM lz4h "${CMAKE_CURRENT_LIST_DIR}/lib/xxhash.h") +INSTALL(FILES ${lz4h} DESTINATION "${INSTALL_INCLUDE_DIR}") + +install(EXPORT lz4Config + FILE lz4Config.cmake + NAMESPACE lz4:: + DESTINATION "${INSTALL_CMAKE_DIR}" +) + +# Export the package for use from the build-tree (this registers the build-tree with a global CMake-registry) +export(PACKAGE lz4) diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL index 68fe1eff2..e6e99dd6a 100644 --- a/ports/lz4/CONTROL +++ b/ports/lz4/CONTROL @@ -1,3 +1,5 @@ -Source: lz4
-Version: 1.9.0 -Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core.
+Source: lz4 +Version: 1.9.1-2 +Homepage: https://github.com/lz4/lz4 +Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core. +Build-Depends: xxhash
\ No newline at end of file diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake index b28d3b939..e7f1ee461 100644 --- a/ports/lz4/portfile.cmake +++ b/ports/lz4/portfile.cmake @@ -1,32 +1,39 @@ -include(vcpkg_common_functions)
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO lz4/lz4
- REF v1.9.0 - SHA512 f9e78df262818192800157d6ed64d42c06e918062afc93e3098d00f5f49fd3279b5709486a7d8841708a4ce1c539381225f0813e6a342f49d13b576eb61eb444
- HEAD_REF dev)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS_DEBUG
- -DLZ4_SKIP_INCLUDES=ON
- -DCMAKE_DEBUG_POSTFIX=d)
-
-vcpkg_install_cmake()
-vcpkg_copy_pdbs()
-
-foreach(FILE lz4.h lz4frame.h)
- file(READ ${CURRENT_PACKAGES_DIR}/include/${FILE} LZ4_HEADER)
- if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "1" LZ4_HEADER "${LZ4_HEADER}")
- else()
- string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "0" LZ4_HEADER "${LZ4_HEADER}")
- endif()
- file(WRITE ${CURRENT_PACKAGES_DIR}/include/${FILE} "${LZ4_HEADER}")
-endforeach()
-
-file(COPY ${SOURCE_PATH}/lib/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lz4)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/lz4/LICENSE ${CURRENT_PACKAGES_DIR}/share/lz4/copyright)
+include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lz4/lz4 + REF v1.9.1 + SHA512 536cdeb6dd73b4769cf9501ad312b004ab01699758534b47ca2eddbc815fd374a3caba40cde36f73a7a70e134065836b733e2b0c023c31740b877ef9317ccf3e + HEAD_REF dev +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() + +foreach(FILE lz4.h lz4frame.h) + file(READ ${CURRENT_PACKAGES_DIR}/include/${FILE} LZ4_HEADER) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "1" LZ4_HEADER "${LZ4_HEADER}") + else() + string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "0" LZ4_HEADER "${LZ4_HEADER}") + endif() + file(WRITE ${CURRENT_PACKAGES_DIR}/include/${FILE} "${LZ4_HEADER}") +endforeach() + +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/lib/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lz4) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/lz4/LICENSE ${CURRENT_PACKAGES_DIR}/share/lz4/copyright) + diff --git a/ports/lzfse/CONTROL b/ports/lzfse/CONTROL index 34276814f..98fdf6c0d 100644 --- a/ports/lzfse/CONTROL +++ b/ports/lzfse/CONTROL @@ -1,3 +1,4 @@ Source: lzfse Version: 1.0-1 +Homepage: https://github.com/lzfse/lzfse Description: Lempel-Ziv style data compressor using Finite State Entropy coding. diff --git a/ports/lzo/CONTROL b/ports/lzo/CONTROL index d124020b8..cd1149f61 100644 --- a/ports/lzo/CONTROL +++ b/ports/lzo/CONTROL @@ -1,3 +1,4 @@ Source: lzo Version: 2.10-2 +Homepage: https://www.oberhumer.com/opensource/lzo/ Description: Lossless data compression library diff --git a/ports/magic-enum/CONTROL b/ports/magic-enum/CONTROL new file mode 100644 index 000000000..590b8d758 --- /dev/null +++ b/ports/magic-enum/CONTROL @@ -0,0 +1,3 @@ +Source: magic-enum
+Version: 2019-06-07
+Description: Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.
diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake new file mode 100644 index 000000000..95be6cc27 --- /dev/null +++ b/ports/magic-enum/portfile.cmake @@ -0,0 +1,22 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO "Neargye/magic_enum"
+ REF 4dfaa4b7b4814c2cf85b08ad3084fc28c8b129c6
+ SHA512 924e5a134f4200652fdc3f3d676b49efa8c30b5577d638f60134ce81092b23f7976a494ce50b58b25ed7bce0653a7e29206acf9e512408c4701ec6822ab2d176
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF
+ -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/magic_enum)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/magic-enum RENAME copyright)
diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL index 9942c9463..e065088af 100644 --- a/ports/magnum-extras/CONTROL +++ b/ports/magnum-extras/CONTROL @@ -1,8 +1,8 @@ Source: magnum-extras
-Version: 2019.01-1
+Version: 2019.01-2
Build-Depends: magnum[core]
-Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/
-Default-Features:
+Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization
+Homepage: https://magnum.graphics/
Feature: ui
Description: Ui library
diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake index 7941aeee9..41faca02c 100644 --- a/ports/magnum-extras/portfile.cmake +++ b/ports/magnum-extras/portfile.cmake @@ -37,7 +37,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/MagnumExtras TARGET_PATH share/MagnumExtras) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/MagnumExtras TARGET_PATH share/magnumextras) # Messages to the user if("ui" IN_LIST FEATURES) diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL index da379258c..68a481b8c 100644 --- a/ports/magnum-integration/CONTROL +++ b/ports/magnum-integration/CONTROL @@ -1,8 +1,8 @@ Source: magnum-integration -Version: 2019.01-1 +Version: 2019.01-2 Build-Depends: magnum[core] -Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ -Default-Features: +Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization +Homepage: https://magnum.graphics/ Feature: bullet Description: BulletIntegration library @@ -21,4 +21,3 @@ Build-Depends: imgui #Feature: dart #Description: DartIntegration library #Build-Depends: dart - diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index c109f7edf..abe303a90 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,7 +1,8 @@ Source: magnum-plugins Version: 2019.01-1 Build-Depends: magnum[core] -Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ +Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization +Homepage: https://magnum.graphics/ Default-Features: ddsimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stbimageconverter, stbimageimporter Feature: assimpimporter @@ -26,7 +27,6 @@ Build-Depends: magnum[audio] Feature: drwavaudioimporter Description: DrWavAudioImporter plugin Build-Depends: magnum[audio] -# #Feature: faad2audioimporter #Description: Faad2AudioImporter plugin #Build-Depends: magnum[audio], faad2 diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index 29db869a3..89bcff28e 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,7 +1,8 @@ Source: magnum Version: 2019.01-1 Build-Depends: corrade[utility] -Description: C++11/C++14 graphics middleware for games and data visualization http://magnum.graphics/ +Description: C++11/C++14 graphics middleware for games and data visualization +Homepage: https://magnum.graphics/ Default-Features: anyimageimporter, anyaudioimporter, anyimageconverter, anysceneimporter, debugtools, gl, meshtools, primitives, scenegraph, shaders, text, texturetools, trade, sdl2application Feature: al-info diff --git a/ports/mathgl/CONTROL b/ports/mathgl/CONTROL new file mode 100644 index 000000000..9337e5f2d --- /dev/null +++ b/ports/mathgl/CONTROL @@ -0,0 +1,48 @@ +Source: mathgl +Version: 2.4.3-1 +Description: MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions +Default-Features: opengl, jpeg, png, zlib + +Feature: hdf5 +Build-Depends: hdf5 +Description: hdf5 module + +Feature: fltk +Build-Depends: fltk +Description: fltk module + +Feature: gif +Build-Depends: giflib +Description: gif module + +Feature: png +Build-Depends: libpng +Description: png module + +Feature: zlib +Build-Depends: zlib +Description: zlib module + +Feature: jpeg +Build-Depends: libjpeg-turbo +Description: jpeg module + +Feature: gsl +Build-Depends: gsl +Description: gsl module + +Feature: opengl +Build-Depends: opengl +Description: opengl module + +Feature: glut +Build-Depends: freeglut +Description: glut module + +Feature: wx +Build-Depends: wxwidgets +Description: wx module + +Feature: qt5 +Build-Depends: qt5 +Description: qt5 module diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake new file mode 100644 index 000000000..d17707c64 --- /dev/null +++ b/ports/mathgl/portfile.cmake @@ -0,0 +1,121 @@ +include(vcpkg_common_functions) + +set(MATHGL_VERSION "2.4.3") +vcpkg_download_distfile(ARCHIVE + URLS "https://downloads.sourceforge.net/project/mathgl/mathgl/mathgl%20${MATHGL_VERSION}/mathgl-${MATHGL_VERSION}.tar.gz" + FILENAME "mathgl-${MATHGL_VERSION}.tar.gz" + SHA512 e47fc8171ce80c8b33a8f03d9375bc036455dae539b47cf4ee922f8fa36f5afcf8b3f0666997764e453eb698c0e8c03da36dd0ac2bf71c158e95309b247d27de +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${MATHGL_VERSION} + PATCHES + type_fix.patch +) + +set(enable-hdf5 OFF) +if("hdf5" IN_LIST FEATURES) + set(enable-hdf5 ON) +endif() + +set(enable-fltk OFF) +if("fltk" IN_LIST FEATURES) + set(enable-fltk ON) +endif() + +set(enable-gif OFF) +if("gif" IN_LIST FEATURES) + set(enable-gif ON) +endif() + +set(enable-png OFF) +if("png" IN_LIST FEATURES) + set(enable-png ON) +endif() + +set(enable-zlib OFF) +if("zlib" IN_LIST FEATURES) + set(enable-zlib ON) +endif() + +set(enable-jpeg OFF) +if("jpeg" IN_LIST FEATURES) + set(enable-jpeg ON) +endif() + +set(enable-gsl OFF) +if("gsl" IN_LIST FEATURES) + set(enable-gsl ON) +endif() + +set(enable-opengl OFF) +if("opengl" IN_LIST FEATURES) + set(enable-opengl ON) +endif() + +set(enable-glut OFF) +if("glut" IN_LIST FEATURES) + set(enable-glut ON) +endif() + +set(enable-wx OFF) +if("wx" IN_LIST FEATURES) + set(enable-wx ON) +endif() + +set(enable-qt5 OFF) +if("qt5" IN_LIST FEATURES) + set(enable-qt5 ON) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Denable-hdf5=${enable-hdf5} + -Denable-fltk=${enable-fltk} + -Denable-gif=${enable-gif} + -Denable-png=${enable-png} + -Denable-zlib=${enable-zlib} + -Denable-jpeg=${enable-jpeg} + -Denable-gsl=${enable-gsl} + -Denable-opengl=${enable-opengl} + -Denable-glut=${enable-glut} + -Denable-wx=${enable-wx} + -Denable-qt5=${enable-qt5} +) + +vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + file(REMOVE ${CURRENT_PACKAGES_DIR}/mathgl2-config.cmake) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/mathgl2-config.cmake) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mathgl) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mglconv${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mgltask${EXECUTABLE_SUFFIX}) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/mathgl/) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mglconv${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/mathgl/mglconv${EXECUTABLE_SUFFIX}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mgltask${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/mathgl/mgltask${EXECUTABLE_SUFFIX}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/mathgl) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mathgl RENAME copyright) diff --git a/ports/mathgl/type_fix.patch b/ports/mathgl/type_fix.patch new file mode 100644 index 000000000..288f6b1a0 --- /dev/null +++ b/ports/mathgl/type_fix.patch @@ -0,0 +1,62 @@ +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 && i<dat->nx && j>=0 && j<dat->ny && k>=0 && k<dat->nz) + 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 <string.h> + #include <stdio.h> + #include <stdlib.h> ++#define _USE_MATH_DEFINES + #include <math.h> + #include <time.h> + //=================================================================== +@@ -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/matio/CONTROL b/ports/matio/CONTROL index a501977d6..6877c2972 100644 --- a/ports/matio/CONTROL +++ b/ports/matio/CONTROL @@ -1,4 +1,5 @@ Source: matio Version: 1.5.15 +Homepage: https://github.com/tbeu/matio Description: MATLAB MAT File I/O Library Build-Depends: zlib, hdf5 diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL index 627c2e93f..29cef7e80 100644 --- a/ports/matroska/CONTROL +++ b/ports/matroska/CONTROL @@ -1,4 +1,5 @@ Source: matroska -Version: 1.4.9-1 +Version: 1.5.2 +Homepage: https://github.com/Matroska-Org/libmatroska Description: a C++ libary to parse Matroska files (.mkv and .mka) Build-Depends: ebml diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake index 946ee81bc..bf41c8f1a 100644 --- a/ports/matroska/portfile.cmake +++ b/ports/matroska/portfile.cmake @@ -1,14 +1,14 @@ include(vcpkg_common_functions) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") + message(FATAL_ERROR "matroska does not currently support UWP") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libmatroska - REF release-1.4.9 - SHA512 0c2e7324d62e1fc28b00a899f1d2fda88a3de474ea25c51624d716b869db72b4645b64cc434a0bdb7cefdd63b354de59920d4011889554f95a2905020b139fb1 + REF release-1.5.2 + SHA512 5e819d611455efb1dd49ea26b6b124899b1f6ba07b4af93b2f3437ffe7c2c0089a922ef894a7c8612faddadeea75142d0604ee54e6c5822439dc8c65008e119b HEAD_REF master ) @@ -20,11 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if (WIN32) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -else () - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/matroska) -endif () +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Matroska) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL index 0a4183cb7..ac4a4a131 100644 --- a/ports/mbedtls/CONTROL +++ b/ports/mbedtls/CONTROL @@ -1,3 +1,4 @@ Source: mbedtls Version: 2.15.1 +Homepage: https://github.com/ARMmbed/mbedtls Description: An open source, portable, easy to use, readable and flexible SSL library diff --git a/ports/mdnsresponder/CONTROL b/ports/mdnsresponder/CONTROL index f703d5860..cfac2cca9 100644 --- a/ports/mdnsresponder/CONTROL +++ b/ports/mdnsresponder/CONTROL @@ -1,3 +1,4 @@ Source: mdnsresponder Version: 765.30.11 -Description: The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative: <http://developer.apple.com/bonjour/>
\ No newline at end of file +Description: The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative. +Homepage: https://developer.apple.com/bonjour/
\ No newline at end of file diff --git a/ports/meschach/CONTROL b/ports/meschach/CONTROL index 84a3bf0d4..d54e03952 100644 --- a/ports/meschach/CONTROL +++ b/ports/meschach/CONTROL @@ -1,3 +1,4 @@ Source: meschach
Version: 1.2b-2
+Homepage: https://homepage.math.uiowa.edu/~dstewart/meschach
Description: Matrix computations in C
diff --git a/ports/metis/CONTROL b/ports/metis/CONTROL index 65571b0bd..6db70e599 100644 --- a/ports/metis/CONTROL +++ b/ports/metis/CONTROL @@ -1,3 +1,4 @@ Source: metis
Version: 5.1.0-3
+Homepage: https://glaros.dtc.umn.edu/gkhome/metis/metis/overview
Description: Serial Graph Partitioning and Fill-reducing Matrix Ordering
diff --git a/ports/minhook/CONTROL b/ports/minhook/CONTROL new file mode 100644 index 000000000..95209891b --- /dev/null +++ b/ports/minhook/CONTROL @@ -0,0 +1,3 @@ +Source: minhook
+Version: 1.3.3
+Description: The Minimalistic x86/x64 API Hooking Library for Windows.
\ No newline at end of file diff --git a/ports/minhook/install-destination.patch b/ports/minhook/install-destination.patch new file mode 100644 index 000000000..13f3dc379 --- /dev/null +++ b/ports/minhook/install-destination.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df947af..6a894d8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,7 @@ install(
+ "${CMAKE_CURRENT_BINARY_DIR}/minhook-config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/minhook-config-version.cmake"
+ DESTINATION
+- "lib/minhook"
++ share/minhook
+ )
+
+ ###################
+@@ -133,7 +133,7 @@ install(
+ NAMESPACE
+ minhook::
+ DESTINATION
+- "lib/minhook"
++ share/minhook
+ )
+
+ install(
diff --git a/ports/minhook/portfile.cmake b/ports/minhook/portfile.cmake new file mode 100644 index 000000000..13779a338 --- /dev/null +++ b/ports/minhook/portfile.cmake @@ -0,0 +1,49 @@ +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ message(FATAL_ERROR "${PORT} does not currently support UWP")
+endif()
+
+include(vcpkg_common_functions)
+
+if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
+ set(BUILD_ARCH "Win32")
+ set(OUTPUT_DIR "Win32")
+elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
+ set(BUILD_ARCH "x64")
+ set(OUTPUT_DIR "Win64")
+else()
+ message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+# Download files to enable CMake support for minhook - Adds CMakeLists.txt and minhook-config.cmake.in
+vcpkg_download_distfile(
+ CMAKE_SUPPORT_PATCH
+ URLS https://github.com/TsudaKageyu/minhook/commit/3f2e34976c1685ee372a09f54c0c8c8f4240ef90.patch
+ FILENAME minhook-cmake-support.patch
+ SHA512 5f353b167e2c31e5e06258420c78fbae0095368cf687ff06a350d6b69b30476824785dde5dbcea3e30ff827e7cdb293727a73e6b1e6875f00aa891b2980c3877
+)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO TsudaKageyu/minhook
+ REF v1.3.3
+ SHA512 9f10c92a926a06cde1e4092b664a3aab00477e8b9f20cee54e1d2b3747fad91043d199a2753f7e083497816bbefc5d75d9162d2098dd044420dbca555e80b060
+ HEAD_REF master
+ PATCHES
+ "${CMAKE_SUPPORT_PATCH}"
+ install-destination.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/minhook-targets-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/minisat-master-keying/CONTROL b/ports/minisat-master-keying/CONTROL index 84021f371..109ba31b5 100644 --- a/ports/minisat-master-keying/CONTROL +++ b/ports/minisat-master-keying/CONTROL @@ -2,4 +2,4 @@ Source: minisat-master-keying Version: 2.2-mod-2
Description: A minimalistic high-performance SAT solver
This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat.
- Since the original library is no longer under development, post issues and pull requests should be posted to https://github.com/master-keying/minisat
+Homepage: https://github.com/master-keying/minisat
diff --git a/ports/miniz/CMakeLists-targets.patch b/ports/miniz/CMakeLists-targets.patch index 3b4c70468..c9d32e479 100644 --- a/ports/miniz/CMakeLists-targets.patch +++ b/ports/miniz/CMakeLists-targets.patch @@ -1,54 +1,55 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dd6309..eaf160f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,12 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "") - CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) - endif () - --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) -- - set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c) - --add_library(miniz ${miniz_SOURCE}) -+add_library(miniz STATIC ${miniz_SOURCE}) -+target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS) - -+if(FALSE) - set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c") - set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c") - set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c") -@@ -41,12 +41,28 @@ if(${UNIX}) - target_link_libraries(example6 m) - endif() - -+target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS) -+ - # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST}) - # target_link_libraries(miniz_tester miniz) -+endif() - --install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+export(TARGETS ${PROJECT_NAME} -+ NAMESPACE miniz:: -+ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" -+) -+install(EXPORT ${PROJECT_NAME}Config -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz" -+ NAMESPACE miniz:: -+) - file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) --install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) -\ No newline at end of file -+install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f3e453a..094a4e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,13 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
+-
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
+
+-add_library(miniz ${miniz_SOURCE})
+-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+-
++add_library(miniz STATIC ${miniz_SOURCE})
++target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS)
++
++if(FALSE)
+ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+ set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+ set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+@@ -41,12 +40,28 @@ if(${UNIX})
+ target_link_libraries(example6 m)
+ endif()
+
++target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS)
++target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS)
++
+ # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+ # target_link_libraries(miniz_tester miniz)
++endif()
+
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
++export(TARGETS ${PROJECT_NAME}
++ NAMESPACE miniz::
++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
++)
++install(EXPORT ${PROJECT_NAME}Config
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz"
++ NAMESPACE miniz::
++)
+ file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+ install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
diff --git a/ports/miniz/CONTROL b/ports/miniz/CONTROL index 51a370a80..88eacdb85 100644 --- a/ports/miniz/CONTROL +++ b/ports/miniz/CONTROL @@ -1,3 +1,3 @@ Source: miniz -Version: 2.0.8 +Version: 2.1.0 Description: Single C source file zlib-replacement library diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake index 9c67ea8c9..4de2dc3f3 100644 --- a/ports/miniz/portfile.cmake +++ b/ports/miniz/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO richgel999/miniz - REF 2.0.8 - SHA512 84b480df8bff63422d8c36cef3741f9b9f3dce13babf4de6cb4d575209978ad849357cc72bcf31ee8b6c5da6853ed2e5eddbbe16fecd689afd7028e834abf7e9 + REF a4264837ae37384b1d7a205a6732db322f0f3769 + SHA512 88f0e03cccfe66c796db7594b93c667bd52cd7f4d13803181e9d86b4aa26f214fd2907a45a752da603d3e87f8d53c40bfc0956b279c0d49016f7b943aeb9cd33 HEAD_REF master PATCHES CMakeLists-targets.patch diff --git a/ports/minizip/CONTROL b/ports/minizip/CONTROL index b0c606ded..93d453ca2 100644 --- a/ports/minizip/CONTROL +++ b/ports/minizip/CONTROL @@ -1,4 +1,5 @@ Source: minizip
Version: 1.2.11-4
+Homepage: https://github.com/madler/zlib
Description: Zip compression library
Build-Depends: bzip2, zlib
diff --git a/ports/mlpack/CONTROL b/ports/mlpack/CONTROL index d57aa4ca3..0902ce894 100644 --- a/ports/mlpack/CONTROL +++ b/ports/mlpack/CONTROL @@ -1,7 +1,7 @@ -Source: mlpack
-Version: 3.1.0-1
-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.
-Build-Depends: openblas, clapack, boost, armadillo
-
-Feature: tools
-Description: Build command-line executables and tests.
+Source: mlpack +Version: 3.1.1 +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. +Build-Depends: openblas (!osx), clapack (!osx), boost, armadillo, ensmallen + +Feature: tools +Description: Build command-line executables and tests. diff --git a/ports/mlpack/cmakelists.patch b/ports/mlpack/cmakelists.patch index 6c39a4293..05810f57f 100644 --- a/ports/mlpack/cmakelists.patch +++ b/ports/mlpack/cmakelists.patch @@ -1,24 +1,34 @@ --- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -284,7 +284,7 @@
+@@ -283,25 +283,8 @@
+ # and find LAPACK and BLAS ourselves, using a slightly modified variant of the
# script Armadillo uses to find these.
if (WIN32)
- find_library(LAPACK_LIBRARY
+- find_library(LAPACK_LIBRARY
- NAMES lapack liblapack lapack_win32_MT lapack_win32
-+ NAMES clapack lapack liblapack lapack_win32_MT lapack_win32
- PATHS "C:/Program Files/Armadillo"
- PATH_SUFFIXES "examples/lib_win32/")
-
-@@ -293,7 +293,7 @@
- endif ()
-
- find_library(BLAS_LIBRARY
+- PATHS "C:/Program Files/Armadillo"
+- PATH_SUFFIXES "examples/lib_win32/")
+-
+- if (NOT LAPACK_LIBRARY)
+- message(FATAL_ERROR "Cannot find LAPACK library (.lib)!")
+- endif ()
+-
+- find_library(BLAS_LIBRARY
- NAMES blas libblas blas_win32_MT blas_win32
-+ NAMES openblas blas libblas blas_win32_MT blas_win32
- PATHS "C:/Program Files/Armadillo"
- PATH_SUFFIXES "examples/lib_win32/")
-
-@@ -392,19 +392,11 @@
+- PATHS "C:/Program Files/Armadillo"
+- PATH_SUFFIXES "examples/lib_win32/")
+-
+- if (NOT BLAS_LIBRARY)
+- message(FATAL_ERROR "Cannot find BLAS library (.lib)!")
+- endif ()
+-
+- # Piggyback LAPACK and BLAS linking into Armadillo link.
++ find_package(LAPACK)
++ find_package(BLAS)
+ set(ARMADILLO_LIBRARIES
+ ${ARMADILLO_LIBRARIES} ${BLAS_LIBRARY} ${LAPACK_LIBRARY})
+ endif ()
+@@ -395,19 +378,11 @@
REQUIRED
)
diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index c7bf89bc1..0a5bcb6d1 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -3,14 +3,23 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlpack/mlpack - REF mlpack-3.1.0 - SHA512 dc305a9a2f7232d3957206a346d0ac97ba13b933d5dbef45329002b8380ecc0982621c0b97f6c5ee82d0a26ad53b1cdd7a9b991fb749efc8546394988ac40a5b + REF mlpack-3.1.1 + SHA512 4acef74da951934b9bd1cabd87b9d6d002c80eb3218f69755277fa654d928aed379a5e63987f32ec162cc005c2952e618d6d528c2311aebb8cd2cc01cab71f86 HEAD_REF master - PATCHES - cmakelists.patch + PATCHES + cmakelists.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MLPACK_SHARED_LIBS) +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) set(BUILD_TOOLS OFF) if("tools" IN_LIST FEATURES) @@ -20,10 +29,9 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DBUILD_TESTS=${BUILD_TOOLS} - -DBUILD_CLI_EXECUTABLES=${BUILD_TOOLS} - -DBUILD_SHARED_LIBS=${MLPACK_SHARED_LIBS} + OPTIONS + -DBUILD_TESTS=${BUILD_TOOLS} + -DBUILD_CLI_EXECUTABLES=${BUILD_TOOLS} ) vcpkg_install_cmake() vcpkg_copy_pdbs() @@ -31,12 +39,12 @@ vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mlpack RENAME copyright) if(BUILD_TOOLS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) - file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(COPY ${MLPACK_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${MLPACK_TOOLS}) - file(GLOB MLPACK_TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${MLPACK_TOOLS_DEBUG}) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) + file(GLOB MLPACK_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) + file(COPY ${MLPACK_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(REMOVE ${MLPACK_TOOLS}) + file(GLOB MLPACK_TOOLS_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(REMOVE ${MLPACK_TOOLS_DEBUG}) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/mman/CONTROL b/ports/mman/CONTROL index dad1b19da..6ef51acb9 100644 --- a/ports/mman/CONTROL +++ b/ports/mman/CONTROL @@ -1,3 +1,4 @@ Source: mman
Version: git-f5ff813-2
+Homepage: https://github.com/witwall/mman-win32
Description: A light implementation of the mmap functions for MinGW.
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 4f45aa9b6..0a02b9dd1 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,4 +1,5 @@ Source: mongo-c-driver -Version: 1.13.0 -Build-Depends: libbson, openssl (uwp) +Version: 1.14.0-2 +Build-Depends: libbson, openssl (!windows), zlib Description: Client library written in C for MongoDB. +Homepage: https://github.com/mongodb/mongo-c-driver diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 2d4c88460..3db262c2f 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,9 +1,11 @@ include(vcpkg_common_functions)
+set(BUILD_VERSION 1.14.0)
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mongodb/mongo-c-driver
- REF 1.13.0
- SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
+ REF ${BUILD_VERSION}
+ SHA512 bf2bb835543dd2a445aac6cafa7bbbf90921ec41014534779924a5eb7cbd9fd532acd8146ce81dfcf1bcac33a78d8fce22b962ed7f776449e4357eccab8d6110
HEAD_REF master
PATCHES fix-uwp.patch
)
@@ -30,15 +32,17 @@ vcpkg_configure_cmake( -DENABLE_TESTS=OFF
-DENABLE_EXAMPLES=OFF
-DENABLE_SSL=${ENABLE_SSL}
+ -DENABLE_ZLIB=SYSTEM
-DENABLE_STATIC=${ENABLE_STATIC}
+ -DBUILD_VERSION=${BUILD_VERSION}
)
vcpkg_install_cmake()
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
- vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libmongoc-static-1.0")
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libmongoc-static-1.0)
else()
- vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libmongoc-1.0")
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libmongoc-1.0)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
@@ -92,7 +96,7 @@ endif() file(READ ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/libmongoc-${PORT_POSTFIX}-config.cmake LIBMONGOC_CONFIG_CMAKE)
# Patch: Set _IMPORT_PREFIX and replace PACKAGE_PREFIX_DIR
-string(REPLACE
+string(REPLACE
[[
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
]]
diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL index 4d89b54c0..c1d85e636 100644 --- a/ports/mongo-cxx-driver/CONTROL +++ b/ports/mongo-cxx-driver/CONTROL @@ -1,4 +1,17 @@ Source: mongo-cxx-driver -Version: 3.2.0-2 +Version: 3.4.0-2 Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility +Homepage: https://github.com/mongodb/mongo-cxx-driver Description: MongoDB C++ Driver. + +Feature: mnmlstc +Description: Use MNMLSTC/core C++17 polyfill. + +Feature: system-mnmlstc +Description: Use an available version of MNMLSTC on your system as C++17 polyfill. + +Feature: boost +Description: Use Boost C++17 polyfill. The only option under MSVC. + +Feature: std-experimental +Description: Use optional and string_view from std::experimental. diff --git a/ports/mongo-cxx-driver/disable_test_and_example.patch b/ports/mongo-cxx-driver/disable_test_and_example.patch index 734f52f26..2c24024a8 100644 --- a/ports/mongo-cxx-driver/disable_test_and_example.patch +++ b/ports/mongo-cxx-driver/disable_test_and_example.patch @@ -1,151 +1,42 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27cf3b6b8..896eee19a 100644 +index c6f56e4..5601f90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -87,68 +87,68 @@ endif() +@@ -89,6 +89,8 @@ endif() set(CMAKE_EXPORT_COMPILE_COMMANDS ON) --add_custom_target(hugo_dir -- COMMAND ${CMAKE_COMMAND} -E make_directory hugo --) -- --add_custom_target(hugo -- DEPENDS hugo_dir -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs -- COMMAND hugo -- VERBATIM --) -- --add_custom_target(hugo-deploy -- DEPENDS hugo -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver -- VERBATIM --) -- --add_custom_target(docs_dir_current -- COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current --) -- --add_custom_target(doxygen-current -- DEPENDS docs_dir_current -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile -- VERBATIM --) -- --add_custom_target(doxygen-all -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND etc/generate-all-apidocs.pl -- VERBATIM --) -- --add_custom_target(doxygen-deploy -- DEPENDS doxygen-all -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver -- VERBATIM --) -- --add_custom_target(format -- python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format -- VERBATIM --) -- --add_custom_target(format-lint -- python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint -- VERBATIM --) -- --add_custom_target(docs -- DEPENDS hugo doxygen-current --) -- --set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) -+# add_custom_target(hugo_dir -+# COMMAND ${CMAKE_COMMAND} -E make_directory hugo -+# ) ++if(0) + -+# add_custom_target(hugo -+# DEPENDS hugo_dir -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs -+# COMMAND hugo -+# VERBATIM -+# ) -+ -+# add_custom_target(hugo-deploy -+# DEPENDS hugo -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver -+# VERBATIM -+# ) -+ -+# add_custom_target(docs_dir_current -+# COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current -+# ) -+ -+# add_custom_target(doxygen-current -+# DEPENDS docs_dir_current -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile -+# VERBATIM -+# ) -+ -+# add_custom_target(doxygen-all -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND etc/generate-all-apidocs.pl -+# VERBATIM -+# ) -+ -+# add_custom_target(doxygen-deploy -+# DEPENDS doxygen-all -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+# COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver -+# VERBATIM -+# ) -+ -+# add_custom_target(format -+# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format -+# VERBATIM -+# ) -+ -+# add_custom_target(format-lint -+# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint -+# VERBATIM -+# ) -+ -+# add_custom_target(docs -+# DEPENDS hugo doxygen-current -+# ) -+ -+# set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) + add_custom_target(hugo_dir + COMMAND ${CMAKE_COMMAND} -E make_directory hugo + ) +@@ -147,6 +149,8 @@ add_custom_target(docs + + set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) ++endif() ++ enable_testing() add_subdirectory(src) - --add_subdirectory(examples EXCLUDE_FROM_ALL) -+#add_subdirectory(examples EXCLUDE_FROM_ALL) - - add_subdirectory(benchmark EXCLUDE_FROM_ALL) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index bd6e40662..d6054b022 100644 +index 50085d0..5966d21 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt @@ -249,4 +249,4 @@ install( - DESTINATION lib/cmake/${PKG}-${BSONCXX_VERSION} + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${BSONCXX_VERSION} ) -add_subdirectory(test) -+#add_subdirectory(test) ++# add_subdirectory(test) diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt -index a05021228..3dd7c1224 100644 +index 3cba62d..64ff936 100644 --- a/src/mongocxx/CMakeLists.txt +++ b/src/mongocxx/CMakeLists.txt -@@ -238,4 +238,4 @@ install( - DESTINATION lib/cmake/${PKG}-${MONGOCXX_VERSION} +@@ -259,4 +259,4 @@ install( + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${MONGOCXX_VERSION} ) -add_subdirectory(test) -+#add_subdirectory(test) ++# add_subdirectory(test) diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index 69ac66b04..3ff200da3 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions)
set(VERSION_MAJOR 3)
-set(VERSION_MINOR 2)
+set(VERSION_MINOR 4)
set(VERSION_PATCH 0)
set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
@@ -9,14 +9,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH
REPO mongodb/mongo-cxx-driver
REF r${VERSION_FULL}
- SHA512 cad8dd6e9fd75aa3aee15321c9b3df21d43c346f5b0b3dd75c86f9117d3376ad83fcda0c4a333c0a23d555e76d79432016623dd5f860ffef9964a6e8046e84b5
+ SHA512 28c052904f1b456b92482097166238eae1ad50c3ed207496f09366b46f2c9465c7e98c7219f4f10314e4d8fdd01c36b70a2221891bb75231adcc1edf013d43ce
HEAD_REF master
PATCHES
- disable_test_and_example.patch
fix-uwp.patch
disable-c2338-mongo-cxx-driver.patch
+ disable_test_and_example.patch
)
+if ("mnmlstc" IN_LIST FEATURES)
+ set(BSONCXX_POLY MNMLSTC)
+elseif ("system-mnmlstc" IN_LIST FEATURES)
+ set(BSONCXX_POLY SYSTEM_MNMLSTC)
+elseif ("boost" IN_LIST FEATURES)
+ set(BSONCXX_POLY BOOST)
+elseif("std-experimental" IN_LIST FEATURES)
+ set(BSONCXX_POLY STD_EXPERIMENTAL)
+else()
+ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set(BSONCXX_POLY BOOST)
+ else()
+ set(BSONCXX_POLY MNMLSTC)
+ endif()
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -25,6 +41,7 @@ vcpkg_configure_cmake( -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR}
-DMONGOCXX_HEADER_INSTALL_DIR=include
-DBSONCXX_HEADER_INSTALL_DIR=include
+ -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1
)
vcpkg_install_cmake()
diff --git a/ports/monkeys-audio/CONTROL b/ports/monkeys-audio/CONTROL index e81e943bf..2b6447dbe 100644 --- a/ports/monkeys-audio/CONTROL +++ b/ports/monkeys-audio/CONTROL @@ -1,4 +1,5 @@ Source: monkeys-audio Version: 4.3.3-1 +Homepage: https://monkeysaudio.com Description: Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods. Audio files compressed with it ends with .ape extension. diff --git a/ports/moos-core/CONTROL b/ports/moos-core/CONTROL index 2195fd5bd..2534bb905 100644 --- a/ports/moos-core/CONTROL +++ b/ports/moos-core/CONTROL @@ -1,4 +1,4 @@ -Source: moos-core
-Version: 10.4.0-1
-Description: A very light weight, easy to use middleware. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
-Build-Depends:
+Source: moos-core +Version: 10.4.0-3 +Description: A very light weight, easy to use middleware. +Homepage: https://sites.google.com/site/moossoftware/ diff --git a/ports/moos-core/portfile.cmake b/ports/moos-core/portfile.cmake index 60eb5d9a5..663ad6df2 100644 --- a/ports/moos-core/portfile.cmake +++ b/ports/moos-core/portfile.cmake @@ -1,21 +1,17 @@ include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO themoos/core-moos REF v10.4.0 SHA512 8a82074bd219bbedbe56c2187afe74a55a252b0654a675c64d1f75e62353b0874e7b405d9f677fadb297e955d11aea50a07e8f5f3546be3c4ddab76fe356a51e HEAD_REF master + PATCHES + cmake_fix.patch ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake_fix.patch -) - -message(STATUS "MOOS VCPKG SOURCE_PATH ${SOURCE_PATH}") -message(STATUS "MOOS INSTALL -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}") - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -25,30 +21,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/MOOS") - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/MOOS) -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/MOOSDB") - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/MOOSDB ${CURRENT_PACKAGES_DIR}/tools/MOOS/MOOSDB) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/atm ${CURRENT_PACKAGES_DIR}/tools/MOOS/atm) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/gtm) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ktm ${CURRENT_PACKAGES_DIR}/tools/MOOS/ktm) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mqos ${CURRENT_PACKAGES_DIR}/tools/MOOS/mqos) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/mtm ${CURRENT_PACKAGES_DIR}/tools/MOOS/mtm) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/umm ${CURRENT_PACKAGES_DIR}/tools/MOOS/umm) -endif() - - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/MOOS) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +# Stage tools +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include) # Put the licence file where vcpkg expects it -file(COPY - ${SOURCE_PATH}/Core/GPLCore.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME - ${CURRENT_PACKAGES_DIR}/share/${PORT}/GPLCore.txt - ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(COPY ${SOURCE_PATH}/Core/GPLCore.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/moos-essential/CONTROL b/ports/moos-essential/CONTROL index c47dfa433..06cc1c0f0 100644 --- a/ports/moos-essential/CONTROL +++ b/ports/moos-essential/CONTROL @@ -1,4 +1,5 @@ Source: moos-essential
Version: 10.0.1-1
-Description: a set of useful applications that leverage the core-moos communications layer See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
+Description: a set of useful applications that leverage the core-moos communications layer.
+Homepage: https://sites.google.com/site/moossoftware/
Build-Depends: moos-core
diff --git a/ports/moos-ui/CONTROL b/ports/moos-ui/CONTROL index 07de10690..08279ce15 100644 --- a/ports/moos-ui/CONTROL +++ b/ports/moos-ui/CONTROL @@ -1,6 +1,7 @@ Source: moos-ui
Version: 10.0.1-1
-Description: set of user interface tools to use and leverage the MOOS project. See the MOOS homepage at https://sites.google.com/site/moossoftware/ for more information and documentation.
+Description: set of user interface tools to use and leverage the MOOS project.
+Homepage: https://sites.google.com/site/moossoftware/
Build-Depends: moos-core
diff --git a/ports/mosquitto/CONTROL b/ports/mosquitto/CONTROL index a623c89d7..1a72c19fc 100644 --- a/ports/mosquitto/CONTROL +++ b/ports/mosquitto/CONTROL @@ -1,6 +1,6 @@ Source: mosquitto
-Version: 1.5.0-2
+Version: 1.6.2-2
Build-Depends: c-ares, libwebsockets, openssl, pthreads
-Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
- MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
- You can see more information from this url https://mosquitto.org/download/
+Description: Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1.
+ MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for "machine to machine" messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino.
+Homepage: https://mosquitto.org/download/
diff --git a/ports/mosquitto/archive-dest.patch b/ports/mosquitto/archive-dest.patch new file mode 100644 index 000000000..11a9ccce4 --- /dev/null +++ b/ports/mosquitto/archive-dest.patch @@ -0,0 +1,13 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 221c230..1bd4e96 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -89,7 +89,7 @@ set_target_properties(libmosquitto PROPERTIES
+ SOVERSION 1
+ )
+
+-install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++install(TARGETS libmosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+
+ if (WITH_STATIC_LIBRARIES)
+ add_library(libmosquitto_static STATIC ${C_SRC})
diff --git a/ports/mosquitto/fix-dependence-pthreads.patch b/ports/mosquitto/fix-dependence-pthreads.patch deleted file mode 100644 index d21786646..000000000 --- a/ports/mosquitto/fix-dependence-pthreads.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 6355eaa..490df32 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -6,7 +6,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
- if (${WITH_THREADING} STREQUAL ON)
- add_definitions("-DWITH_THREADING")
- if (WIN32)
-- find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2)
-+ find_library(PTHREAD_LIBRARIES NAMES pthreadVC2)
- find_path(PTHREAD_INCLUDE_DIR pthread.h)
- else (WIN32)
- find_library(LIBPTHREAD pthread)
diff --git a/ports/mosquitto/output_folders-cmake.patch b/ports/mosquitto/output_folders-cmake.patch deleted file mode 100644 index 5b1c60eb6..000000000 --- a/ports/mosquitto/output_folders-cmake.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e1d631e..e95d7fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,10 +16,10 @@ set (VERSION 1.5.0) - add_definitions (-DCMAKE -DVERSION=\"${VERSION}\") - - if (WIN32) -- set (BINDIR .) -- set (SBINDIR .) -+ set (BINDIR bin) -+ set (SBINDIR bin) - set (SYSCONFDIR .) -- set (LIBDIR .) -+ set (LIBDIR lib) - set (INCLUDEDIR include) - set (DATAROOTDIR share) - set (MANDIR man) -@@ -90,7 +90,7 @@ endif (${DOCUMENTATION} STREQUAL ON) - # Install config file - # ======================================== - --install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}") -+#install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}") - - - # ======================================== -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 272b60a..c180067 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -104,7 +104,7 @@ set_target_properties(libmosquitto PROPERTIES - SOVERSION 1 - ) - --install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}") -+install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}") - - if (${WITH_STATIC_LIBRARIES} STREQUAL ON) - add_library(libmosquitto_static STATIC ${C_SRC}) -diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt -index 5e4f08e..a8cc6be 100644 ---- a/lib/cpp/CMakeLists.txt -+++ b/lib/cpp/CMakeLists.txt -@@ -13,7 +13,7 @@ set_target_properties(mosquittopp PROPERTIES - VERSION ${VERSION} - SOVERSION 1 - ) --install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}") -+install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}" ARCHIVE DESTINATION "${LIBDIR}") - - if (${WITH_STATIC_LIBRARIES} STREQUAL ON) - add_library(mosquittopp_static STATIC - diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index 061593969..901e80fd7 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -5,17 +5,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/mosquitto - REF v1.5 - SHA512 f6a5c8e71d642ef931176fe428fb79353933facc2db226d9e55b87d4ff9bd6610a1bd05d71159e30c8afb1fda542d233630ae164770e652baa7ea51117211489 + REF f825d4bb5e9f4fc5dc62ad09f895c87800d0f579 + SHA512 cd94236d5673f7e5a992d1e866afe2ccb496dfb7cc24e53808caed603bc8e899ca12857a16eac58ac7ab7235a849b6e2528c55e0debf651ef76dcebef75e7df9 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/win64-cmake.patch" - "${CMAKE_CURRENT_LIST_DIR}/output_folders-cmake.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-dependence-pthreads.patch" + archive-dest.patch + win64-cmake.patch ) vcpkg_configure_cmake( @@ -35,16 +30,31 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_copy_pdbs() -# Remove debug/include file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -file(REMOVE ${EXE}) -file(REMOVE ${DEBUG_EXE}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_passwd${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_passwd${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_pub${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_pub${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_rr${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_rr${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/mosquitto_sub${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_sub${EXECUTABLE_SUFFIX}) + +#if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + endif() +#endif() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/mosquitto RENAME copyright) - -# Copy pdb -vcpkg_copy_pdbs() diff --git a/ports/mosquitto/win64-cmake.patch b/ports/mosquitto/win64-cmake.patch index a7ac936e0..9105c403f 100644 --- a/ports/mosquitto/win64-cmake.patch +++ b/ports/mosquitto/win64-cmake.patch @@ -1,22 +1,9 @@ -diff --git a/config.h b/config.h -index 906fad4..d5b2a72 100644 ---- a/config.h -+++ b/config.h -@@ -15,7 +15,7 @@ - # define EPROTO ECONNABORTED - #endif - --#ifdef WIN32 -+#ifdef WIN32 || WIN64 - # ifndef strcasecmp - # define strcasecmp strcmpi - # endif -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index d537e77..272b60a 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -6,12 +6,8 @@ option(WITH_THREADING "Include client library threading support?" ON) - if (${WITH_THREADING} STREQUAL ON) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e58d072..e582a25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,12 +54,7 @@ option(WITH_THREADING "Include client library threading support?" ON) + if (WITH_THREADING) add_definitions("-DWITH_THREADING") if (WIN32) - if (CMAKE_CL_64) @@ -25,26 +12,34 @@ index d537e77..272b60a 100644 - set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib) - endif (CMAKE_CL_64) - set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include) -+ find_library(PTHREAD_LIBRARIES NAMES pthreadsVC2) -+ find_path(PTHREAD_INCLUDE_DIR pthread.h) ++ find_package(pthread REQUIRED) else (WIN32) find_library(LIBPTHREAD pthread) if (LIBPTHREAD) +diff --git a/config.h b/config.h +index b7a7616..bceb92a 100644 +--- a/config.h ++++ b/config.h +@@ -27,7 +27,7 @@ + # define EPROTO ECONNABORTED + #endif + +-#ifdef WIN32 ++#if defined(WIN32) || defined(WIN64) + # ifndef strcasecmp + # define strcasecmp strcmpi + # endif diff --git a/lib/net_mosq.h b/lib/net_mosq.h -index b5d8549..be60659 100644 +index b843ebe..8c077eb 100644 --- a/lib/net_mosq.h +++ b/lib/net_mosq.h -@@ -20,7 +20,12 @@ +@@ -20,6 +20,9 @@ Contributors: #include <unistd.h> #else #include <winsock2.h> +#if defined(_MSC_VER) && _MSC_VER > 1900 +#undef ssize_t - typedef int ssize_t; -+#else -+typedef int ssize_t; +#endif + typedef SSIZE_T ssize_t; #endif - #include "mosquitto_internal.h" - diff --git a/ports/mozjpeg/CONTROL b/ports/mozjpeg/CONTROL index 2fa0f2d02..c5180d140 100644 --- a/ports/mozjpeg/CONTROL +++ b/ports/mozjpeg/CONTROL @@ -1,3 +1,4 @@ Source: mozjpeg Version: 3.2-2 +Homepage: https://github.com/mozilla/mozjpeg Description: MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg. diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL index e9f4451be..6b64b7651 100644 --- a/ports/mpfr/CONTROL +++ b/ports/mpfr/CONTROL @@ -1,4 +1,5 @@ Source: mpfr Version: 4.0.1 +Homepage: https://www.mpfr.org Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding Build-Depends: mpir diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL index ca4f01835..ad360039c 100644 --- a/ports/mpg123/CONTROL +++ b/ports/mpg123/CONTROL @@ -1,3 +1,4 @@ Source: mpg123 Version: 1.25.8-5 -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/ +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).
\ No newline at end of file diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL index 5a944e6bd..12f9d38ea 100644 --- a/ports/mpir/CONTROL +++ b/ports/mpir/CONTROL @@ -1,3 +1,4 @@ Source: mpir Version: 3.0.0-7 +Homepage: https://github.com/wbhart/mpir Description: Multiple Precision Integers and Rationals. diff --git a/ports/ms-angle/CONTROL b/ports/ms-angle/CONTROL index 6d68b4e56..4fadc5994 100644 --- a/ports/ms-angle/CONTROL +++ b/ports/ms-angle/CONTROL @@ -1,4 +1,4 @@ Source: ms-angle
-Version: 2018-04-18-1
+Version: 2018-04-18-2
Description: The UWP version of a conformant OpenGL ES implementation for Windows, Mac and Linux.
The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
diff --git a/ports/ms-angle/portfile.cmake b/ports/ms-angle/portfile.cmake index 0a8dc8c9b..0e10fa1cc 100644 --- a/ports/ms-angle/portfile.cmake +++ b/ports/ms-angle/portfile.cmake @@ -25,9 +25,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/ms-angle) - +vcpkg_fixup_cmake_targets() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ms-angle RENAME copyright) diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL index 4d32f7770..75741b4d4 100644 --- a/ports/ms-gsl/CONTROL +++ b/ports/ms-gsl/CONTROL @@ -1,3 +1,4 @@ Source: ms-gsl Version: 2019-04-19 -Description: Microsoft implementation of the Guidelines Support Library +Homepage: https://github.com/Microsoft/GSL +Description: Microsoft implementation of the Guidelines Support Library
\ No newline at end of file diff --git a/ports/msgpack/CONTROL b/ports/msgpack/CONTROL index e75f0743f..0b22d5c69 100644 --- a/ports/msgpack/CONTROL +++ b/ports/msgpack/CONTROL @@ -1,3 +1,4 @@ Source: msgpack Version: 3.1.1 +Homepage: https://github.com/msgpack/msgpack-c Description: MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller. diff --git a/ports/msinttypes/CONTROL b/ports/msinttypes/CONTROL index 8b9840e0b..51939d075 100644 --- a/ports/msinttypes/CONTROL +++ b/ports/msinttypes/CONTROL @@ -1,3 +1,4 @@ Source: msinttypes Version: 2018-02-25 +Homepage: https://github.com/chemeris/msinttypes Description: msinttypes is a package to provide missing ISO C9x compliant headers for Microsoft Visual Studio diff --git a/ports/msix/CMakeLists.txt b/ports/msix/CMakeLists.txt index 4c193bbb3..166d9042b 100644 --- a/ports/msix/CMakeLists.txt +++ b/ports/msix/CMakeLists.txt @@ -1 +1,15 @@ -add_custom_target(LIBS)
\ No newline at end of file +cmake_minimum_required(VERSION 3.14)
+
+add_custom_target(LIBS)
+
+find_package(XercesC CONFIG REQUIRED)
+add_library(xerces-c INTERFACE IMPORTED GLOBAL)
+target_link_libraries(xerces-c INTERFACE XercesC::XercesC)
+
+find_package(ZLIB REQUIRED)
+
+add_library(zlib INTERFACE IMPORTED GLOBAL)
+add_library(zlibstatic INTERFACE IMPORTED GLOBAL)
+
+target_link_libraries(zlib INTERFACE ZLIB::ZLIB)
+target_link_libraries(zlibstatic INTERFACE ZLIB::ZLIB)
diff --git a/ports/msix/CONTROL b/ports/msix/CONTROL index 12bc7af8b..ae41a6ba1 100644 --- a/ports/msix/CONTROL +++ b/ports/msix/CONTROL @@ -1,5 +1,5 @@ Source: msix
-Version: 1.0-1
-Build-Depends: xerces-c, zlib
+Version: MsixCoreInstaller-preview
+Build-Depends: xerces-c, zlib, openssl (!uwp&!windows)
Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks.
The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details.
diff --git a/ports/msix/install-cmake.patch b/ports/msix/install-cmake.patch index e44cc9b3c..d33613ae6 100644 --- a/ports/msix/install-cmake.patch +++ b/ports/msix/install-cmake.patch @@ -1,35 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ee0443..8c0a868 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -266,3 +266,5 @@ message(STATUS "sample processed")
+ add_subdirectory(test)
+ message(STATUS "tests processed")
+ message(STATUS "DONE!")
++
++install(TARGETS msix)
diff --git a/src/msix/CMakeLists.txt b/src/msix/CMakeLists.txt
-index 586c140..41a24ae 100644
+index 817040b..6b16b69 100644
--- a/src/msix/CMakeLists.txt
+++ b/src/msix/CMakeLists.txt
-@@ -129,6 +129,17 @@ set(LIB_SOURCES
- # Define the library
- add_library(${LIBRARY_NAME} SHARED ${LIB_SOURCES} ${LIB_PUBLIC_HEADERS} ${LIB_PRIVATE_HEADERS})
-
-+if(INSTALL_LIBMSIX)
-+ install(TARGETS ${LIBRARY_NAME}
-+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION lib
-+ ARCHIVE DESTINATION lib
-+ )
-+ if(INSTALL_HEADERS)
-+ install(FILES ${LIB_PUBLIC_HEADERS} DESTINATION include)
-+ endif()
-+endif()
-+
- # specify that this library is to be built with C++14
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
+@@ -164,9 +164,9 @@ message(STATUS "PAL: Compression = ${CompressionObject}")
+ include(msix_resources)
-@@ -149,8 +160,10 @@ include_directories(
- ${CMAKE_PROJECT_ROOT}/lib/xerces/src
+ set(LIB_PUBLIC_HEADERS
+- ../inc/AppxPackaging.hpp
+- ../inc/MSIXWindows.hpp
+- ../inc/MsixErrors.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/AppxPackaging.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MSIXWindows.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MsixErrors.hpp
)
--target_link_libraries(${PROJECT_NAME} PRIVATE zlibstatic)
--target_link_libraries(${PROJECT_NAME} PRIVATE xerces-c)
-+find_package(ZLIB REQUIRED)
-+find_package(XercesC REQUIRED)
-+target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
-+target_link_libraries(${PROJECT_NAME} PRIVATE XercesC::XercesC)
-
- IF(AOSP)
- target_link_libraries(${PROJECT_NAME} PRIVATE -latomic)
+ # Bundle specific files
diff --git a/ports/msix/portfile.cmake b/ports/msix/portfile.cmake index 67424b13d..1445e5845 100644 --- a/ports/msix/portfile.cmake +++ b/ports/msix/portfile.cmake @@ -1,37 +1,49 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/msix-packaging - REF v1.0 - SHA512 11abf60da3414ce59f4347df8b2872ad6aa8a3c1e077f6e0be5c66ce90f14340cec5e58c30fb42ed17a10d5296dc0718bb8cddd665bdc20359bf7f0be4b0b4dc + REF MsixCoreInstaller-preview + SHA512 b034559da8e4d5fedc79b3ef65b6f8e9bca69c92f3d85096e7ea84a0e394fa04a92f84079524437ceebd6c006a12dac9cc2e46197154257bbf7449ded031d3e8 HEAD_REF master + PATCHES install-cmake.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/lib) file(MAKE_DIRECTORY ${SOURCE_PATH}/lib) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/lib) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake.patch -) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(PLATFORM WIN32) + set(CRYPTO_LIB crypt32) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(PLATFORM LINUX) + set(CRYPTO_LIB openssl) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(PLATFORM MACOS) + set(CRYPTO_LIB openssl) +else() + message(FATAL_ERROR "Unknown system: ${VCPKG_CMAKE_SYSTEM_NAME}") +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON - -DWIN32=ON -DINSTALL_LIBMSIX=ON - OPTIONS_RELEASE - -DINSTALL_HEADERS=ON + -DUSE_SHARED_ZLIB=ON + -D${PLATFORM}=ON + -DXML_PARSER=xerces + -DCRYPTO_LIB=${CRYPTO_LIB} ) vcpkg_install_cmake() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/msix RENAME copyright) diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL index 7a4b2d62e..d21b80c37 100644 --- a/ports/msmpi/CONTROL +++ b/ports/msmpi/CONTROL @@ -1,3 +1,3 @@ Source: msmpi -Version: 10.0 +Version: 10.0-2 Description: Microsoft MPI diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 70c2ff5d9..c55a49412 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -95,40 +95,28 @@ file(INSTALL ${CURRENT_PACKAGES_DIR}/include ) -# Install release libraries +# NOTE: since the binary distribution does not include any debug libraries we always install the release libraries +SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled) + +file(GLOB STATIC_LIBS + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib + ${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib +) + file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib ) -if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") - file(INSTALL - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/lib - ) -endif() - -# Install debug libraries -# NOTE: since the binary distribution does not include any debug libraries we simply install the release libraries -SET(VCPKG_POLICY_ONLY_RELEASE_CRT enabled) file(INSTALL "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpi.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifec.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifmc.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ) -if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") - file(INSTALL - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib" - "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib - ) + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(INSTALL ${STATIC_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() # Handle copyright diff --git a/ports/mujs/CONTROL b/ports/mujs/CONTROL index a15fdf7bb..1444af126 100644 --- a/ports/mujs/CONTROL +++ b/ports/mujs/CONTROL @@ -1,3 +1,4 @@ Source: mujs
Version: 2018-07-30-1
+Homepage: https://github.com/ccxvii/mujs
Description: An embeddable Javascript interpreter in C
diff --git a/ports/muparser/CONTROL b/ports/muparser/CONTROL index 5a62e603c..734214a49 100644 --- a/ports/muparser/CONTROL +++ b/ports/muparser/CONTROL @@ -1,3 +1,4 @@ Source: muparser Version: 2.2.6.1 +Homepage: https://github.com/beltoforion/muparser Description: Fast math parser library diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL index 7224378f3..0e832f7e8 100644 --- a/ports/nana/CONTROL +++ b/ports/nana/CONTROL @@ -1,4 +1,5 @@ Source: nana
-Version: 1.6.2-1
+Version: 1.7.1
+Homepage: https://github.com/cnjinhao/nana
Description: Cross-platform library for GUI programming in modern C++ style.
Build-Depends: libpng, libjpeg-turbo, freetype (!uwp&&!windows), fontconfig (!uwp&&!windows)
diff --git a/ports/nana/portfile.cmake b/ports/nana/portfile.cmake index 167900550..981bc4244 100644 --- a/ports/nana/portfile.cmake +++ b/ports/nana/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cnjinhao/nana
- REF v1.6.2
- SHA512 95271764813e64126abf2941bfc13b399ffe093c570891f65f331505066ce0dcad7df4170b2616951b7e0234ea2d6d21219cdfd15b112ecf598a3afa992cceb4
+ REF v1.7.1 + SHA512 43bd6f6321557184431935b4fdd636427458e79333879f6310685a70ee25f4344851910e67c52145382c38a3cea9d1761b40c8edbc072a7cc9c62406ed402549
HEAD_REF develop
)
diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL index 075bd4d82..bf1aaa69e 100644 --- a/ports/nanodbc/CONTROL +++ b/ports/nanodbc/CONTROL @@ -1,3 +1,4 @@ Source: nanodbc Version: 2.12.4-3 +Homepage: https://github.com/lexicalunit/nanodbc Description: A small C++ wrapper for the native C ODBC API. diff --git a/ports/nanomsg/CONTROL b/ports/nanomsg/CONTROL index c560edbd1..8693cfef3 100644 --- a/ports/nanomsg/CONTROL +++ b/ports/nanomsg/CONTROL @@ -1,5 +1,5 @@ Source: nanomsg -Version: 1.1.5 +Version: 1.1.5-1 Description: a simple high-performance implementation of several "scalability protocols". These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket. diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake index 71b26ea5e..d07685f60 100644 --- a/ports/nanomsg/portfile.cmake +++ b/ports/nanomsg/portfile.cmake @@ -32,7 +32,7 @@ vcpkg_install_cmake() file(STRINGS ${SOURCE_PATH}/.version NN_PACKAGE_VERSION) -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/nanomsg-${NN_PACKAGE_VERSION}") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nanomsg-${NN_PACKAGE_VERSION}) vcpkg_replace_string( ${CURRENT_PACKAGES_DIR}/share/${PORT}/nanomsg-config.cmake @@ -64,7 +64,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ) - + vcpkg_replace_string( ${CURRENT_PACKAGES_DIR}/include/nanomsg/nn.h "defined(NN_STATIC_LIB)" diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL index 512fdb8b2..684c54ba6 100644 --- a/ports/netcdf-c/CONTROL +++ b/ports/netcdf-c/CONTROL @@ -1,4 +1,5 @@ Source: netcdf-c -Version: 4.6.2-1 +Version: 4.7.0-3 Build-Depends: hdf5, curl +Homepage: https://github.com/Unidata/netcdf-c Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-c/fix-build-error-on-linux.patch b/ports/netcdf-c/fix-build-error-on-linux.patch new file mode 100644 index 000000000..bdcd7c97a --- /dev/null +++ b/ports/netcdf-c/fix-build-error-on-linux.patch @@ -0,0 +1,28 @@ +diff --git a/include/ncconfigure.h b/include/ncconfigure.h +index 2c5b2c8..d397790 100644 +--- a/include/ncconfigure.h ++++ b/include/ncconfigure.h +@@ -25,20 +25,20 @@ missing functions should be + defined and missing types defined. + */ + +-#ifndef HAVE_STRDUP ++#ifndef strdup + extern char* strdup(const char*); + #endif + + /* handle null arguments */ + #ifndef nulldup +-#ifdef HAVE_STRDUP ++#ifdef strdup + #define nulldup(s) ((s)==NULL?NULL:strdup(s)) + #else + char *nulldup(const char* s); + #endif + #endif + +-#ifdef _MSC_VER ++#ifdef _WIN32 + #ifndef HAVE_SSIZE_T + #include <basetsd.h> + typedef SSIZE_T ssize_t; diff --git a/ports/netcdf-c/fix_curl_linkage.patch b/ports/netcdf-c/fix_curl_linkage.patch deleted file mode 100644 index 09fead1f0..000000000 --- a/ports/netcdf-c/fix_curl_linkage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb0bc26b..f1409fc6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -783,6 +783,7 @@ IF(ENABLE_DAP) -
- ADD_DEFINITIONS(-DCURL_STATICLIB=1)
- INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
-+ LINK_LIBRARIES(${CURL_LIBRARIES})
-
- # Check to see if CURLOPT_USERNAME is defined.
- # It is present starting version 7.19.1.
diff --git a/ports/netcdf-c/hdf5.patch b/ports/netcdf-c/hdf5.patch new file mode 100644 index 000000000..71f4921ed --- /dev/null +++ b/ports/netcdf-c/hdf5.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3874c13..36f15beb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -599,11 +599,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + IF(NC_FIND_SHARED_LIBS) + SET(NC_HDF5_LINK_TYPE "shared") + SET(NC_HDF5_LINK_TYPE_UPPER "SHARED") +- ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB) + ELSE(NC_FIND_SHARED_LIBS) + SET(NC_HDF5_LINK_TYPE "static") + SET(NC_HDF5_LINK_TYPE_UPPER "STATIC") +- ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) ++ SET(HDF5_USE_STATIC_LIBRARIES ON) + ENDIF(NC_FIND_SHARED_LIBS) + + #####
+@@ -614,8 +615,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + # had worked.
+ #####
+ IF(MSVC)
+- SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
+- FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE}) ++ FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) + ELSE(MSVC)
+ FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
+ ENDIF(MSVC)
diff --git a/ports/netcdf-c/hdf5_2.patch b/ports/netcdf-c/hdf5_2.patch new file mode 100644 index 000000000..a3a3fb751 --- /dev/null +++ b/ports/netcdf-c/hdf5_2.patch @@ -0,0 +1,13 @@ +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index ea9b0294..3c7f427d 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -83,7 +83,7 @@ IF(USE_HDF5 OR USE_NETCDF4) + # HDF5_HL_LIBRARY. + SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) + ELSE() # Windows CMake defines HDF5_LIBRARIES. +- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) ++ SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) + ENDIF() + ENDIF() + diff --git a/ports/netcdf-c/hdf5_3.patch b/ports/netcdf-c/hdf5_3.patch new file mode 100644 index 000000000..ba9a168c8 --- /dev/null +++ b/ports/netcdf-c/hdf5_3.patch @@ -0,0 +1,12 @@ +diff --git a/libhdf5/CMakeLists.txt b/libhdf5/CMakeLists.txt
+index f3c7bbc..34fc2ab 100644
+--- a/libhdf5/CMakeLists.txt
++++ b/libhdf5/CMakeLists.txt
+@@ -20,3 +20,7 @@ add_library(netcdfhdf5 OBJECT ${libnchdf5_SOURCES})
+
+ # Remember to package this file for CMake builds.
+ ADD_EXTRA_DIST(${libnchdf5_SOURCES} CMakeLists.txt)
++
++if(BUILD_SHARED_LIBS)
++target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-shared hdf5::hdf5-static hdf5::hdf5_hl-shared hdf5::hdf5_hl-static)
++endif()
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 4f9046106..21b214524 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -3,16 +3,29 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Unidata/netcdf-c - REF v4.6.2 - SHA512 7c7084e80cf2fb86cd05101f5be7b74797ee96bf49afadfae6ab32ceed6cd9a049bfa90175e7cc0742806bcd2f61156e33fe7930c7b646661d9c89be6b20dea3 + REF v4.7.0 + SHA512 6602799780105c60ac8c873ed4055c1512dc8bebf98de01e1cce572d113ffb3bf3ca522475b93255c415340f672c55dc6785e0bdbcc39055314683da1d02141a HEAD_REF master PATCHES no-install-deps.patch config-pkg-location.patch transitive-hdf5.patch - fix_curl_linkage.patch + hdf5.patch + hdf5_2.patch + fix-build-error-on-linux.patch + hdf5_3.patch ) +#Remove outdated find modules +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindSZIP.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(NC_USE_STATIC_CRT ON) +else() + set(NC_USE_STATIC_CRT OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE @@ -22,9 +35,11 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF + -DENABLE_FILTER_TESTING=OFF -DUSE_HDF5=ON -DENABLE_DAP_REMOTE_TESTS=OFF -DDISABLE_INSTALL_DEPENDENCIES=ON + -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} -DConfigPackageLocation=share/netcdf ) diff --git a/ports/netcdf-c/transitive-hdf5.patch b/ports/netcdf-c/transitive-hdf5.patch index 220640366..89773e6d4 100644 --- a/ports/netcdf-c/transitive-hdf5.patch +++ b/ports/netcdf-c/transitive-hdf5.patch @@ -6,7 +6,7 @@ index 6f4ccf8..14a3743 100644 set(netCDF_LIBRARIES netcdf) -+find_package(HDF5 REQUIRED) ++find_package(HDF5 COMPONENTS C HL CONFIG REQUIRED) + # include target information include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") diff --git a/ports/netcdf-cxx4/CONTROL b/ports/netcdf-cxx4/CONTROL index b926a2522..8ef872966 100644 --- a/ports/netcdf-cxx4/CONTROL +++ b/ports/netcdf-cxx4/CONTROL @@ -1,4 +1,5 @@ Source: netcdf-cxx4 Version: 4.3.0-4 Build-Depends: netcdf-c +Homepage: https://github.com/Unidata/netcdf-cxx4 Description: a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/networkdirect-sdk/CONTROL b/ports/networkdirect-sdk/CONTROL new file mode 100644 index 000000000..3cc939c8e --- /dev/null +++ b/ports/networkdirect-sdk/CONTROL @@ -0,0 +1,4 @@ +Source: networkdirect-sdk
+Version: 2.0.1
+Description: The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.
+Homepage: https://www.nuget.org/packages/NetworkDirect
\ No newline at end of file diff --git a/ports/networkdirect-sdk/portfile.cmake b/ports/networkdirect-sdk/portfile.cmake new file mode 100644 index 000000000..bb893ed90 --- /dev/null +++ b/ports/networkdirect-sdk/portfile.cmake @@ -0,0 +1,42 @@ +include(vcpkg_common_functions)
+
+#only supports windows
+if (VCPKG_CMAKE_SYSTEM_NAME)
+ message(FATAL_ERROR "networkDirect-sdk only supports windows")
+endif()
+
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+ message(FATAL_ERROR "networkDirect-sdk only supports x64 and x86")
+endif()
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_download_distfile(ARCHIVE
+ URLS "https://www.nuget.org/api/v2/package/NetworkDirect/2.0.1"
+ FILENAME "networkDirect-2.0.1.zip"
+ SHA512 97e48ab293c164a80a3ed9e51f1f9f5ae85c07ee91c49950a76b486567d2e50346a2379b8284ffcb9d7d2fe70f76eff9455dce740cf9d3e0c1b83100e25168a8
+)
+
+vcpkg_download_distfile(LICENSE
+ URLS "https://raw.githubusercontent.com/microsoft/NetworkDirect/master/LICENSE.txt"
+ FILENAME "networkingDirect_license.txt"
+ SHA512 7d79aae4c9beb85811a3e122a2b12aad231f519dd12a461ac49d52864a735a6b05a263d433c11ede1406d2e49b6dc62dd38487eb7bd8c079d7198a20cf85fc4d
+)
+
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ NO_REMOVE_ONE_LEVEL
+)
+
+file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/ )
+
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+ file(COPY ${SOURCE_PATH}/lib/x64/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+ file(COPY ${SOURCE_PATH}/lib/x64/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+ file(COPY ${SOURCE_PATH}/lib/Win32/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+ file(COPY ${SOURCE_PATH}/lib/Win32/ndutil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+endif()
+
+file(COPY ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/networkdirect-sdk/COPYRIGHT)
diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL index d68720137..176a1c30a 100644 --- a/ports/nghttp2/CONTROL +++ b/ports/nghttp2/CONTROL @@ -1,3 +1,4 @@ Source: nghttp2 Version: 1.35.0 +Homepage: https://github.com/nghttp2/nghttp2 Description: Implementation of the Hypertext Transfer Protocol version 2 in C diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL index 5d25a4eaa..275914a94 100644 --- a/ports/nlohmann-json/CONTROL +++ b/ports/nlohmann-json/CONTROL @@ -1,3 +1,4 @@ Source: nlohmann-json Version: 3.6.1 +Homepage: https://github.com/nlohmann/json Description: JSON for Modern C++ diff --git a/ports/nlopt/0001_export_symbols.patch b/ports/nlopt/0001_export_symbols.patch deleted file mode 100644 index 8db70a139..000000000 --- a/ports/nlopt/0001_export_symbols.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a8ab743870873066a66b30d68907ccc4ade250a5 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Mon, 4 Sep 2017 01:25:38 +0300 -Subject: [PATCH] export symbols - ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f630c18..c266b39 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ endif () - - project (nlopt) - -+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -+ - list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - - option (WITH_CXX "enable cxx routines" OFF) --- -2.12.2.windows.2 - diff --git a/ports/nlopt/CONTROL b/ports/nlopt/CONTROL index c80774878..0cc7666bb 100644 --- a/ports/nlopt/CONTROL +++ b/ports/nlopt/CONTROL @@ -1,3 +1,4 @@ Source: nlopt -Version: 2.4.2-1226c127 -Description: a library for nonlinear local and global optimization, for functions with and without gradient information. +Version: 2.6.1-1 +Homepage: https://github.com/stevengj/nlopt +Description: a library for nonlinear local and global optimization, for functions with and without gradient information.
\ No newline at end of file diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake index f9d204b33..5fb068145 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -1,28 +1,31 @@ include(vcpkg_common_functions) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevengj/nlopt - REF 1226c1276dacf3687464c65eb165932281493a35 - SHA512 889f60cd6970b17296871396366bd0d868011d71ca4b88cb6da906283f928e5b443ab18c5af48a0701c8bf68b6d66288a3e4f248e0ab8183251aa7c3b0cfd652 + REF v2.6.1 + SHA512 e9b8ee75536a568e75150dc0a169d951b670d54ca9d2797f9db6f2751811d9d21be367fa6794a0bc76370715caf5356b368c9c12ad416f3cfb74ae8fa8eabd5c HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_export_symbols.patch) - - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DNLOPT_FORTRAN=OFF + -DNLOPT_PYTHON=OFF + -DNLOPT_OCTAVE=OFF + -DNLOPT_MATLAB=OFF + -DNLOPT_GUILE=OFF + -DNLOPT_SWIG=OFF ) vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/nlopt") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nlopt) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL index 7b65617c3..262c40682 100644 --- a/ports/nmslib/CONTROL +++ b/ports/nmslib/CONTROL @@ -1,5 +1,6 @@ Source: nmslib
-Version: 1.7.2-1
+Version: 1.7.3.6
+Homepage: https://github.com/searchivarius/nmslib
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.
#
# ## Extras are currently unsupported for Windows, waiting for fixes.
diff --git a/ports/nmslib/fix-headers.patch b/ports/nmslib/fix-headers.patch index 92a8d6c36..ee6db36df 100644 --- a/ports/nmslib/fix-headers.patch +++ b/ports/nmslib/fix-headers.patch @@ -1,5 +1,5 @@ diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc -index 30a7c8a..5ca07c5 100644 +index f5c7fca..4780746 100644 --- a/similarity_search/src/method/hnsw.cc +++ b/similarity_search/src/method/hnsw.cc @@ -27,7 +27,7 @@ @@ -38,7 +38,7 @@ index b6473bd..6dcb00f 100644 #include "portable_simd.h" #include "space.h" diff --git a/similarity_search/src/method/small_world_rand.cc b/similarity_search/src/method/small_world_rand.cc -index 59e13f7..0f3e0b9 100644 +index e8280cb..6bdb0f7 100644 --- a/similarity_search/src/method/small_world_rand.cc +++ b/similarity_search/src/method/small_world_rand.cc @@ -16,7 +16,7 @@ @@ -48,10 +48,10 @@ index 59e13f7..0f3e0b9 100644 -#include <mmintrin.h> +#include <xmmintrin.h> - #include "portable_simd.h" - #include "space.h" + #if defined(_WIN32) || defined(WIN32) + #include <intrin.h> diff --git a/similarity_search/src/method/vptree.cc b/similarity_search/src/method/vptree.cc -index d0262ad..0e5befc 100644 +index 04f481e..c71eed5 100644 --- a/similarity_search/src/method/vptree.cc +++ b/similarity_search/src/method/vptree.cc @@ -20,7 +20,7 @@ @@ -60,9 +60,9 @@ index d0262ad..0e5befc 100644 // This is only for _mm_prefetch -#include <mmintrin.h> +#include <xmmintrin.h> - - #include "portable_simd.h" - #include "space.h" + #if defined(_WIN32) || defined(WIN32) + #include <intrin.h> + #endif diff --git a/similarity_search/test/test_overlap.cc b/similarity_search/test/test_overlap.cc index 326b26b..413d66d 100644 --- a/similarity_search/test/test_overlap.cc diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake index 49a194ba1..ffea74d75 100644 --- a/ports/nmslib/portfile.cmake +++ b/ports/nmslib/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO searchivarius/nmslib - REF v1.7.2 - SHA512 2f910f752bfb1146aa8d1765fd5faf64d718a92ab7edf9d8ac0a2d9c4359d42b07b3cd553e2aff93da8b009add52ab9cce6b841f5175f57163f73f643ff62c19 + REPO nmslib/nmslib + REF 1eda05dccd5ed34df50a243dfc64c5e9187388f8 + SHA512 e4518c8dd84867bd0ac5dbc5d3b57d8053d1f73588fc0cf1d7c91cc4819f22dc7888d6be587691ebc1fd12b67de16de63b5e0a24847b6f7b49b57d1e6b457ebd HEAD_REF master ) diff --git a/ports/nrf-ble-driver/001-arm64-support.patch b/ports/nrf-ble-driver/001-arm64-support.patch new file mode 100644 index 000000000..03cec37b6 --- /dev/null +++ b/ports/nrf-ble-driver/001-arm64-support.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99daa24..9a18ee5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -259,6 +259,9 @@ endforeach(SD_API_VER)
+ # Additional special linkage libraries
+ foreach(SD_API_VER ${SD_API_VERS})
+ if(WIN32)
++ # arm64-windows support
++ target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_STATIC_LIB} PRIVATE "advapi32")
++ target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_SHARED_LIB} PRIVATE "advapi32")
+ elseif(APPLE)
+ target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_STATIC_LIB} PRIVATE "-framework CoreFoundation" "-framework IOKit")
+ target_link_libraries(${NRF_BLE_DRIVER_${SD_API_VER}_SHARED_LIB} PRIVATE "-framework CoreFoundation" "-framework IOKit")
diff --git a/ports/nrf-ble-driver/CONTROL b/ports/nrf-ble-driver/CONTROL new file mode 100644 index 000000000..333907e8b --- /dev/null +++ b/ports/nrf-ble-driver/CONTROL @@ -0,0 +1,4 @@ +Source: nrf-ble-driver
+Version: 4.1.1
+Description: BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.
+Build-Depends: asio, catch2
\ No newline at end of file diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake new file mode 100644 index 000000000..c451ba4d1 --- /dev/null +++ b/ports/nrf-ble-driver/portfile.cmake @@ -0,0 +1,47 @@ +include(vcpkg_common_functions) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + message( +"${PORT} currently requires the following libraries from the system package manager: + libudev-dev +These can be installed on Ubuntu systems via sudo apt install libudev-dev" + ) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NordicSemiconductor/pc-ble-driver + REF v4.1.1 + SHA512 bb1853993b3f37836a8f7402e5c0452e8423c3a1c6e651cf353025022a32e16c72f06e2266e283c72fa7ddb0da7cf8cecb875a7a7762565599f2908c4858ce8e + HEAD_REF master + PATCHES + 001-arm64-support.patch +) + +# Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH. +# Git should always be available as it is downloaded during the bootstrap phase. +# Append instead of prepend to $PATH to honor the user's git executable as a general rule. +find_program(GIT NAMES git git.cmd) +get_filename_component(GIT_EXE_DIRPATH "${GIT}" DIRECTORY) +set(ENV{PATH} "$ENV{PATH};${GIT_EXE_DIRPATH}") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DDISABLE_EXAMPLES= -DDISABLE_TESTS= -DNRF_BLE_DRIVER_VERSION=4.1.0 -DCONNECTIVITY_VERSION=4.1.0 +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) +file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL index cefb1656c..1a923c857 100644 --- a/ports/nuklear/CONTROL +++ b/ports/nuklear/CONTROL @@ -1,3 +1,4 @@ Source: nuklear Version: 2019-03-29 +Homepage: https://github.com/vurtun/nuklear Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain diff --git a/ports/numactl/CONTROL b/ports/numactl/CONTROL new file mode 100644 index 000000000..4c5c03687 --- /dev/null +++ b/ports/numactl/CONTROL @@ -0,0 +1,3 @@ +Source: numactl +Version: 2.0.12 +Description: NUMA support for Linux diff --git a/ports/numactl/portfile.cmake b/ports/numactl/portfile.cmake new file mode 100644 index 000000000..3319d282f --- /dev/null +++ b/ports/numactl/portfile.cmake @@ -0,0 +1,73 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO numactl/numactl + REF v2.0.12 + SHA512 3814efd924d1c9152a30f6ae5b665afc20648226cd475d72b933c0ec4f30249af4e25110de17f144734b787ed765644dca09a657219806ab5c9c550abd45bf8e + 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 +These can be installed on Ubuntu systems via sudo apt install autoconf libtool" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(SHARED_STATIC --enable-static --disable-shared) +else() + set(SHARED_STATIC --disable-static --enable-shared) +endif() + +set(OPTIONS ${SHARED_STATIC}) +vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/autogen.sh + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME setup-${TARGET_TRIPLET} +) + +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) +file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) +message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") +set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -fPIC -O0 -g -I${SOURCE_PATH}/include") +set(LDFLAGS "${VCPKG_LINKER_FLAGS}") +vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + LOGNAME configure-${TARGET_TRIPLET}-dbg +) +message(STATUS "Building ${TARGET_TRIPLET}-dbg") +vcpkg_execute_required_process( + COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg + LOGNAME install-${TARGET_TRIPLET}-dbg +) + +file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) +file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) +message(STATUS "Configuring ${TARGET_TRIPLET}-rel") +set(CFLAGS "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -fPIC -O3 -I${SOURCE_PATH}/include") +set(LDFLAGS "${VCPKG_LINKER_FLAGS}") +vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME configure-${TARGET_TRIPLET}-rel +) +message(STATUS "Building ${TARGET_TRIPLET}-rel") +vcpkg_execute_required_process( + COMMAND make -j install "CFLAGS=${CFLAGS}" "LDFLAGS=${LDFLAGS}" + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel + LOGNAME install-${TARGET_TRIPLET}-rel +) + +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) +configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/numactl/copyright COPYONLY) diff --git a/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch b/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch index 915f247c8..366cff84f 100644 --- a/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch +++ b/ports/nvtt/001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch @@ -1,16 +1,16 @@ -diff --git a/src/nvconfig.h.in b/src/nvconfig.h.in
-index 16da646..ada6be0 100644
---- a/src/nvconfig.h.in
-+++ b/src/nvconfig.h.in
-@@ -1,7 +1,11 @@
- #ifndef NV_CONFIG
- #define NV_CONFIG
-
-+#if NV_OS_DARWIN & !NV_OS_IOS
-+#cmakedefine01 HAVE_UNISTD_H
-+#else
- #cmakedefine HAVE_UNISTD_H
-+#endif
- #cmakedefine HAVE_STDARG_H
- #cmakedefine HAVE_SIGNAL_H
- #cmakedefine HAVE_EXECINFO_H
+diff --git a/src/nvconfig.h.in b/src/nvconfig.h.in +index 16da646..ada6be0 100644 +--- a/src/nvconfig.h.in ++++ b/src/nvconfig.h.in +@@ -1,7 +1,11 @@ + #ifndef NV_CONFIG + #define NV_CONFIG + ++#if NV_OS_DARWIN & !NV_OS_IOS ++#cmakedefine01 HAVE_UNISTD_H ++#else + #cmakedefine HAVE_UNISTD_H ++#endif + #cmakedefine HAVE_STDARG_H + #cmakedefine HAVE_SIGNAL_H + #cmakedefine HAVE_EXECINFO_H diff --git a/ports/nvtt/CONTROL b/ports/nvtt/CONTROL index 15c72fa71..189ff6caf 100644 --- a/ports/nvtt/CONTROL +++ b/ports/nvtt/CONTROL @@ -1,3 +1,3 @@ Source: nvtt
-Version: 2.1.0-2
+Version: 2.1.1
Description: Texture processing tools with support for Direct3D 10 and 11 formats.
diff --git a/ports/nvtt/bc6h.patch b/ports/nvtt/bc6h.patch new file mode 100644 index 000000000..3e68ff516 --- /dev/null +++ b/ports/nvtt/bc6h.patch @@ -0,0 +1,14 @@ +diff --git a/src/bc6h/CMakeLists.txt b/src/bc6h/CMakeLists.txt +index 635e0f3a..f758df43 100644 +--- a/src/bc6h/CMakeLists.txt ++++ b/src/bc6h/CMakeLists.txt +@@ -20,3 +20,8 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(bc6h PROPERTIES COMPILE_FLAGS -fPIC) + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + ENDIF(NOT WIN32) ++ ++INSTALL(TARGETS bc6h ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib/static) +\ No newline at end of file diff --git a/ports/nvtt/bc7.patch b/ports/nvtt/bc7.patch new file mode 100644 index 000000000..c94fcef23 --- /dev/null +++ b/ports/nvtt/bc7.patch @@ -0,0 +1,14 @@ +diff --git a/src/bc7/CMakeLists.txt b/src/bc7/CMakeLists.txt +index 2eb01c06..0c36895b 100644 +--- a/src/bc7/CMakeLists.txt ++++ b/src/bc7/CMakeLists.txt +@@ -28,3 +28,8 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(bc7 PROPERTIES COMPILE_FLAGS -fPIC) + ENDIF(CMAKE_COMPILER_IS_GNUCXX) + ENDIF(NOT WIN32) ++ ++INSTALL(TARGETS bc7 ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib/static) +\ No newline at end of file diff --git a/ports/nvtt/fix-build-error.patch b/ports/nvtt/fix-build-error.patch new file mode 100644 index 000000000..7ba1c1976 --- /dev/null +++ b/ports/nvtt/fix-build-error.patch @@ -0,0 +1,39 @@ +diff --git a/extern/butteraugli/butteraugli.h b/extern/butteraugli/butteraugli.h +index 31824b8..c116a73 100644 +--- a/extern/butteraugli/butteraugli.h ++++ b/extern/butteraugli/butteraugli.h +@@ -134,7 +134,14 @@ bool ButteraugliAdaptiveQuantization(size_t xsize, size_t ysize, + // The conventional syntax uint8_t* const RESTRICT is more confusing - it is + // not immediately obvious that the pointee is non-const. + template <typename T> ++#ifdef _MSC_VER ++// Due to MSVC bug: ++// https://developercommunity.visualstudio.com/content/problem/32196/msvc-cant-compile-a-templated-using-without-instan.html ++// , we cannot use __restrict now. Loss some performance instead of can't use this code. ++using ConstRestrict = T const; ++#else + using ConstRestrict = T const BUTTERAUGLI_RESTRICT; ++#endif + + // Functions that depend on the cache line size. + class CacheAligned { +diff --git a/src/nvthread/Atomic.h b/src/nvthread/Atomic.h +index 212b9cb..b8eaedb 100644 +--- a/src/nvthread/Atomic.h ++++ b/src/nvthread/Atomic.h +@@ -183,7 +183,6 @@ namespace nv { + + + #elif NV_CC_CLANG && (NV_OS_IOS || NV_OS_DARWIN) +- NV_COMPILER_CHECK(sizeof(uint32) == sizeof(long)); + + //ACS: Use Apple's atomics instead? I don't know if these are better in any way; there are non-barrier versions too. There's no OSAtomicSwap32 tho' + /* +@@ -254,7 +253,6 @@ namespace nv { + + + #elif NV_CC_CLANG && POSH_CPU_STRONGARM +- NV_COMPILER_CHECK(sizeof(uint32) == sizeof(long)); + + inline uint32 atomicIncrement(uint32 * value) + { diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake index 299732a37..bacdebbbc 100644 --- a/ports/nvtt/portfile.cmake +++ b/ports/nvtt/portfile.cmake @@ -5,11 +5,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO castano/nvidia-texture-tools
- REF 2.1.0
- SHA512 6c5c9588af57023fc384de080cbe5c5ccd8707d04a9533384c606efd09730d780cb21bcf2d3576102a3facd2f281cacb2625958d74575e71550fd98da92e38b6
+ REF 2.1.1
+ SHA512 3e6fef5977ca29daa7dc97afe11d61de57a8556c9caf30902db8c5c167d9c38f736bcb62eebdaaf7558299b39975bc269d41ab980c813b67dd1fc85064c853c9
HEAD_REF master
PATCHES
- "001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch"
+ 001-define-value-for-HAVE_UNISTD_H-in-mac-os.patch
+ bc6h.patch
+ bc7.patch
+ squish.patch
+ fix-build-error.patch
)
vcpkg_configure_cmake(
@@ -17,6 +21,7 @@ vcpkg_configure_cmake( PREFER_NINJA
OPTIONS
-DNVTT_SHARED=0
+ -DCMAKE_DEBUG_POSTFIX=_d # required by OSG
)
vcpkg_install_cmake()
@@ -33,4 +38,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright
file(REMOVE ${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE)
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nvtt)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/nvtt/LICENSE ${CURRENT_PACKAGES_DIR}/share/nvtt/copyright)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/nvtt/LICENSE ${CURRENT_PACKAGES_DIR}/share/nvtt/copyright)
\ No newline at end of file diff --git a/ports/nvtt/squish.patch b/ports/nvtt/squish.patch new file mode 100644 index 000000000..36ce7be76 --- /dev/null +++ b/ports/nvtt/squish.patch @@ -0,0 +1,13 @@ +diff --git a/src/nvtt/squish/CMakeLists.txt b/src/nvtt/squish/CMakeLists.txt +index 832013e1..76824137 100644 +--- a/src/nvtt/squish/CMakeLists.txt ++++ b/src/nvtt/squish/CMakeLists.txt +@@ -33,3 +33,7 @@ IF(NOT WIN32) + ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) + ENDIF(NOT WIN32) + ++INSTALL(TARGETS squish ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib/static) +\ No newline at end of file diff --git a/ports/observer-ptr-lite/CONTROL b/ports/observer-ptr-lite/CONTROL new file mode 100644 index 000000000..547e64289 --- /dev/null +++ b/ports/observer-ptr-lite/CONTROL @@ -0,0 +1,3 @@ +Source: observer-ptr-lite
+Version: 0.4.0
+Description: A C++17-like observer_ptr for C++98 and later in a single-file header-only library
diff --git a/ports/observer-ptr-lite/portfile.cmake b/ports/observer-ptr-lite/portfile.cmake new file mode 100644 index 000000000..4fea768f5 --- /dev/null +++ b/ports/observer-ptr-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/observer-ptr-lite
+ REF v0.4.0
+ SHA512 4e53d8e0ce595604880bda423440071e7c207dd63e7b6bfa09cc7a870a010f09c51c31e640142c565ce261c4911acab13c6e9f5970853ad8fc2da3e4034ab7d7
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DNSOP_OPT_BUILD_TESTS=OFF
+ -DNSOP_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/octomap/CONTROL b/ports/octomap/CONTROL index 3669f3850..afac685c6 100644 --- a/ports/octomap/CONTROL +++ b/ports/octomap/CONTROL @@ -1,3 +1,3 @@ Source: octomap -Version: cefed0c1d79afafa5aeb05273cf1246b093b771c-6 +Version: 2017-03-11-7 Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index 113f6fc04..203adce4d 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/octomap) -if(WIN32) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(RENAME ${CURRENT_PACKAGES_DIR}/bin/binvox2bt.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/binvox2bt.exe) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/bt2vrml.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/bt2vrml.exe) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/compare_octrees.exe ${CURRENT_PACKAGES_DIR}/tools/octomap/compare_octrees.exe) @@ -49,8 +49,7 @@ else() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/octomap) - +vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/ode/CONTROL b/ports/ode/CONTROL index 6f88319e6..605db9d18 100644 --- a/ports/ode/CONTROL +++ b/ports/ode/CONTROL @@ -1,3 +1,4 @@ Source: ode
Version: 0.15.1-1
+Homepage: https://bitbucket.org/odedevs/ode/src/default/
Description: Open Dynamics Engine
diff --git a/ports/ogre/001-cmake-install-dir.patch b/ports/ogre/001-cmake-install-dir.patch deleted file mode 100644 index 548f946f7..000000000 --- a/ports/ogre/001-cmake-install-dir.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/CMake/CMakeLists.txt -+++ b/CMake/CMakeLists.txt -@@ -13,10 +13,12 @@ - # directory, but can also be used for custom projects. - ############################################################# - --if(WIN32 OR APPLE) -- set(OGRE_CMAKE_DIR "CMake") --else() -- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+if(NOT DEFINED OGRE_CMAKE_DIR) -+ if(WIN32 OR APPLE) -+ set(OGRE_CMAKE_DIR "CMake") -+ else() -+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+ endif() - endif() - - set(INST_FILES Utils/FindPkgMacros.cmake) ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -242,10 +242,12 @@ - # Create the CMake package files - include(CMakePackageConfigHelpers) - --if(WIN32 OR APPLE) -- set(OGRE_CMAKE_DIR "CMake") --else() -- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+if(NOT DEFINED OGRE_CMAKE_DIR) -+ if(WIN32 OR APPLE) -+ set(OGRE_CMAKE_DIR "CMake") -+ else() -+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+ endif() - endif() - configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${OGRE_BINARY_DIR}/cmake/OGREConfig.cmake - INSTALL_DESTINATION ${OGRE_CMAKE_DIR} diff --git a/ports/ogre/002-link-optimized-lib-workaround.patch b/ports/ogre/002-link-optimized-lib-workaround.patch deleted file mode 100644 index b2678f488..000000000 --- a/ports/ogre/002-link-optimized-lib-workaround.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/CMake/Dependencies.cmake -+++ b/CMake/Dependencies.cmake -@@ -199,6 +199,11 @@ - # Find zlib - find_package(ZLIB) - macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" FALSE "" "") -+# replace optimized/debug keyword with generator expression -+unset(ZLIB_LIBRARY) -+set(ZLIB_LIBRARY $<$<CONFIG:Release>:${ZLIB_LIBRARY_RELEASE}> $<$<CONFIG:Debug>:${ZLIB_LIBRARY_DEBUG}>) -+unset(ZLIB_LIBRARIES) -+set(ZLIB_LIBRARIES ${ZLIB_LIBRARY}) - - if (ZLIB_FOUND) - # Find zziplib -@@ -213,6 +218,11 @@ - # Find FreeType - find_package(Freetype) - macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") -+# replace optimized/debug keyword with generator expression -+unset(FREETYPE_LIBRARY) -+set(FREETYPE_LIBRARY $<$<CONFIG:Release>:${FREETYPE_LIBRARY_RELEASE}> $<$<CONFIG:Debug>:${FREETYPE_LIBRARY_DEBUG}>) -+unset(FREETYPE_LIBRARIES) -+set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) - - # Find X11 - if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN) ---- src.orig/CMake/Utils/FindPkgMacros.cmake -+++ src.new/CMake/Utils/FindPkgMacros.cmake -@@ -82,7 +82,7 @@ - if (${PREFIX}_FWK) - set(${PREFIX} ${${PREFIX}_FWK}) - elseif (${PREFIX}_REL AND ${PREFIX}_DBG) -- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) -+ set(${PREFIX} $<$<CONFIG:Release>:${${PREFIX}_REL}> $<$<CONFIG:Debug>:${${PREFIX}_DBG}>) - elseif (${PREFIX}_REL) - set(${PREFIX} ${${PREFIX}_REL}) - elseif (${PREFIX}_DBG) diff --git a/ports/ogre/CONTROL b/ports/ogre/CONTROL index d7543d10b..d7a4dd3f5 100644 --- a/ports/ogre/CONTROL +++ b/ports/ogre/CONTROL @@ -1,6 +1,7 @@ Source: ogre -Version: 1.11.3-4 +Version: 1.12.0-1 Build-Depends: freeimage, freetype, zlib, zziplib +Homepage: https://github.com/OGRECave/ogre Description: 3D Object-Oriented Graphics Rendering Engine Feature: d3d9 diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 74cb8a1c0..04b4fe608 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -3,14 +3,15 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre - REF v1.11.3 - SHA512 af52821022ab6148e64fdf183b1aa4607b101c7d0edc20d2ccc909f50eed218d7a283fa3b58260fd41cd3f324ecafad8c5137c66e05786580b043240551b2c42 + REF c14f8847f743f4dc1b3abc947b1725c87d8b10ce + SHA512 a2fd7ffd653c1578bc860b58cf4c899f27cc967f75e2254dc3e372044f118d5951e42b35bfc711aa8996e1885f372d3cfa5a768b8674e0b3d844811990eb87fc HEAD_REF master PATCHES - 001-cmake-install-dir.patch - 002-link-optimized-lib-workaround.patch + toolchain_fixes.patch ) +file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(OGRE_STATIC ON) else() @@ -70,27 +71,29 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() -# Remove unwanted files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/ogre) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(GLOB REL_CFGS ${CURRENT_PACKAGES_DIR}/bin/*.cfg) -file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +if(REL_CFGS) + file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE ${REL_CFGS}) +endif() file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg) -file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - -file(REMOVE ${REL_CFGS} ${DBG_CFGS}) +if(DBG_CFGS) + file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE ${DBG_CFGS}) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() if(NOT VCPKG_CMAKE_SYSTEM_NAME) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + 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) @@ -98,7 +101,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") 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) diff --git a/ports/ogre/toolchain_fixes.patch b/ports/ogre/toolchain_fixes.patch new file mode 100644 index 000000000..1af384bdf --- /dev/null +++ b/ports/ogre/toolchain_fixes.patch @@ -0,0 +1,533 @@ +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +index a7a3796..2e21403 100755 +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt +@@ -13,10 +13,12 @@ + # directory, but can also be used for custom projects. + ############################################################# + +-if(WIN32 OR APPLE) +- set(OGRE_CMAKE_DIR "CMake") +-else() +- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++if(NOT DEFINED OGRE_CMAKE_DIR) ++ if(WIN32 OR APPLE) ++ set(OGRE_CMAKE_DIR "CMake") ++ else() ++ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++ endif() + endif() + + set(INST_FILES Utils/FindPkgMacros.cmake) +diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake +index 783755e..79f7514 100644 +--- a/CMake/InstallResources.cmake ++++ b/CMake/InstallResources.cmake +@@ -208,10 +208,12 @@ endif () + # Create the CMake package files + include(CMakePackageConfigHelpers) + +-if(WIN32 OR APPLE) +- set(OGRE_CMAKE_DIR "CMake") +-else() +- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++if(NOT DEFINED OGRE_CMAKE_DIR) ++ if(WIN32 OR APPLE) ++ set(OGRE_CMAKE_DIR "CMake") ++ else() ++ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") ++ endif() + endif() + configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake + INSTALL_DESTINATION ${OGRE_CMAKE_DIR} +diff --git a/CMake/Packages/FindCg.cmake b/CMake/Packages/FindCg.cmake +index 4501cf9..e91bfd0 100644 +--- a/CMake/Packages/FindCg.cmake ++++ b/CMake/Packages/FindCg.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # Cg_FOUND - system has Cg +-# Cg_INCLUDE_DIRS - the Cg include directories ++# Cg_INCLUDE_DIRS - the Cg include directories + # Cg_LIBRARIES - link these to use Cg + + include(FindPkgMacros) +@@ -56,7 +56,7 @@ endif() + + find_library(Cg_LIBRARY_REL NAMES ${Cg_LIBRARY_NAMES} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(Cg_LIBRARY_DBG NAMES ${Cg_LIBRARY_NAMES_DBG} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(Cg_LIBRARY) ++make_library_set(Cg) + + if (WIN32) + if (CMAKE_CL_64) +diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake +index 7c89ec5..445d86a 100644 +--- a/CMake/Packages/FindFreeImage.cmake ++++ b/CMake/Packages/FindFreeImage.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # FreeImage_FOUND - system has FreeImage +-# FreeImage_INCLUDE_DIRS - the FreeImage include directories ++# FreeImage_INCLUDE_DIRS - the FreeImage include directories + # FreeImage_LIBRARIES - link these to use FreeImage + + include(FindPkgMacros) +@@ -43,7 +43,6 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P + find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) + +-make_library_set(FreeImage_LIBRARY) ++make_library_set(FreeImage) + + findpkg_finish(FreeImage) +- +diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake +index dd4b179..8e51d2f 100644 +--- a/CMake/Packages/FindGLSLOptimizer.cmake ++++ b/CMake/Packages/FindGLSLOptimizer.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # GLSL_Optimizer_FOUND - system has GLSL_Optimizer +-# GLSL_Optimizer_INCLUDE_DIRS - the GLSL_Optimizer include directories ++# GLSL_Optimizer_INCLUDE_DIRS - the GLSL_Optimizer include directories + # GLSL_Optimizer_LIBRARIES - link these to use GLSL_Optimizer + + include(FindPkgMacros) +@@ -38,8 +38,7 @@ findpkg_framework(GLSL_Optimizer) + find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer) + find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(GLSL_Optimizer_LIBRARY) ++make_library_set(GLSL_Optimizer) + + findpkg_finish(GLSL_Optimizer) + add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR) +- +diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake +index 7125895..f73c928 100644 +--- a/CMake/Packages/FindHLSL2GLSL.cmake ++++ b/CMake/Packages/FindHLSL2GLSL.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # HLSL2GLSL_FOUND - system has HLSL2GLSL +-# HLSL2GLSL_INCLUDE_DIRS - the HLSL2GLSL include directories ++# HLSL2GLSL_INCLUDE_DIRS - the HLSL2GLSL include directories + # HLSL2GLSL_LIBRARIES - link these to use HLSL2GLSL + + include(FindPkgMacros) +@@ -38,8 +38,7 @@ findpkg_framework(HLSL2GLSL) + find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL) + find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) +-make_library_set(HLSL2GLSL_LIBRARY) ++make_library_set(HLSL2GLSL) + + findpkg_finish(HLSL2GLSL) + add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR) +- +diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake +index 95c70cd..17dabb8 100644 +--- a/CMake/Packages/FindNVAPI.cmake ++++ b/CMake/Packages/FindNVAPI.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # NVAPI_FOUND - system has NVAPI +-# NVAPI_INCLUDE_DIRS - the NVAPI include directories ++# NVAPI_INCLUDE_DIRS - the NVAPI include directories + # NVAPI_LIBRARIES - link these to use NVAPI + + include(FindPkgMacros) +@@ -44,7 +44,7 @@ findpkg_framework(NVAPI) + find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI) + find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel) + find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug) +-make_library_set(NVAPI_LIBRARY) ++make_library_set(NVAPI) + + findpkg_finish(NVAPI) +-add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR) +\ No newline at end of file ++add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR) +diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake +index 6b6d7fa..c2cb80e 100644 +--- a/CMake/Packages/FindPOCO.cmake ++++ b/CMake/Packages/FindPOCO.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # POCO_FOUND - system has POCO +-# POCO_INCLUDE_DIRS - the POCO include directories ++# POCO_INCLUDE_DIRS - the POCO include directories + # POCO_LIBRARIES - link these to use POCO + + include(FindPkgMacros) +@@ -23,8 +23,8 @@ getenv_path(POCO_ROOT) + getenv_path(POCO_BASE) + + # construct search paths +-set(POCO_PREFIX_PATH +- ${POCO_HOME} ${ENV_POCO_HOME} ++set(POCO_PREFIX_PATH ++ ${POCO_HOME} ${ENV_POCO_HOME} + ${POCO_ROOT} ${ENV_POCO_ROOT} + ${POCO_BASE} ${ENV_POCO_BASE} + ) +@@ -50,7 +50,7 @@ findpkg_framework(POCO) + find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include) + find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_LIBRARY) ++make_library_set(POCO) + + findpkg_finish(POCO) + +@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES) + find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include) + find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_Util_LIBRARY) ++make_library_set(POCO_Util) + findpkg_finish(POCO_Util) + + # Look for Poco's Net package +@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES) + find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include) + find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_Net_LIBRARY) ++make_library_set(POCO_Net) + findpkg_finish(POCO_Net) + + # Look for Poco's NetSSL package +@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES) + find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include) + find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_NetSSL_LIBRARY) ++make_library_set(POCO_NetSSL) + findpkg_finish(POCO_NetSSL) + + # Look for Poco's XML package +@@ -96,6 +96,5 @@ get_debug_names(POCO_XML_LIBRARY_NAMES) + find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include) + find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) + find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) +-make_library_set(POCO_XML_LIBRARY) ++make_library_set(POCO_XML) + findpkg_finish(POCO_XML) +- +diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake +index 0c48510..7f0c8f6 100644 +--- a/CMake/Packages/FindTBB.cmake ++++ b/CMake/Packages/FindTBB.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # TBB_FOUND - system has TBB +-# TBB_INCLUDE_DIRS - the TBB include directories ++# TBB_INCLUDE_DIRS - the TBB include directories + # TBB_LIBRARIES - link these to use TBB + + include(FindPkgMacros) +@@ -23,8 +23,8 @@ getenv_path(TBB_ROOT) + getenv_path(TBB_BASE) + + # construct search paths +-set(TBB_PREFIX_PATH +- ${TBB_HOME} ${ENV_TBB_HOME} ++set(TBB_PREFIX_PATH ++ ${TBB_HOME} ${ENV_TBB_HOME} + ${TBB_ROOT} ${ENV_TBB_ROOT} + ${TBB_BASE} ${ENV_TBB_BASE} + ) +@@ -68,11 +68,11 @@ if (WIN32 AND MSVC) + endif () + if (MSVC_VERSION EQUAL 1900) + set(COMPILER_PREFIX "vc13") +- endif () ++ endif () + if (MSVC_VERSION EQUAL 1911) + set(COMPILER_PREFIX "vc14") + endif () +- ++ + # for each prefix path, add ia32/64\${COMPILER_PREFIX}\lib to the lib search path + foreach (dir ${TBB_PREFIX_PATH}) + if (CMAKE_CL_64) +@@ -104,7 +104,7 @@ findpkg_framework(TBB) + find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) + find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) + find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) +-make_library_set(TBB_LIBRARY) ++make_library_set(TBB) + + findpkg_finish(TBB) + +@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES) + find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} ) + find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) + find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) +-make_library_set(TBB_MALLOC_LIBRARY) ++make_library_set(TBB_MALLOC) + findpkg_finish(TBB_MALLOC) + + # Look for TBB's malloc proxy package +@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES) + find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) + find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) + find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) +-make_library_set(TBB_MALLOC_PROXY_LIBRARY) ++make_library_set(TBB_MALLOC_PROXY) + findpkg_finish(TBB_MALLOC_PROXY) +diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake +index e97951e..1c7cf00 100644 +--- a/CMake/Packages/FindZZip.cmake ++++ b/CMake/Packages/FindZZip.cmake +@@ -11,7 +11,7 @@ + # Once done, this will define + # + # ZZip_FOUND - system has ZZip +-# ZZip_INCLUDE_DIRS - the ZZip include directories ++# ZZip_INCLUDE_DIRS - the ZZip include directories + # ZZip_LIBRARIES - link these to use ZZip + + include(FindPkgMacros) +@@ -39,12 +39,11 @@ use_pkgconfig(ZZip_PKGC zziplib) + + findpkg_framework(ZZip) + +-find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) ++find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) + + find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) + find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) + +-make_library_set(ZZip_LIBRARY) ++make_library_set(ZZip) + + findpkg_finish(ZZip) +- +diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake +index 374f84b..dc7066d 100644 +--- a/CMake/Utils/FindPkgMacros.cmake ++++ b/CMake/Utils/FindPkgMacros.cmake +@@ -79,15 +79,21 @@ endmacro (use_pkgconfig) + + # Couple a set of release AND debug libraries (or frameworks) + macro(make_library_set PREFIX) +- if (${PREFIX}_FWK) +- set(${PREFIX} ${${PREFIX}_FWK}) +- elseif (${PREFIX}_REL AND ${PREFIX}_DBG) +- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) +- elseif (${PREFIX}_REL) +- set(${PREFIX} ${${PREFIX}_REL}) +- elseif (${PREFIX}_DBG) +- set(${PREFIX} ${${PREFIX}_DBG}) +- endif () ++ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) ++ set(PREFIX_LIB "${PREFIX}_LIBRARY") ++ if (${PREFIX_LIB}_FWK) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK}) ++ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG) ++ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "") ++ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "") ++ select_library_configurations(${PREFIX}) ++ elseif (${PREFIX_LIB}_REL) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL}) ++ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL}) ++ elseif (${PREFIX_LIB}_DBG) ++ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG}) ++ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG}) ++ endif() + endmacro(make_library_set) + + # Generate debug names from given release names +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2819f0..8b54b38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -142,7 +142,7 @@ if (MSVC) + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /bigobj") + endif () + +- if (OGRE_PROJECT_FOLDERS) ++ if (OGRE_PROJECT_FOLDERS) + # Turn on the ability to create folders to organize projects (.vcproj) + # It creates "CMakePredefinedTargets" folder by default and adds CMake + # defined projects like INSTALL.vcproj and ZERO_CHECK.vcproj +@@ -274,14 +274,9 @@ elseif(EMSCRIPTEN) + elseif (APPLE AND NOT APPLE_IOS) + + set(XCODE_ATTRIBUTE_SDKROOT macosx) +- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") + execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT) + string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") +- else() +- set(CMAKE_OSX_SYSROOT macosx) +- endif() + +- # Make sure that the OpenGL render system is selected for non-iOS Apple builds + set(OGRE_BUILD_RENDERSYSTEM_GLES2 FALSE) + endif () + +@@ -310,7 +305,7 @@ include(Dependencies) + # Customise what to build + option(OGRE_STATIC "Static build" FALSE) + option(OGRE_ENABLE_PRECOMPILED_HEADERS "Use precompiled headers to speed up build" TRUE) +-set(OGRE_RESOURCEMANAGER_STRICT "2" CACHE STRING ++set(OGRE_RESOURCEMANAGER_STRICT "2" CACHE STRING + "Make ResourceManager strict for faster operation. Possible values: + 0 - OFF search in all groups twice - for case sensitive and insensitive lookup [DEPRECATED] + 1 - PEDANTIC require an explicit resource group. Case sensitive lookup. +@@ -352,7 +347,7 @@ cmake_dependent_option(OGRE_BUILD_LIBS_AS_FRAMEWORKS "Build frameworks for libra + option(OGRE_BUILD_TESTS "Build the unit tests & PlayPen" FALSE) + option(OGRE_CONFIG_DOUBLE "Use doubles instead of floats in Ogre" FALSE) + option(OGRE_CONFIG_NODE_INHERIT_TRANSFORM "Tells the node whether it should inherit full transform from it's parent node or derived position, orientation and scale" FALSE) +-set(OGRE_CONFIG_THREADS "3" CACHE STRING ++set(OGRE_CONFIG_THREADS "3" CACHE STRING + "Enable Ogre thread safety support for multithreading. Possible values: + 0 - no thread safety. DefaultWorkQueue is not threaded. + 1 - background resource preparation and loading is thread safe. Threaded DefaultWorkQueue. [DEPRECATED] +diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt +index bdb303d..e8031d1 100644 +--- a/Components/Overlay/CMakeLists.txt ++++ b/Components/Overlay/CMakeLists.txt +@@ -13,7 +13,7 @@ + + # define header and source files for the library + file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h") +-list(APPEND HEADER_FILES ++list(APPEND HEADER_FILES + ${PROJECT_BINARY_DIR}/include/OgreOverlayPrerequisites.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/OgreOverlay.i) + file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") +@@ -21,17 +21,17 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + # setup target + add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES}) + set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) +-target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE "${FREETYPE_LIBRARIES}" ZLIB::ZLIB) +-target_include_directories(OgreOverlay PUBLIC ++target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) ++target_include_directories(OgreOverlay PUBLIC + "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" + $<INSTALL_INTERFACE:include/OGRE/Overlay> + PRIVATE ${FREETYPE_INCLUDE_DIRS}) + +-generate_export_header(OgreOverlay ++generate_export_header(OgreOverlay + EXPORT_MACRO_NAME _OgreOverlayExport + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreOverlayPrerequisites.h) + +-# install ++# install + ogre_config_framework(OgreOverlay) + ogre_config_component(OgreOverlay) + +@@ -40,4 +40,4 @@ install(FILES ${HEADER_FILES} + ) + install(FILES "${PROJECT_SOURCE_DIR}/Media/packs/profiler.zip" + DESTINATION "${OGRE_MEDIA_PATH}/packs/" +-) +\ No newline at end of file ++) +diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt +index 6ec4e34..666a736 100644 +--- a/OgreMain/CMakeLists.txt ++++ b/OgreMain/CMakeLists.txt +@@ -188,21 +188,21 @@ if (WINDOWS_STORE OR WINDOWS_PHONE) + set_target_properties(OgreMain PROPERTIES VS_WINRT_COMPONENT "true") + endif () + +-generate_export_header(OgreMain ++generate_export_header(OgreMain + EXPORT_MACRO_NAME _OgreExport + NO_EXPORT_MACRO_NAME _OgrePrivate + DEPRECATED_MACRO_NAME OGRE_DEPRECATED + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreExports.h) + +-target_include_directories(OgreMain PUBLIC +- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" ++target_include_directories(OgreMain PUBLIC ++ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" + "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>" + $<INSTALL_INTERFACE:include/OGRE> + PRIVATE "${OGRE_PROFILING_REMOTERY_PATH}") + + # In visual studio 2010 - 64 bit we get this error: "LINK : fatal error LNK1210: exceeded internal ILK size limit; link with /INCREMENTAL:NO" + if(WIN32 AND MSVC10 AND CMAKE_CL_64) +- set_target_properties(OgreMain PROPERTIES ++ set_target_properties(OgreMain PROPERTIES + VERSION ${OGRE_SOVERSION} + LINK_FLAGS "/INCREMENTAL:NO" + ) +@@ -211,7 +211,7 @@ else() + endif() + + if(OGRE_GCC_VERSION VERSION_EQUAL 4.8 OR OGRE_GCC_VERSION VERSION_GREATER 4.8) +- if(CMAKE_SYSTEM_NAME STREQUAL "Android") ++ if(CMAKE_SYSTEM_NAME STREQUAL "Android") + list(APPEND LIBRARIES "atomic") + else() + list(APPEND LIBRARIES "-latomic") +@@ -226,8 +226,6 @@ if (APPLE) + LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" + ) + +- set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") +- + if(OGRE_BUILD_LIBS_AS_FRAMEWORKS) + add_custom_command(TARGET OgreMain POST_BUILD + COMMAND mkdir ARGS -p ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading +diff --git a/PlugIns/EXRCodec/CMakeLists.txt b/PlugIns/EXRCodec/CMakeLists.txt +index e9c936a..a83d793 100644 +--- a/PlugIns/EXRCodec/CMakeLists.txt ++++ b/PlugIns/EXRCodec/CMakeLists.txt +@@ -13,14 +13,14 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + + add_library(Codec_EXR ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) + target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES}) +-target_include_directories(Codec_EXR PUBLIC ++target_include_directories(Codec_EXR PUBLIC + "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" + $<INSTALL_INTERFACE:include/OGRE/Plugins/EXRCodec>) +-target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}/OpenEXR") ++target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}") + + ogre_config_framework(Codec_EXR) + ogre_config_plugin(Codec_EXR) +-generate_export_header(Codec_EXR ++generate_export_header(Codec_EXR + EXPORT_MACRO_NAME _OgreEXRPluginExport + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreEXRCodecExports.h) + install(FILES ${HEADER_FILES} DESTINATION include/OGRE/Plugins/EXRCodec) +diff --git a/RenderSystems/GL3Plus/CMakeLists.txt b/RenderSystems/GL3Plus/CMakeLists.txt +index ba55b43..66c2758 100644 +--- a/RenderSystems/GL3Plus/CMakeLists.txt ++++ b/RenderSystems/GL3Plus/CMakeLists.txt +@@ -21,12 +21,12 @@ set(HEADER_FILES ${HEADER_FILES} ${GLSL_HEADERS}) + add_definitions(${OGRE_VISIBILITY_FLAGS}) + + if(OGRE_CONFIG_ENABLE_GL_STATE_CACHE_SUPPORT) +- set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/OgreGL3PlusStateCacheManager.cpp ++ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/OgreGL3PlusStateCacheManager.cpp + PROPERTIES COMPILE_DEFINITIONS OGRE_ENABLE_STATE_CACHE) + endif() + add_library(RenderSystem_GL3Plus ${OGRE_LIB_TYPE} ${HEADER_FILES} ${GLSL_SOURCE} ${SOURCE_FILES}) + target_link_libraries(RenderSystem_GL3Plus OgreMain OgreGLSupport ${OPENGL_gl_LIBRARY} ${CMAKE_DL_LIBS}) +-target_include_directories(RenderSystem_GL3Plus PUBLIC ++target_include_directories(RenderSystem_GL3Plus PUBLIC + "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" + "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL>" + $<INSTALL_INTERFACE:include/OGRE/RenderSystems/GL3Plus> +@@ -44,4 +44,4 @@ ogre_config_plugin(RenderSystem_GL3Plus) + + install(FILES ${HEADER_FILES} ${GLSUPPORT_HEADERS} DESTINATION include/OGRE/RenderSystems/GL3Plus) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GL DESTINATION include/OGRE/RenderSystems/GL3Plus) +-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL/ DESTINATION include/OGRE/RenderSystems/GL3Plus) ++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/GLSL DESTINATION include/OGRE/RenderSystems/GL3Plus) diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL index 2cadddeee..bf9ad3a1f 100644 --- a/ports/ompl/CONTROL +++ b/ports/ompl/CONTROL @@ -1,7 +1,7 @@ Source: ompl
-Version: 1.4.2-0
+Version: 1.4.2-1
Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms
-Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, eigen3
+Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3
Feature: app
Description: Add support for reading meshes and performing collision checking
diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index d1559b933..87af91de8 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -1,25 +1,12 @@ -# Common Ambient Variables:
-# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
-# PORT = current port name (zlib, etc)
-# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
-# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
-# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
-# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
include(vcpkg_common_functions)
string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
- message(WARNING "OMPL's buildsystem uses very long paths and may fail on your system.\n"
+ message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
)
endif()
-
set(OMPL_VERSION 1.4.2)
set(OMPL_DISTNAME "ompl")
set(OMPL_CHECKSUM "1dc477ee471c0570fd94838b072105960e09186f29634e2f61d885153df36532ab40e30912b534c61f222c09dad63fc6097d324b53c265f9284f20c585d3095c")
@@ -43,7 +30,7 @@ vcpkg_extract_source_archive_ex( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS
+ OPTIONS
-DOMPL_VERSIONED_INSTALL=OFF
-DOMPL_REGISTRATION=OFF
-DOMPL_BUILD_DEMOS=OFF
diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL index bf7a481ab..1780b4505 100644 --- a/ports/oniguruma/CONTROL +++ b/ports/oniguruma/CONTROL @@ -1,5 +1,5 @@ Source: oniguruma
-Version: 2019-02-26
+Version: 6.9.2
Description: Modern and flexible regular expressions library
Feature: non-posix
diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake index 40652b590..586bfbe07 100644 --- a/ports/oniguruma/portfile.cmake +++ b/ports/oniguruma/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kkos/oniguruma
- REF 502b1f416746ed8700498229bbfceb180e400fbc
- SHA512 0faf12f415de59716d8faa4d3dc026874c3bd6a3624f75f2a184843025294eb885d57164ae6dcb916cba5c7d1a4da4bcb0dc23fce3ceae5b34b7320e8f0e2c02
+ REF v6.9.2
+ SHA512 b5578560f469c2e123280159a23a0e59045bf2452fd3efe09393c5e99ecc6323f965d2189a4e7e6e3a108c1d02b9b041f3fe991cd8ab64f7289003a5a07b4434
HEAD_REF master
)
@@ -23,6 +23,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
file(REMOVE_RECURSE
@@ -47,4 +49,4 @@ endif() configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
# CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL index abf413d79..ed2224f0f 100644 --- a/ports/open62541/CONTROL +++ b/ports/open62541/CONTROL @@ -1,3 +1,3 @@ Source: open62541 -Version: 0.3.0 +Version: 0.3.0-1 Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0. diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index 951ad9b48..a8c345eb8 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -37,7 +37,7 @@ if(NOT EXISTS ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX}) vcpkg_download_distfile(GET_PIP URLS "https://bootstrap.pypa.io/get-pip.py" FILENAME "tools/python/python3/get-pip.py" - SHA512 fdbcef1037dca7cc914e2304af657ebd08239cd18c3e79786dc25c8ea39957674e012d7ea8ae2c99006e4b61d3a5e24669ac5771dc186697fd9fdb40b6cc07ae + SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad ) execute_process(COMMAND ${PYTHON3_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON3_DIR}/get-pip.py) endif() diff --git a/ports/openal-soft/CONTROL b/ports/openal-soft/CONTROL index 3591a3f70..ccea6a482 100644 --- a/ports/openal-soft/CONTROL +++ b/ports/openal-soft/CONTROL @@ -1,3 +1,4 @@ Source: openal-soft Version: 1.19.1-2 +Homepage: https://github.com/kcat/openal-soft Description: OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API. diff --git a/ports/openblas/CONTROL b/ports/openblas/CONTROL index b3ff85c81..1c01d8363 100644 --- a/ports/openblas/CONTROL +++ b/ports/openblas/CONTROL @@ -1,3 +1,4 @@ Source: openblas -Version: 0.3.5-4 +Version: 0.3.6-4 +Homepage: https://github.com/xianyi/OpenBLAS Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. diff --git a/ports/openblas/enable_underscore.patch b/ports/openblas/enable_underscore.patch new file mode 100644 index 000000000..d2eb3ff22 --- /dev/null +++ b/ports/openblas/enable_underscore.patch @@ -0,0 +1,70 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9696961..47ef712 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,7 @@ option(BUILD_RELAPACK "Build with ReLAPACK (recursive implementation of several + # 64 bit integer interfaces in OpenBLAS. + + set(SYMBOLPREFIX "" CACHE STRING "Add a prefix to all exported symbol names in the shared library to avoid conflicts with other BLAS libraries" ) +-set(SYMBOLSUFFIX "" CACHE STRING "Add a suffix to all exported symbol names in the shared library, e.g. _64 for INTERFACE64 builds" ) ++set(SYMBOLSUFFIX "_" CACHE STRING "Add a suffix to all exported symbol names in the shared library, e.g. _64 for INTERFACE64 builds" ) + ####### + if(BUILD_WITHOUT_LAPACK) + set(NO_LAPACK 1) +@@ -232,7 +232,7 @@ if (BUILD_SHARED_LIBS AND BUILD_RELAPACK) + endif() + endif() + +-if (BUILD_SHARED_LIBS AND NOT ${SYMBOLPREFIX}${SYMBOLSUFIX} STREQUAL "") ++if (NOT ${SYMBOLPREFIX}${SYMBOLSUFFIX} STREQUAL "") + if (NOT DEFINED ARCH) + set(ARCH_IN "x86_64") + else() +@@ -289,12 +289,14 @@ endif() + if (NOT ${SYMBOLSUFFIX} STREQUAL "") + message(STATUS "adding suffix ${SYMBOLSUFFIX} to names of exported symbols in ${OpenBLAS_LIBNAME}") + endif() ++if(BUILD_SHARED_LIBS) + add_custom_command(TARGET ${OpenBLAS_LIBNAME} POST_BUILD + COMMAND perl ${PROJECT_SOURCE_DIR}/exports/gensymbol "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BUILD_LAPACK_DEPRECATED}" > ${PROJECT_BINARY_DIR}/objcopy.def + COMMAND objcopy -v --redefine-syms ${PROJECT_BINARY_DIR}/objcopy.def ${PROJECT_BINARY_DIR}/lib/lib${OpenBLAS_LIBNAME}.so + COMMENT "renaming symbols" + ) + endif() ++endif() + + + # Install project +@@ -385,4 +387,3 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PN}ConfigVersion.cmake + install(EXPORT "${PN}${SUFFIX64}Targets" + NAMESPACE "${PN}${SUFFIX64}::" + DESTINATION ${CMAKECONFIG_INSTALL_DIR}) +- +diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake +index 259ef16..936fbf7 100644 +--- a/cmake/prebuild.cmake ++++ b/cmake/prebuild.cmake +@@ -58,10 +58,8 @@ endif () + set(TARGET_CONF_TEMP "${PROJECT_BINARY_DIR}/${TARGET_CONF}.tmp") + + # c_check +-set(FU "") +-if (APPLE OR (MSVC AND NOT ${CMAKE_C_COMPILER_ID} MATCHES "Clang")) +- set(FU "_") +-endif() ++set(FU "") ++set(BU "") + + set(COMPILER_ID ${CMAKE_C_COMPILER_ID}) + if (${COMPILER_ID} STREQUAL "GNU") +@@ -75,7 +73,9 @@ file(WRITE ${TARGET_CONF_TEMP} + "#define ARCH_${UC_ARCH}\t1\n" + "#define C_${COMPILER_ID}\t1\n" + "#define __${BINARY}BIT__\t1\n" +- "#define FUNDERSCORE\t${FU}\n") ++ "#define FUNDERSCORE\t${FU}\n" ++ "#define BUNDERSCORE\t${BU}\n" ++ "//#define NEEDBUNDERSCORE 1\n") + + if (${HOST_OS} STREQUAL "WINDOWSSTORE") + file(APPEND ${TARGET_CONF_TEMP} diff --git a/ports/openblas/fix-space-path.patch b/ports/openblas/fix_space_path.patch index 1ceacd90a..1ceacd90a 100644 --- a/ports/openblas/fix-space-path.patch +++ b/ports/openblas/fix_space_path.patch diff --git a/ports/openblas/openblas_common.h b/ports/openblas/openblas_common.h deleted file mode 100644 index 10b25d4c7..000000000 --- a/ports/openblas/openblas_common.h +++ /dev/null @@ -1,72 +0,0 @@ -#pragma once -#include "openblas_config.h" - -#if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX) -#define OPENBLAS_WINDOWS_ABI -#define OPENBLAS_OS_WINDOWS - -#ifdef DOUBLE -#define DOUBLE_DEFINED DOUBLE -#undef DOUBLE -#endif -#endif - -#ifdef NEEDBUNDERSCORE -#define BLASFUNC(FUNC) FUNC##_ -#else -#define BLASFUNC(FUNC) FUNC -#endif - - -#ifdef OPENBLAS_QUAD_PRECISION -typedef struct { - unsigned long x[2]; -} xdouble; -#elif defined OPENBLAS_EXPRECISION -#define xdouble long double -#else -#define xdouble double -#endif - -#if defined(OS_WINNT) && defined(__64BIT__) -typedef long long BLASLONG; -typedef unsigned long long BLASULONG; -#else -typedef long BLASLONG; -typedef unsigned long BLASULONG; -#endif - -#ifdef OPENBLAS_USE64BITINT -typedef BLASLONG blasint; -#else -typedef int blasint; -#endif - -#if defined(XDOUBLE) || defined(DOUBLE) -#define FLOATRET FLOAT -#else -#ifdef NEED_F2CCONV -#define FLOATRET double -#else -#define FLOATRET float -#endif -#endif - - -/* Inclusion of a standard header file is needed for definition of __STDC_* - predefined macros with some compilers (e.g. GCC 4.7 on Linux). This occurs - as a side effect of including either <features.h> or <stdc-predef.h>. */ -#include <stdio.h> -#define OPENBLAS_COMPLEX_STRUCT -typedef struct { float real, imag; } openblas_complex_float; -typedef struct { double real, imag; } openblas_complex_double; -typedef struct { xdouble real, imag; } openblas_complex_xdouble; -#define openblas_make_complex_float(real, imag) {(real), (imag)} -#define openblas_make_complex_double(real, imag) {(real), (imag)} -#define openblas_make_complex_xdouble(real, imag) {(real), (imag)} -#define openblas_complex_float_real(z) ((z).real) -#define openblas_complex_float_imag(z) ((z).imag) -#define openblas_complex_double_real(z) ((z).real) -#define openblas_complex_double_imag(z) ((z).imag) -#define openblas_complex_xdouble_real(z) ((z).real) -#define openblas_complex_xdouble_imag(z) ((z).imag) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 7f4c0adb4..45260c78a 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,35 +1,36 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(WARNING "You do not need this package on macOS, since you already have the Accelerate Framework") + return() +endif() + if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") message(FATAL_ERROR "openblas can only be built for x64 currently") endif() -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - set(CMAKE_CROSSCOMPILING OFF) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(ADDITIONAL_PATCH "enable_underscore.patch") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(NO_SHARED 1) +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(NO_STATIC 1) endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF v0.3.5 - SHA512 91b3074eb922453bf843158b4281cde65db9e8bbdd7590e75e9e6cdcb486157f7973f2936f327bb3eb4f1702ce0ba51ae6729d8d4baf2d986c50771e8f696df0 + REF v0.3.6 + SHA512 1ad980176a51f70d8b0b2d158da8c01f30f77b7cf385b24a6340d3c5feb1513bd04b9390487d05cc9557db7dc5f7c135b1688dec9f17ebef35dba884ef7ddee9 HEAD_REF develop PATCHES uwp.patch - fix-space-path.patch + fix_space_path.patch + ${ADDITIONAL_PATCH} ) find_program(GIT NAMES git git.cmd) @@ -43,6 +44,8 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${SED_EXE_PATH}") +set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON) + # for UWP version, must build non uwp first for helper # binaries. if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") @@ -56,7 +59,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DTARGET=NEHALEM -DBUILD_WITHOUT_LAPACK=ON + OPTIONS + ${COMMON_OPTIONS} + -DTARGET=NEHALEM ) # add just built path to environment for gen_config_h.exe, @@ -72,35 +77,37 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DVS_WINRT_COMPONENT=TRUE -DBUILD_WITHOUT_LAPACK=ON - "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel") + OPTIONS + ${COMMON_OPTIONS} + -DCMAKE_SYSTEM_PROCESSOR=AMD64 + -DVS_WINRT_COMPONENT=TRUE + "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel") elseif(NOT VCPKG_CMAKE_SYSTEM_NAME) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DBUILD_WITHOUT_LAPACK=ON) + OPTIONS + ${COMMON_OPTIONS}) else() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 -DNOFORTRAN=ON) + OPTIONS + ${COMMON_OPTIONS} + -DTARGET=SANDYBRIDGE + -DCMAKE_SYSTEM_PROCESSOR=AMD64 + -DBINARY=64 + -DNO_SHARED=${NO_SHARED} + -DNO_STATIC=${NO_STATIC} + -DNOFORTRAN=ON) endif() vcpkg_install_cmake() - -# openblas do not make the config file , so I manually made this -# but I think in most case, libraries will not include these files, they define their own used function prototypes -# this is only to quite vcpkg -file(COPY ${CMAKE_CURRENT_LIST_DIR}/openblas_common.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -file(READ ${SOURCE_PATH}/cblas.h CBLAS_H) -string(REPLACE "#include \"common.h\"" "#include \"openblas_common.h\"" CBLAS_H "${CBLAS_H}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h "${CBLAS_H}") - -# openblas is BSD -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openblas) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/openblas/LICENSE ${CURRENT_PACKAGES_DIR}/share/openblas/copyright) - +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/OpenBLAS) +#we install a cmake wrapper since the official FindBLAS thinks that OpenBLAS can solve also LAPACK libraries, while it cannot because we disabled it and we use CLAPACK... maybe we have to trigger finding one package when requesting the other and vice-versa. Wrappers should be ready also to avoid an infinite loop +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/blas) 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/openblas RENAME copyright) diff --git a/ports/openblas/vcpkg-cmake-wrapper.cmake b/ports/openblas/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..e0791bde8 --- /dev/null +++ b/ports/openblas/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,49 @@ +list(REMOVE_ITEM ARGS "BLAS") +list(REMOVE_ITEM ARGS "blas") +list(REMOVE_ITEM ARGS "Blas") +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") +if(NOT BLAS_LIBRARY OR BLAS_LIBRARIES OR OpenBLAS_LIBRARY OR OpenBLAS_LIBRARIES OR BLAS_LIB OR BLAS_LIBS) + include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) + + _find_package(OpenBLAS CONFIG ${ARGS}) + + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + _find_package(Threads) + + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY INTERFACE_INCLUDE_DIRECTORIES) + set(BLAS_INCLUDE_DIR ${_loc}) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_RELEASE) + if(NOT _loc) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_RELEASE) + endif() + set(BLAS_LIBRARY_RELEASE ${_loc}) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY IMPORTED_IMPLIB_DEBUG) + if(NOT _loc) + get_property(_loc TARGET OpenBLAS::OpenBLAS PROPERTY LOCATION_DEBUG) + endif() + set(BLAS_LIBRARY_DEBUG ${_loc}) + list(APPEND BLAS_LIBRARY_RELEASE Threads::Threads) + list(APPEND BLAS_LIBRARY_DEBUG Threads::Threads) + select_library_configurations(BLAS) + + set(BLAS_LIBRARY "${BLAS_LIBRARY}" CACHE STRING "" FORCE) + set(BLAS_LIBRARIES "${BLAS_LIBRARY}" CACHE STRING "" FORCE) + set(OpenBLAS_LIBRARY "${BLAS_LIBRARY}" CACHE STRING "" FORCE) + set(OpenBLAS_LIBRARIES "${BLAS_LIBRARY}" CACHE STRING "" FORCE) + set(BLAS_LIB "${BLAS_LIBRARY}" CACHE STRING "" FORCE) + set(BLAS_LIBS "${BLAS_LIBRARY}" CACHE STRING "" FORCE) + + set(BLAS_INCLUDE_DIR "${BLAS_INCLUDE_DIR}" CACHE STRING "" FORCE) + set(BLAS_INCLUDE_DIRS "${BLAS_INCLUDE_DIR}" CACHE STRING "" FORCE) + set(OpenBLAS_INCLUDE_DIR "${BLAS_INCLUDE_DIR}" CACHE STRING "" FORCE) + set(OpenBLAS_INCLUDE_DIRS "${BLAS_INCLUDE_DIR}" CACHE STRING "" FORCE) + set(BLAS_INC "${BLAS_INCLUDE_DIR}" CACHE STRING "" FORCE) + + find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARY BLAS_INCLUDE_DIR) + mark_as_advanced(BLAS_INCLUDE_DIR BLAS_LIBRARY) + find_package_handle_standard_args(OpenBLAS DEFAULT_MSG OpenBLAS_LIBRARY OpenBLAS_INCLUDE_DIR) + mark_as_advanced(OpenBLAS_INCLUDE_DIR OpenBLAS_LIBRARY) +endif() diff --git a/ports/opencl/CONTROL b/ports/opencl/CONTROL index 633c95e51..32308ad5d 100644 --- a/ports/opencl/CONTROL +++ b/ports/opencl/CONTROL @@ -1,3 +1,4 @@ Source: opencl
Version: 2.2 (2017.07.18)-1
+Homepage: https://github.com/KhronosGroup/OpenCL-Headers
Description: C/C++ headers and ICD loader (Installable Client Driver) for OpenCL
diff --git a/ports/opencv/0006-fix-missing-openjp2.patch b/ports/opencv/0006-fix-missing-openjp2.patch new file mode 100644 index 000000000..c0afb9952 --- /dev/null +++ b/ports/opencv/0006-fix-missing-openjp2.patch @@ -0,0 +1,16 @@ +diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt
+index 434278c..0d8f4d8 100644
+--- a/modules/imgcodecs/CMakeLists.txt
++++ b/modules/imgcodecs/CMakeLists.txt
+@@ -36,6 +36,11 @@ if(HAVE_PNG)
+ endif()
+
+ if(HAVE_GDCM)
++ if (CMAKE_BUILD_TYPE STREQUAL "Release")
++ link_directories("${CURRENT_INSTALLED_DIR}/lib")
++ else()
++ link_directories("${CURRENT_INSTALLED_DIR}/debug/lib")
++ endif()
+ ocv_include_directories(${GDCM_INCLUDE_DIRS})
+ list(APPEND GRFMT_LIBS ${GDCM_LIBRARIES})
+ endif()
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 88ade6e28..42f5c1c47 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,6 +1,7 @@ Source: opencv -Version: 3.4.3-7 +Version: 3.4.3-9 Build-Depends: zlib +Homepage: https://github.com/opencv/opencv Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann @@ -50,7 +51,7 @@ Build-Depends: vtk Description: vtk support for opencv Feature: gdcm -Build-Depends: gdcm2 +Build-Depends: gdcm Description: GDCM support for opencv Feature: webp @@ -81,5 +82,8 @@ Feature: eigen Build-Depends: eigen3 Description: Eigen support for opencv +Feature: world +Description: Compile to a single package support for opencv + Feature: nonfree Description: allow nonfree and unredistributable libraries diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 9ea245ed3..55fd6a680 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -9,17 +9,23 @@ vcpkg_from_github( SHA512 d653a58eb5e3939b9fdb7438ac35f77cf4385cf72d5d22bfd21722a109e1b3283dbb9407985061b7548114f0d05c9395aac9bb62b4d2bc1f68da770a49987fef HEAD_REF master PATCHES - "${CMAKE_CURRENT_LIST_DIR}/0001-winrt-fixes.patch" - "${CMAKE_CURRENT_LIST_DIR}/0002-install-options.patch" - "${CMAKE_CURRENT_LIST_DIR}/0003-disable-downloading.patch" - "${CMAKE_CURRENT_LIST_DIR}/0004-use-find-package-required.patch" - "${CMAKE_CURRENT_LIST_DIR}/0005-remove-custom-protobuf-find-package.patch" + 0001-winrt-fixes.patch + 0002-install-options.patch + 0003-disable-downloading.patch + 0004-use-find-package-required.patch + 0005-remove-custom-protobuf-find-package.patch + 0006-fix-missing-openjp2.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) set(CMAKE_MODULE_PATH) +set(BUILD_opencv_world OFF) +if("world" IN_LIST FEATURES) + set(BUILD_opencv_world ON) +endif() + set(BUILD_opencv_dnn OFF) set(WITH_PROTOBUF OFF) if("dnn" IN_LIST FEATURES) @@ -274,10 +280,12 @@ vcpkg_configure_cmake( -DBUILD_opencv_python3=OFF -DBUILD_opencv_saliency=${BUILD_opencv_saliency} -DBUILD_opencv_sfm=${BUILD_opencv_sfm} + -DBUILD_opencv_world=${BUILD_opencv_world} # PROTOBUF -DPROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES} -DUPDATE_PROTO_FILES=${UPDATE_PROTO_FILES} # CMAKE + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON "-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}" # ENABLE @@ -315,6 +323,7 @@ vcpkg_configure_cmake( -DWITH_VTK=${WITH_VTK} -DWITH_WEBP=${WITH_WEBP} -DWITH_ZLIB=${WITH_ZLIB} + -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF -DINSTALL_OTHER=OFF @@ -388,6 +397,14 @@ string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_VCPKG_INSTALLED_DIR}/\${VCPKG_TARGET_TRIPLET}" OPENCV_MODULES "${OPENCV_MODULES}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES) + string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" + "set(CMAKE_IMPORT_FILE_VERSION 1) + find_package(TIFF REQUIRED)" OPENCV_MODULES "${OPENCV_MODULES}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/openexr/CONTROL b/ports/openexr/CONTROL index ea85a082f..5fc8b52d6 100644 --- a/ports/openexr/CONTROL +++ b/ports/openexr/CONTROL @@ -1,4 +1,5 @@ Source: openexr -Version: 2.3.0-2 +Version: 2.3.0-4 +Homepage: https://www.openexr.com/ Description: OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications Build-Depends: zlib diff --git a/ports/openexr/FindOpenEXR.cmake b/ports/openexr/FindOpenEXR.cmake index a381c6db9..4b5b280a0 100644 --- a/ports/openexr/FindOpenEXR.cmake +++ b/ports/openexr/FindOpenEXR.cmake @@ -54,9 +54,12 @@ if(NOT OpenEXR_IEXMATH_LIBRARY) endif() set(OPENEXR_HALF_LIBRARY "${OpenEXR_HALF_LIBRARY}") +set(OPENEXR_Half_LIBRARY "${OpenEXR_HALF_LIBRARY}") set(OPENEXR_IEX_LIBRARY "${OpenEXR_IEX_LIBRARY}") +set(OPENEXR_Iex_LIBRARY "${OpenEXR_IEX_LIBRARY}") set(OPENEXR_IMATH_LIBRARY "${OpenEXR_MATH_LIBRARY}") set(OPENEXR_ILMIMF_LIBRARY "${OpenEXR_BASE_LIBRARY}") +set(OPENEXR_IlmImf_LIBRARY "${OpenEXR_BASE_LIBRARY}") set(OPENEXR_ILMIMFUTIL_LIBRARY "${OpenEXR_UTIL_LIBRARY}") set(OPENEXR_ILMTHREAD_LIBRARY "${OpenEXR_THREAD_LIBRARY}") @@ -80,6 +83,10 @@ set(OPENEXR_LIBRARIES ${OPENEXR_ILMTHREAD_LIBRARY} ) +set(OpenEXR_INCLUDE_DIR ${OpenEXR_INCLUDE_DIRS}) +set(OPENEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS}) +set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATHS}) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS) if(OpenEXR_FOUND) diff --git a/ports/openexr/fix_clang_not_setting_modern_cplusplus.patch b/ports/openexr/fix_clang_not_setting_modern_cplusplus.patch new file mode 100644 index 000000000..05e86b50c --- /dev/null +++ b/ports/openexr/fix_clang_not_setting_modern_cplusplus.patch @@ -0,0 +1,13 @@ +diff --git a/IlmBase/CMakeLists.txt b/IlmBase/CMakeLists.txt +index e13c768..95942c8 100644 +--- a/IlmBase/CMakeLists.txt ++++ b/IlmBase/CMakeLists.txt +@@ -110,7 +110,7 @@ ENDIF () + + IF (OPENEXR_FORCE_CXX03) + FILE ( APPEND ${ILMBASE_TMP_CONFIG} "#define ILMBASE_FORCE_CXX03 1\n" ) +-ELSEIF (NOT WIN32) ++ELSEIF (NOT WIN32 AND NOT APPLE) + # really only care about c++11 right now for the threading bits, but this can be changed to 14 + # when needed... + # Note that the __cplusplus check is not valid under MSVC diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index f06ee4841..0cdd30b2e 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -13,7 +13,9 @@ vcpkg_from_github( REF v${OPENEXR_VERSION} SHA512 ${OPENEXR_HASH} HEAD_REF master - PATCHES "fix_install_ilmimf.patch" + PATCHES + fix_clang_not_setting_modern_cplusplus.patch + fix_install_ilmimf.patch ) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} @@ -32,7 +34,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # NOTE: Only use ".exe" extension on Windows executables. # Is there a cleaner way to do this? -if(WIN32) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(EXECUTABLE_SUFFIX ".exe") else() set(EXECUTABLE_SUFFIX "") @@ -60,13 +62,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(OPENEXR_PORT_DIR "openexr") -else() - set(OPENEXR_PORT_DIR "OpenEXR") -endif() - -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}/copyright) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${OPENEXR_PORT_DIR}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindOpenEXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/openexr/vcpkg-cmake-wrapper.cmake b/ports/openexr/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..a977a420e --- /dev/null +++ b/ports/openexr/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +set(OPENEXR_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +if(NOT OpenEXR_LIBRARIES OR OPENEXR_LIBRARIES) + _find_package(${ARGS}) +endif() + +set(CMAKE_MODULE_PATH ${OPENEXR_PREV_MODULE_PATH}) diff --git a/ports/openigtlink/CONTROL b/ports/openigtlink/CONTROL new file mode 100644 index 000000000..488c4061b --- /dev/null +++ b/ports/openigtlink/CONTROL @@ -0,0 +1,3 @@ +Source: openigtlink
+Version: 3.0
+Description: OpenIGTLink is an open-source network communication interface specifically designed for image-guided interventions.
diff --git a/ports/openigtlink/portfile.cmake b/ports/openigtlink/portfile.cmake new file mode 100644 index 000000000..a5a240fae --- /dev/null +++ b/ports/openigtlink/portfile.cmake @@ -0,0 +1,30 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO openigtlink/OpenIGTLink
+ REF v3.0
+ SHA512 3f62ef1c4ca349f653712cecd43af8b5afce642cc3950256498905999861d68143ba3003f6b0899f5f5c3c5c755eb282c63488ac59b4793b3622a47571452739
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/igtl/cmake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL index 86ae5bd55..be2dab3c9 100644 --- a/ports/openimageio/CONTROL +++ b/ports/openimageio/CONTROL @@ -1,5 +1,6 @@ Source: openimageio Version: 1.8.16 +Homepage: https://github.com/OpenImageIO/oiio Description: A library for reading and writing images, and a bunch of related classes, utilities, and application Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 93b04e627..790273975 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -7,10 +7,9 @@ vcpkg_from_github( SHA512 a919341df7d9625a869cad266d8434881b63a47f3da8daccf4bbab6675d45bd121ff780dd911a7447450fee44cd7bdd42d73aec59a99b667d6d98e79682db2c7 HEAD_REF master PATCHES - # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES' - # since libraw port installs 'raw_r' library as 'raw' fix_libraw.patch use-webp.patch + remove_wrong_dependency.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") diff --git a/ports/openimageio/remove_wrong_dependency.patch b/ports/openimageio/remove_wrong_dependency.patch new file mode 100644 index 000000000..dabf47b1e --- /dev/null +++ b/ports/openimageio/remove_wrong_dependency.patch @@ -0,0 +1,23 @@ +diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt +index c528adc..bc133b6 100644 +--- a/src/libOpenImageIO/CMakeLists.txt ++++ b/src/libOpenImageIO/CMakeLists.txt +@@ -162,9 +162,6 @@ if (WIN32) + target_link_libraries (OpenImageIO psapi.lib) + endif () + +-if (VISIBILITY_MAP_FILE) +- add_dependencies (OpenImageIO "${VISIBILITY_MAP_FILE}") +-endif () + + if (USE_EXTERNAL_PUGIXML) + target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES}) +@@ -230,7 +227,7 @@ if (OIIO_BUILD_TESTS) + set_target_properties (imagespec_test PROPERTIES FOLDER "Unit Tests") + target_link_libraries (imagespec_test OpenImageIO ${Boost_LIBRARIES}) + add_test (unit_imagespec imagespec_test) +- ++ + add_executable (imagespeed_test imagespeed_test.cpp) + set_target_properties (imagespeed_test PROPERTIES FOLDER "Unit Tests") + target_link_libraries (imagespeed_test OpenImageIO ${Boost_LIBRARIES}) diff --git a/ports/openjpeg/CONTROL b/ports/openjpeg/CONTROL index 7a8721b8d..0fd7d64a6 100644 --- a/ports/openjpeg/CONTROL +++ b/ports/openjpeg/CONTROL @@ -1,3 +1,4 @@ Source: openjpeg -Version: 2.3.0-1 +Version: 2.3.1-1 +Homepage: https://github.com/uclouvain/openjpeg Description: JPEG 2000 image library diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index f0f293ac1..2296734ad 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -1,12 +1,10 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uclouvain/openjpeg - REF v2.3.0 - SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 + REF v2.3.1 + SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 HEAD_REF master ) diff --git a/ports/openmama/CONTROL b/ports/openmama/CONTROL index 600b78091..fbfb815c3 100644 --- a/ports/openmama/CONTROL +++ b/ports/openmama/CONTROL @@ -1,4 +1,5 @@ Source: openmama -Version: 6.2.2 +Version: 6.2.3-1 Build-Depends: libevent, apr, qpid-proton +Homepage: https://github.com/OpenMAMA/OpenMAMA Description: OpenMAMA is a high performance vendor neutral lightweight wrapper that provides a common API interface to different middleware and messaging solutions across a variety of platforms and languages. diff --git a/ports/openmama/portfile.cmake b/ports/openmama/portfile.cmake index e84e49284..62f76cf0b 100644 --- a/ports/openmama/portfile.cmake +++ b/ports/openmama/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_find_acquire_program(SCONS) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenMAMA/OpenMAMA - REF OpenMAMA-6.2.2-release - SHA512 e12dbd911dbb5416178d5f2ca874ef8ea90edbea8edb64ad77f096ea491b3dea1cca1c3ac4fe73a59a154f56b570a4834cce0943e16a10a29c6d6af90c2ef6f1 + REF OpenMAMA-6.2.3-release + SHA512 2d641a34f4301f8aa0a33cc6c1172e2d3215792955a56f13858d758cedfea1c2ec3ae466112f06f9be7a67d80569f12238eca98008e6623558183b08dcd954c0 HEAD_REF next ) diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL index ce974a9d6..b08351664 100644 --- a/ports/openmvg/CONTROL +++ b/ports/openmvg/CONTROL @@ -1,4 +1,11 @@ -Source: openmvg
-Version: 1.4-1
-Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.
-Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib
+Source: openmvg +Version: 1.4-5 +Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. +Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib, suitesparse + +Feature: opencv +Build-Depends: opencv[contrib] +Description: opencv support for openmvg + +Feature: openmp +Description: openmp support for openmvg diff --git a/ports/openmvg/fixcmake.patch b/ports/openmvg/fixcmake.patch index 2ee976dd5..2dd5201ec 100644 --- a/ports/openmvg/fixcmake.patch +++ b/ports/openmvg/fixcmake.patch @@ -1,119 +1,427 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 654bebd..6d1c671 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -39,6 +39,10 @@ option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF)
- # ==============================================================================
- option(OpenMVG_USE_OCVSIFT "Add or not OpenCV SIFT in available features" OFF)
-
-+if(OpenMVG_BUILD_SHARED AND MSVC)
-+ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-+endif(OpenMVG_BUILD_SHARED AND MSVC)
-+
- # ==============================================================================
- # OpenMVG version
- # ==============================================================================
-@@ -88,11 +92,11 @@ endif()
- # ==============================================================================
- # Check that submodule have been initialized and updated
- # ==============================================================================
--if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
-- message(FATAL_ERROR
-- "\n submodule(s) are missing, please update your repository:\n"
-- " > git submodule update -i\n")
--endif()
-+# if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
-+# message(FATAL_ERROR
-+# "\n submodule(s) are missing, please update your repository:\n"
-+# " > git submodule update -i\n")
-+# endif()
-
- # ==============================================================================
- # Additional cmake find modules
-@@ -184,12 +188,12 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
- endif (OpenMVG_BUILD_OPENGL_EXAMPLES)
-
- # Dependencies install rules
--install(
-- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
-- DESTINATION include/openMVG_dependencies
-- COMPONENT headers
-- FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
--)
-+# install(
-+# DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
-+# DESTINATION include/openMVG_dependencies
-+# COMPONENT headers
-+# FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
-+# )
-
- # ==============================================================================
- # --END-- SUBMODULE CONFIGURATION
-diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake
-index c997b87..74c3aae 100644
---- a/src/cmakeFindModules/FindClp.cmake
-+++ b/src/cmakeFindModules/FindClp.cmake
-@@ -51,8 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
- SET(CLP_INCLUDE_DIR ${CLP_DIR})
-
- 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)
-
- # locate Clp libraries
- IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY)
-diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
-index 80b1fe6..cb396c7 100644
---- a/src/openMVG/matching/CMakeLists.txt
-+++ b/src/openMVG/matching/CMakeLists.txt
-@@ -38,7 +38,7 @@ target_link_libraries(openMVG_matching
- openMVG_features
- Threads::Threads
- )
--if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
-+if (NOT OpenMVG_USE_INTERNAL_FLANN)
- target_link_libraries(openMVG_matching
- PUBLIC
- ${FLANN_LIBRARIES}
-diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
-index 816a941..f0b7145 100644
---- a/src/third_party/CMakeLists.txt
-+++ b/src/third_party/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_subdirectory(stlplus3)
- set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE)
-
- # Add graph library
--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)
- add_subdirectory(vectorGraphics)
-
- # Add ceres-solver (A Nonlinear Least Squares Minimizer)
--if (DEFINED OpenMVG_USE_INTERNAL_CERES)
-+if (OpenMVG_USE_INTERNAL_CERES)
- 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)
- endif()
-
- # Add an Approximate Nearest Neighbor library
--if (DEFINED OpenMVG_USE_INTERNAL_FLANN)
-+if (OpenMVG_USE_INTERNAL_FLANN)
- 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)
- ##
- # 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)
- add_subdirectory(eigen)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 654bebd..ab7dd90 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -17,27 +17,16 @@ endif() + # ============================================================================== + # OpenMVG build options + # ============================================================================== +-option(OpenMVG_BUILD_SHARED "Build OpenMVG shared libs" OFF) +-option(OpenMVG_BUILD_TESTS "Build OpenMVG tests" OFF) +-option(OpenMVG_BUILD_DOC "Build OpenMVG documentation" ON) +-option(OpenMVG_BUILD_EXAMPLES "Build OpenMVG samples applications." ON) +-option(OpenMVG_BUILD_OPENGL_EXAMPLES "Build OpenMVG openGL examples" OFF) +-option(OpenMVG_BUILD_SOFTWARES "Build OpenMVG softwares" ON) +-option(OpenMVG_BUILD_GUI_SOFTWARES "Build OpenMVG GUI softwares (QT5)" ON) +-option(OpenMVG_BUILD_COVERAGE "Enable code coverage generation (gcc only)" OFF) +-option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON) + # ============================================================================== + # Opencv is not used by openMVG but some samples show how to use openCV + # and openMVG simultaneously + # ============================================================================== +-option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF) + + # ============================================================================== + # Since OpenCV 3, SIFT is no longer in the default modules. See + # https://github.com/itseez/opencv_contrib for more informations. + # Enable this to be able to use OpenCV SIFT in main_ComputeFeatures_OpenCV. + # ============================================================================== +-option(OpenMVG_USE_OCVSIFT "Add or not OpenCV SIFT in available features" OFF) + + # ============================================================================== + # OpenMVG version +@@ -85,15 +74,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + register_definitions(-DOPENMVG_STD_UNORDERED_MAP) + endif() + +-# ============================================================================== +-# Check that submodule have been initialized and updated +-# ============================================================================== +-if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) +- message(FATAL_ERROR +- "\n submodule(s) are missing, please update your repository:\n" +- " > git submodule update -i\n") +-endif() +- + # ============================================================================== + # Additional cmake find modules + # ============================================================================== +@@ -129,7 +109,6 @@ if (OpenMVG_USE_OPENMP) + find_package(OpenMP) + if (OPENMP_FOUND) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" ON) + register_definitions(-DOPENMVG_USE_OPENMP) + if (NOT MSVC) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +@@ -140,11 +119,6 @@ if (OpenMVG_USE_OPENMP) + endif() + endif (NOT MSVC) + endif (OPENMP_FOUND) +-else (OpenMVG_USE_OPENMP) +- option(OpenMVG_USE_OPENMP "Use OpenMP for parallelization" OFF) +- include(UpdateCacheVariable) +- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENMP OFF) +- remove_definitions(-DOPENMVG_USE_OPENMP) + endif (OpenMVG_USE_OPENMP) + + # ============================================================================== +@@ -183,14 +157,6 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES) + set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw) + endif (OpenMVG_BUILD_OPENGL_EXAMPLES) + +-# Dependencies install rules +-install( +- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ +- DESTINATION include/openMVG_dependencies +- COMPONENT headers +- FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" +-) +- + # ============================================================================== + # --END-- SUBMODULE CONFIGURATION + # ============================================================================== +@@ -226,14 +192,8 @@ ENDMACRO(UNIT_TEST) + # - external by default + # - internal if cereal not found + # ============================================================================== +-find_package(cereal QUIET CONFIG) +-if (NOT cereal_FOUND) +- set(CEREAL_INCLUDE_DIRS +- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/cereal/include) +- set(OpenMVG_USE_INTERNAL_CEREAL ON) +-else() +- get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) +-endif() ++find_package(cereal REQUIRED CONFIG) ++get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) + + # ============================================================================== + # Eigen +@@ -242,14 +202,8 @@ endif() + # - external if EIGEN_INCLUDE_DIR_HINTS is defined + # - internal if Eigen not found + # ============================================================================== +-find_package(eigen3 QUIET) +-if (NOT eigen3_FOUND) +- set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen) +- set(OpenMVG_USE_INTERNAL_EIGEN ON) +- find_package(Eigen QUIET) +-else() +- set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) +-endif() ++find_package(Eigen3 REQUIRED) ++set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) + + # ============================================================================== + # Ceres +@@ -257,17 +211,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) + # ============================================================================== +-find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS}) +-if (NOT Ceres_FOUND) +- set(OpenMVG_USE_INTERNAL_CERES ON) +- set(CERES_INCLUDE_DIRS +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/include +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/internal/ceres/miniglog +- ${PROJECT_BINARY_DIR}/third_party/ceres-solver/config) +- FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/VERSION" CERES_CONFIG) +- STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG}) +- set(CERES_LIBRARIES openMVG_ceres) +-endif() ++find_package(Ceres REQUIRED) + + # ============================================================================== + # Flann +@@ -275,14 +219,7 @@ endif() + # - internal by default (flann), + # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found + # ============================================================================== +-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) +-endif() +-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() ++find_package(flann REQUIRED) + + # ============================================================================== + # CoinUtils +@@ -290,15 +227,7 @@ endif() + # - internal by default (CoinUtils), + # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found + # ============================================================================== +-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) +-endif() +-find_package(CoinUtils QUIET) +-if (NOT COINUTILS_FOUND OR OpenMVG_USE_INTERNAL_COINUTILS) +- set(COINUTILS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/) +- set(COINUTILS_LIBRARY lib_CoinUtils) +-endif() ++find_package(CoinUtils REQUIRED) + + ## ============================================================================== + ## Clp +@@ -306,17 +235,7 @@ endif() + ## - internal by default (Clp), + ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found + ## ============================================================================== +-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) +-endif() +-find_package(Clp QUIET) +-if (NOT CLP_FOUND OR OpenMVG_USE_INTERNAL_CLP) +- set(CLP_INCLUDE_DIRS +- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/ +- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/OsiClp/) +- set(CLP_LIBRARIES lib_clp lib_OsiClpSolver) +-endif() ++find_package(Clp REQUIRED) + + # ============================================================================== + # Osi +@@ -324,15 +243,7 @@ endif() + # - internal by default (Osi), + # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found + # ============================================================================== +-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) +-endif() +-find_package(Osi QUIET) +-if (NOT OSI_FOUND OR OpenMVG_USE_INTERNAL_OSI) +- set(OSI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/Osi/) +- set(OSI_LIBRARY lib_Osi) +-endif() ++find_package(Osi REQUIRED) + + # ============================================================================== + # Internal CLP/OSI/COINUTILS libraries: +@@ -351,17 +262,7 @@ endif() + # - internal by default (Lemon), + # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found + # ============================================================================== +-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) +-endif() +-find_package(Lemon QUIET) +-if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON) +- set(LEMON_INCLUDE_DIRS +- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon +- ${PROJECT_BINARY_DIR}/third_party/lemon) +- set(LEMON_LIBRARY openMVG_lemon) +-endif() ++find_package(LEMON REQUIRED) + + # ============================================================================== + # OpenCV +@@ -369,14 +270,13 @@ endif() + # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON + # ============================================================================== + if (OpenMVG_USE_OPENCV) +- find_package( OpenCV QUIET ) +- if (NOT OpenCV_FOUND OR OpenCV_VERSION VERSION_LESS "3.0.0") +- message(STATUS "OpenCV was not found (note that OpenCV version >= 3.0.0 is required). -> Disabling OpenCV support.") +- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF) +- UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF) +- endif() ++ find_package( OpenCV REQUIRED ) + endif() + ++# ============================================================================== ++# Suitesparse ++# ============================================================================== ++find_package(suitesparse REQUIRED) + + # ============================================================================== + # Third-party libraries: +@@ -469,67 +369,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) + + message("\n") + +-if (DEFINED OpenMVG_USE_INTERNAL_CEREAL) ++if (OpenMVG_USE_INTERNAL_CEREAL) + message(STATUS "CEREAL: (internal)") + else() + message(STATUS "CEREAL: (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_EIGEN) ++if (OpenMVG_USE_INTERNAL_EIGEN) + message(STATUS "EIGEN: " ${EIGEN_VERSION} " (internal)") + else() + message(STATUS "EIGEN: " ${EIGEN_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_CERES) ++if (OpenMVG_USE_INTERNAL_CERES) + message(STATUS "CERES: " ${CERES_VERSION} " (internal)") + else() + message(STATUS "CERES: " ${CERES_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (OpenMVG_USE_INTERNAL_FLANN) + message(STATUS "FLANN: " ${FLANN_VERSION} " (internal)") + else() + message(STATUS "FLANN: " ${FLANN_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_TIFF) ++if (OpenMVG_USE_INTERNAL_TIFF) + message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (internal)") + else() + message(STATUS "LIBTIFF: " ${TIFF_VERSION_STRING} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_PNG) ++if (OpenMVG_USE_INTERNAL_PNG) + message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (internal)") + else() + message(STATUS "LIBPNG: " ${PNG_VERSION_STRING} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_JPEG) ++if (OpenMVG_USE_INTERNAL_JPEG) + message(STATUS "LIBJPEG (internal)") + else() + message(STATUS "LIBJPEG (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_CLP) ++if (OpenMVG_USE_INTERNAL_CLP) + message(STATUS "CLP: " ${CLP_VERSION} " (internal)") + else() + message(STATUS "CLP: " ${CLP_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_COINUTILS) ++if (OpenMVG_USE_INTERNAL_COINUTILS) + message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (internal)") + else() + message(STATUS "COINUTILS: " ${COINUTILS_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_OSI) ++if (OpenMVG_USE_INTERNAL_OSI) + message(STATUS "OSI: " ${OSI_VERSION} " (internal)") + else() + message(STATUS "OSI: " ${OSI_VERSION} " (external)") + endif() + +-if (DEFINED OpenMVG_USE_INTERNAL_LEMON) ++if (OpenMVG_USE_INTERNAL_LEMON) + message(STATUS "LEMON: " ${LEMON_VERSION} " (internal)") + else() + message(STATUS "LEMON: " ${LEMON_VERSION} " (external)") +diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake +index c997b87..74c3aae 100644 +--- a/src/cmakeFindModules/FindClp.cmake ++++ b/src/cmakeFindModules/FindClp.cmake +@@ -51,8 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "") + SET(CLP_INCLUDE_DIR ${CLP_DIR}) + + 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) + + # locate Clp libraries + IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY) +diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt +index cc5212f..acc57dd 100644 +--- a/src/openMVG/linearProgramming/CMakeLists.txt ++++ b/src/openMVG/linearProgramming/CMakeLists.txt +@@ -15,16 +15,12 @@ target_link_libraries(openMVG_linearProgramming + PUBLIC + openMVG_numeric + PRIVATE +- ${CLP_LIBRARIES} # clp + solver wrapper +- ${COINUTILS_LIBRARY} # container tools +- ${OSI_LIBRARY} # generic LP ++ Coin::Clp # clp + solver wrapper ++ Coin::CoinUtils # container tools ++ Coin::Osi # generic LP + ) + + target_include_directories(openMVG_linearProgramming +- PRIVATE +- ${CLP_INCLUDE_DIRS} +- ${COINUTILS_INCLUDE_DIRS} +- ${OSI_INCLUDE_DIRS} + PUBLIC + $<INSTALL_INTERFACE:include> + ) +diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt +index 80b1fe6..a091b47 100644 +--- a/src/openMVG/matching/CMakeLists.txt ++++ b/src/openMVG/matching/CMakeLists.txt +@@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST}) + + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) ++find_package(flann REQUIRED) + + set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX) + add_library(openMVG_matching +@@ -38,10 +39,10 @@ target_link_libraries(openMVG_matching + openMVG_features + Threads::Threads + ) +-if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (NOT OpenMVG_USE_INTERNAL_FLANN) + target_link_libraries(openMVG_matching + PUBLIC +- ${FLANN_LIBRARIES} ++ flann::flann + ) + endif() + set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") +diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt +index 816a941..f0b7145 100644 +--- a/src/third_party/CMakeLists.txt ++++ b/src/third_party/CMakeLists.txt +@@ -18,7 +18,7 @@ add_subdirectory(stlplus3) + set(STLPLUS_LIBRARY openMVG_stlplus PARENT_SCOPE) + + # Add graph library +-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) + add_subdirectory(vectorGraphics) + + # Add ceres-solver (A Nonlinear Least Squares Minimizer) +-if (DEFINED OpenMVG_USE_INTERNAL_CERES) ++if (OpenMVG_USE_INTERNAL_CERES) + 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) + endif() + + # Add an Approximate Nearest Neighbor library +-if (DEFINED OpenMVG_USE_INTERNAL_FLANN) ++if (OpenMVG_USE_INTERNAL_FLANN) + 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) + ## + # 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) + add_subdirectory(eigen) diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake index 26480bb3d..a5dea72fa 100644 --- a/ports/openmvg/portfile.cmake +++ b/ports/openmvg/portfile.cmake @@ -1,109 +1,103 @@ -# Common Ambient Variables:
-# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
-# PORT = current port name (zlib, etc)
-# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
-# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
-# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
-# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
-# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
-include(vcpkg_common_functions)
-
-string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
-if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
- message(WARNING "Openmvg's buildsystem uses very long paths and may fail on your system.\n"
- "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
- )
-endif()
-
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO openMVG/openMVG
- REF v1.4
- SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a
-)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR} fixcmake.patch)
-
-
-# remove some deps to prevent conflict
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/cxsparse)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/eigen)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/flann)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/jpeg)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/lemon)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/png)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/tiff)
-file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/zlib)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- set(OpenMVG_BUILD_SHARED ON)
-else()
- set(OpenMVG_BUILD_SHARED OFF)
-endif()
-
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}/src
- # PREFER_NINJA # Disable this option if project cannot be built with Ninja
- # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
- OPTIONS
- -DOpenMVG_BUILD_SHARED=${OpenMVG_BUILD_SHARED}
- -DOpenMVG_BUILD_DOC=OFF
- -DOpenMVG_BUILD_EXAMPLES=OFF
- -DOpenMVG_BUILD_SOFTWARES=OFF
- -DOpenMVG_BUILD_GUI_SOFTWARES=OFF
- # TODO, use packgeconfig.cmake file instead
- -DEIGEN_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/
- -DCERES_DIR_HINTS=${CURRENT_INSTALLED_DIR}/ceres
- -DFLANN_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/flann
- -DLEMON_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/lemon
- -DCOINUTILS_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin
- -DCLP_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin
- -DOSI_INCLUDE_DIR_HINTS=${CURRENT_INSTALLED_DIR}/include/coin
- -DOpenMVG_USE_INTERNAL_CLP=OFF
- -DOpenMVG_USE_INTERNAL_COINUTILS=OFF
- -DOpenMVG_USE_INTERNAL_OSI=OFF
- -DOpenMVG_USE_INTERNAL_EIGEN=OFF
- -DOpenMVG_USE_INTERNAL_CEREAL=OFF
- -DOpenMVG_USE_INTERNAL_CERES=OFF
- -DOpenMVG_USE_INTERNAL_FLANN=OFF
- -DTARGET_ARCHITECTURE=core # disable instruction like avx
- # OPTIONS_RELEASE -DOPTIMIZE=1
- OPTIONS_RELEASE
- -DFLANN_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/flann_cpp.lib
- OPTIONS_DEBUG
- -DFLANN_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/flann_cpp-gd.lib
-)
-
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/openMVG/cmake")
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data)
-file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/lib/*.cmake)
-file(REMOVE_RECURSE ${REMOVE_CMAKE})
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-if(OpenMVG_BUILD_SHARED)
- # release
- file(GLOB DLL_FILES ${CURRENT_PACKAGES_DIR}/lib/*.dll)
- file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
- file(REMOVE_RECURSE ${DLL_FILES})
- # 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})
-endif()
-vcpkg_copy_pdbs()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvg RENAME copyright)
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME openmvg)
+include(vcpkg_common_functions) + +string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) +if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" + "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." + ) +endif() + +#the port produces some empty dlls when building shared libraries, since some components do not export anything, breaking the internal build itself +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openMVG/openMVG + REF v1.4 + SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a + PATCHES + fixcmake.patch +) + +set(ENABLE_OPENCV OFF) +if("opencv" IN_LIST FEATURES) + set(ENABLE_OPENCV ON) +endif() + +set(ENABLE_OPENMP OFF) +if("openmp" IN_LIST FEATURES) + set(ENABLE_OPENMP ON) +endif() + +# remove some deps to prevent conflict +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/cxsparse) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/eigen) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/flann) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/jpeg) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/lemon) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/png) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/tiff) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/zlib) + +# remove some cmake modules to force using our configs +file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindLemon.cmake) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindFlann.cmake) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindCoinUtils.cmake) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake) +file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/src + PREFER_NINJA + OPTIONS + -DOpenMVG_BUILD_SHARED=OFF + -DOpenMVG_BUILD_TESTS=OFF + -DOpenMVG_BUILD_DOC=OFF + -DOpenMVG_BUILD_EXAMPLES=OFF + -DOpenMVG_BUILD_OPENGL_EXAMPLES=OFF + -DOpenMVG_BUILD_SOFTWARES=OFF + -DOpenMVG_BUILD_GUI_SOFTWARES=OFF + -DOpenMVG_BUILD_COVERAGE=OFF + -DOpenMVG_USE_OPENMP=${ENABLE_OPENMP} + -DOpenMVG_USE_OPENCV=${ENABLE_OPENCV} + -DOpenMVG_USE_OCVSIFT=${ENABLE_OPENCV} + -DOpenMVG_USE_INTERNAL_CLP=OFF + -DOpenMVG_USE_INTERNAL_COINUTILS=OFF + -DOpenMVG_USE_INTERNAL_OSI=OFF + -DOpenMVG_USE_INTERNAL_EIGEN=OFF + -DOpenMVG_USE_INTERNAL_CEREAL=OFF + -DOpenMVG_USE_INTERNAL_CERES=OFF + -DOpenMVG_USE_INTERNAL_FLANN=OFF + -DOpenMVG_USE_INTERNAL_LEMON=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/openMVG/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +#remove extra deprecated cmake target files left in unappropriate folders +file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/lib/*.cmake) +file(REMOVE_RECURSE ${REMOVE_CMAKE}) +file(GLOB REMOVE_CMAKE ${CURRENT_PACKAGES_DIR}/debug/lib/*.cmake) +file(REMOVE_RECURSE ${REMOVE_CMAKE}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data) + +if(OpenMVG_BUILD_SHARED) + # release + file(GLOB DLL_FILES ${CURRENT_PACKAGES_DIR}/lib/*.dll) + file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${DLL_FILES}) + # 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}) +endif() +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvg RENAME copyright) diff --git a/ports/openmvs/CONTROL b/ports/openmvs/CONTROL new file mode 100644 index 000000000..6cbbe4119 --- /dev/null +++ b/ports/openmvs/CONTROL @@ -0,0 +1,4 @@ +Source: openmvs +Version: 1.0-1 +Description: OpenMVS: open Multi-View Stereo reconstruction library +Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, ceres, opencv, cgal[core], glew, glfw3, vcglib diff --git a/ports/openmvs/glfw3_target_compat.patch b/ports/openmvs/glfw3_target_compat.patch new file mode 100644 index 000000000..85cbb5490 --- /dev/null +++ b/ports/openmvs/glfw3_target_compat.patch @@ -0,0 +1,43 @@ +diff --git a/apps/Viewer/CMakeLists.txt b/apps/Viewer/CMakeLists.txt +index f1690a6..78466cd 100644 +--- a/apps/Viewer/CMakeLists.txt ++++ b/apps/Viewer/CMakeLists.txt +@@ -16,28 +16,7 @@ else() + MESSAGE("-- Can't find GLEW. Continuing without it.") + RETURN() + endif() +-if(CMAKE_COMPILER_IS_GNUCXX) +- FIND_PACKAGE(PkgConfig QUIET) +- pkg_search_module(GLFW QUIET glfw3) +- if(GLFW_FOUND) +- INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS}) +- ADD_DEFINITIONS(${GLFW_DEFINITIONS}) +- MESSAGE(STATUS "GLFW3 ${GLFW_VERSION} found (include: ${GLFW_INCLUDE_DIRS})") +- else() +- MESSAGE("-- Can't find GLFW3. Continuing without it.") +- RETURN() +- endif() +-else() +- FIND_PACKAGE(glfw3 QUIET) +- if(glfw3_FOUND) +- INCLUDE_DIRECTORIES(${glfw3_INCLUDE_DIRS}) +- ADD_DEFINITIONS(${glfw3_DEFINITIONS}) +- MESSAGE(STATUS "GLFW3 ${glfw3_VERSION} found (include: ${glfw3_INCLUDE_DIRS})") +- else() +- MESSAGE("-- Can't find GLFW3. Continuing without it.") +- RETURN() +- endif() +-endif() ++FIND_PACKAGE(glfw3 REQUIRED) + + # List sources files + FILE(GLOB PCH_C "Common.cpp") +@@ -54,7 +33,7 @@ FILE(GLOB LIBRARY_FILES_H "*.h" "*.inl") + LIST(REMOVE_ITEM LIBRARY_FILES_C ${PCH_C}) + SET(LIBRARY_FILES_C "${PCH_C};${LIBRARY_FILES_C}") + +-cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};${GLFW_STATIC_LIBRARIES};GLEW::GLEW;${glfw3_LIBRARY};${GLFW3_LIBRARY};glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H}) ++cxx_executable_with_flags_no_pch(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;${OPENGL_LIBRARIES};${GLEW_LIBRARY};GLEW::GLEW;glfw" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H}) + + # Manually set Common.h as the precompiled header + set_target_pch(${VIEWER_NAME} Common.h) diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake new file mode 100644 index 000000000..97f789383 --- /dev/null +++ b/ports/openmvs/portfile.cmake @@ -0,0 +1,68 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cdcseacave/openMVS + REF v1.0 + SHA512 d5743660286068d2ec9e80b8cfdf1dd612d76f12f1f10c95d32bab55ae65032a200d820f2c76e4781068c61597e2533df8755fd5d9076d3aac9223134eb5b561 + HEAD_REF master + PATCHES + glfw3_target_compat.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +else() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/OpenMVS) +endif() + +#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it +if(CMAKE_HOST_WIN32) +set(EXECUTABLE_SUFFIX ".exe") +else() +set(EXECUTABLE_SUFFIX "") +endif() + +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX}) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX}) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openmvs/) +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/DensifyPointCloud${EXECUTABLE_SUFFIX}) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceCOLMAP${EXECUTABLE_SUFFIX}) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceVisualSFM${EXECUTABLE_SUFFIX}) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/ReconstructMesh${EXECUTABLE_SUFFIX}) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/RefineMesh${EXECUTABLE_SUFFIX}) +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX}") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/TextureMesh${EXECUTABLE_SUFFIX}) +endif() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openmvs) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvs RENAME copyright) diff --git a/ports/openni2/CONTROL b/ports/openni2/CONTROL index d7e75fb7d..9dca0b47a 100644 --- a/ports/openni2/CONTROL +++ b/ports/openni2/CONTROL @@ -1,4 +1,5 @@ Source: openni2
-Version: 2.2.0.33-8
+Version: 2.2.0.33-9
Build-Depends: kinectsdk1
+Homepage: https://github.com/OpenNI/OpenNI2
Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.
diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake index 8ef2514b3..d5be0e3d4 100644 --- a/ports/openni2/portfile.cmake +++ b/ports/openni2/portfile.cmake @@ -46,7 +46,7 @@ endif() set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include") set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release") set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug") -set(SOURCE_CONFIG_PATH "${SOURCE_PATH}/Config") +set(SOURCE_CONFIG_PATH ${SOURCE_PATH}/Config) set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty") file( diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake index b0064cdf4..03e358b4b 100644 --- a/ports/openssl-unix/portfile.cmake +++ b/ports/openssl-unix/portfile.cmake @@ -1,8 +1,15 @@ +include(vcpkg_common_functions) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) message(FATAL_ERROR "This port is only for openssl on Unix-like systems") endif() -include(vcpkg_common_functions) +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") + message(WARNING "Can't build openssl if libressl is installed. Please remove libressl, and try install openssl again if you need it. Build will continue but there might be problems since libressl is only a subset of openssl") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + set(OPENSSL_VERSION 1.0.2q) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index c10ca99d3..aa0348e0b 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,3 +1,3 @@ Source: openssl-uwp -Version: 1.0.2q-winrt-2 +Version: 1.0.2r 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. diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index 45ecdbc34..239f98d2b 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -1,13 +1,21 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - if (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "This portfile only supports UWP") endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") + message(WARNING "Can't build openssl if libressl is installed. Please remove libressl, and try install openssl again if you need it. Build will continue but there might be problems since libressl is only a subset of openssl") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") set(UWP_PLATFORM "arm") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(UWP_PLATFORM "arm64") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(UWP_PLATFORM "x64") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") @@ -25,8 +33,8 @@ set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/openssl - REF OpenSSL_1_0_2q_WinRT - SHA512 a5deb38d8ac3d2dc5cfcefca74ef1b6bb913fb2a205163e26100f8714b567768e2699948d6a2ec3ebdbf8c72bfbf8ccfe0e574a1d20a2a736b64e9d69ca9b719 + REF OpenSSL_1_0_2r_WinRT + SHA512 3045693fca4b042b69675f6164d8cc82106582cf31081d65a0adbd528f04e77fa48b3761f3be7bdf8ab962a093b28fec0ae6d7da02058f2b049f79b784c39c2e HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-rs4.patch diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index 4331c2eab..856e0979e 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -1,31 +1,37 @@ +include(vcpkg_common_functions) + if(VCPKG_CMAKE_SYSTEM_NAME) message(FATAL_ERROR "This port is only for building openssl on Windows Desktop") endif() -include(vcpkg_common_functions) +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") + message(WARNING "Can't build openssl if libressl is installed. Please remove libressl, and try install openssl again if you need it. Build will continue but there might be problems since libressl is only a subset of openssl") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + set(OPENSSL_VERSION 1.0.2q) -set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION}) -vcpkg_find_acquire_program(PERL) +vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") -vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE +vcpkg_download_distfile(ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0 ) -vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${MASTER_COPY_SOURCE_PATH} - PATCHES - ConfigureIncludeQuotesFix.patch - STRINGIFYPatch.patch - EnableWinARM32.patch - EmbedSymbolsInStaticLibsZ7.patch - EnableWinARM64.patch +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + ConfigureIncludeQuotesFix.patch + STRINGIFYPatch.patch + EnableWinARM32.patch + EmbedSymbolsInStaticLibsZ7.patch + EnableWinARM64.patch ) vcpkg_find_acquire_program(NASM) @@ -75,8 +81,16 @@ file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BU if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-${OPENSSL_VERSION}) + + # Copy openssl sources. + message(STATUS "Copying openssl release source files...") + file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) + foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + endforeach() + message(STATUS "Copying openssl release source files... done") + set(SOURCE_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR}) message(STATUS "Configure ${TARGET_TRIPLET}-rel") @@ -112,11 +126,18 @@ endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Configure ${TARGET_TRIPLET}-dbg") - file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/openssl-${OPENSSL_VERSION}) + # Copy openssl sources. + message(STATUS "Copying openssl debug source files...") + file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) + foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + endforeach() + message(STATUS "Copying openssl debug source files... done") + set(SOURCE_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug) + message(STATUS "Configure ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} @@ -175,6 +196,6 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}") vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${MASTER_COPY_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_test_cmake(PACKAGE_NAME OpenSSL MODULE) diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 4d81a1962..b495ce0c3 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,4 +1,5 @@ Source: openssl -Version: 0 +Version: 1 +Homepage: https://www.openssl.org 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. Build-Depends: openssl-windows (windows), openssl-uwp (uwp), openssl-unix (!uwp&!windows) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 3d55c367f..4d25eff6b 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,2 +1,4 @@ +include(vcpkg_common_functions) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl/) diff --git a/ports/opentracing/CONTROL b/ports/opentracing/CONTROL index 293dd179c..62f6dd303 100644 --- a/ports/opentracing/CONTROL +++ b/ports/opentracing/CONTROL @@ -1,3 +1,4 @@ Source: opentracing
-Version: 1.5.1
-Description: C++ implementation of the OpenTracing API http://opentracing.io
+Version: 1.5.1-1
+Description: C++ implementation of the OpenTracing API
+Homepage: https://opentracing.io
diff --git a/ports/opentracing/portfile.cmake b/ports/opentracing/portfile.cmake index cf82ddbf6..595faf1cf 100644 --- a/ports/opentracing/portfile.cmake +++ b/ports/opentracing/portfile.cmake @@ -5,9 +5,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- set( LOCAL_OPTIONS
- -DBUILD_STATIC_LIBS=OFF
- )
+ set( LOCAL_OPTIONS
+ -DBUILD_STATIC_LIBS=OFF
+ )
else()
message("Static building is only possible when compiling static and dynamic versions at the same time. Enabling both.")
set(VCPKG_LIBRARY_LINKAGE dynamic)
@@ -23,37 +23,36 @@ vcpkg_from_github( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS
- ${OPTIONS}
- ${LOCAL_OPTIONS}
+ OPTIONS
+ ${OPTIONS}
+ ${LOCAL_OPTIONS}
)
vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenTracing")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenTracing)
vcpkg_copy_pdbs()
# Move DLLs to /bin
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME)
- if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/bin/opentracing.dll)
-
- file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
- file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/debug/bin/opentracing.dll)
-
- # Fix targets
- file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake RELEASE_CONFIG)
- string(REPLACE "\${_IMPORT_PREFIX}/lib/opentracing.dll"
- "\${_IMPORT_PREFIX}/bin/opentracing.dll" RELEASE_CONFIG ${RELEASE_CONFIG})
- file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake "${RELEASE_CONFIG}")
-
- file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake DEBUG_CONFIG)
- string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/opentracing.dll"
- "\${_IMPORT_PREFIX}/debug/bin/opentracing.dll" DEBUG_CONFIG ${DEBUG_CONFIG})
- file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake "${DEBUG_CONFIG}")
- endif()
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/bin/opentracing.dll)
+
+ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/opentracing.dll ${CURRENT_PACKAGES_DIR}/debug/bin/opentracing.dll)
+
+ # Fix targets
+ file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake RELEASE_CONFIG)
+ string(REPLACE "\${_IMPORT_PREFIX}/lib/opentracing.dll"
+ "\${_IMPORT_PREFIX}/bin/opentracing.dll" RELEASE_CONFIG ${RELEASE_CONFIG})
+ file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-release.cmake "${RELEASE_CONFIG}")
+
+ file(READ ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake DEBUG_CONFIG)
+ string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/opentracing.dll"
+ "\${_IMPORT_PREFIX}/debug/bin/opentracing.dll" DEBUG_CONFIG ${DEBUG_CONFIG})
+ file(WRITE ${CURRENT_PACKAGES_DIR}/share/opentracing/OpenTracingTargets-debug.cmake "${DEBUG_CONFIG}")
+ endif()
endif()
# Handle copyright
diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL index b2db99e4c..77a06c78c 100644 --- a/ports/openvdb/CONTROL +++ b/ports/openvdb/CONTROL @@ -1,6 +1,7 @@ Source: openvdb -Version: 6.0.0-1 +Version: 6.0.0-2 Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess +Homepage: https://github.com/dreamworksanimation/openvdb Description: Sparse volume data structure and tools Feature: tools diff --git a/ports/openvdb/blosc.patch b/ports/openvdb/blosc.patch new file mode 100644 index 000000000..2b9782a1b --- /dev/null +++ b/ports/openvdb/blosc.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake +index 5ac3780c..61ba83bc 100644 +--- a/cmake/FindBlosc.cmake ++++ b/cmake/FindBlosc.cmake +@@ -45,8 +45,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc +
+ IF ( BLOSC_FOUND )
+
+- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
+- CACHE STRING "Blosc library directories")
++# SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
++# CACHE STRING "Blosc library directories")
+
+ SET ( _blosc_library_name "blosc" )
+
+@@ -61,8 +61,6 @@ IF ( BLOSC_FOUND ) + ENDIF()
+
+ FIND_LIBRARY ( BLOSC_blosc_LIBRARY ${_blosc_library_name}
+- PATHS ${BLOSC_LIBRARYDIR}
+- NO_DEFAULT_PATH
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+
diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 5b24e7600..d1c4cb8ce 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( 0002-add-custom-options.patch 0003-build-only-necessary-targets.patch 0004-add-necessary-head.patch + blosc.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/openvpn3/CMakeLists.txt b/ports/openvpn3/CMakeLists.txt index fcbe85794..70ec99858 100644 --- a/ports/openvpn3/CMakeLists.txt +++ b/ports/openvpn3/CMakeLists.txt @@ -8,6 +8,10 @@ find_library(MBEDX509_LIB mbedx509) include_directories(. ${ASIO_HPP})
+if(WIN32)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+endif()
+
add_definitions(-DNOMINMAX -DUSE_ASIO -DUSE_MBEDTLS)
add_library(ovpncli client/ovpncli.cpp)
diff --git a/ports/openvpn3/CONTROL b/ports/openvpn3/CONTROL index 09264a192..3b8899f18 100644 --- a/ports/openvpn3/CONTROL +++ b/ports/openvpn3/CONTROL @@ -1,4 +1,4 @@ Source: openvpn3 -Version: 2018-03-21 +Version: 2018-03-21-1 Build-Depends: asio, tap-windows6 (windows), mbedtls Description: a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch. diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL index dbbe6f4c9..6e43972bf 100644 --- a/ports/openvr/CONTROL +++ b/ports/openvr/CONTROL @@ -1,3 +1,4 @@ Source: openvr -Version: 1.1.3b +Version: 1.4.18 +Homepage: https://github.com/ValveSoftware/openvr 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. diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 2bc15f368..ca2902f50 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/openvr - REF v1.1.3b - SHA512 03d9f61e8a2fee6bed02e087b20ccdc281a06dcbb151afe07a072b8758d56d7f4bed7a5dd8eccd43166c8fac6536930c0e4e81a8deaa081e635fd99a304fc565 + REF 02bc73b9bcfe9cc2d2802bd5fdc91f724de8ef10 + SHA512 5b0b954b09570dcf72f0340d6bcc0a5ba9e754babf33aaee35c9d45ce08f5256643692705b014b8c94b098b554e7882a837cf6a2c25e946e6bc69ba3b9db0ede HEAD_REF master ) diff --git a/ports/optional-bare/CONTROL b/ports/optional-bare/CONTROL new file mode 100644 index 000000000..0c9fe1411 --- /dev/null +++ b/ports/optional-bare/CONTROL @@ -0,0 +1,3 @@ +Source: optional-bare
+Version: 1.1.0
+Description: A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library
diff --git a/ports/optional-bare/portfile.cmake b/ports/optional-bare/portfile.cmake new file mode 100644 index 000000000..6474d81c7 --- /dev/null +++ b/ports/optional-bare/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/optional-bare
+ REF v1.1.0
+ SHA512 0eed103c4e909991b596c0cd23d6206662e3ca71cd8148e27c19d8e071c2a16e18cc940a6cd4f8571510f5e64577157f94c561fb889330bb7a868af64c2f3aa0
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DOPTIONAL_BARE_OPT_BUILD_TESTS=OFF
+ -DOPTIONAL_BARE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/optional-lite/CONTROL b/ports/optional-lite/CONTROL new file mode 100644 index 000000000..076a05640 --- /dev/null +++ b/ports/optional-lite/CONTROL @@ -0,0 +1,3 @@ +Source: optional-lite
+Version: 3.2.0
+Description: A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/optional-lite/portfile.cmake b/ports/optional-lite/portfile.cmake new file mode 100644 index 000000000..1716c89ad --- /dev/null +++ b/ports/optional-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/optional-lite
+ REF v3.2.0
+ SHA512 7c3f93dc718953118ab18edb55f6c8dc1555febb6ee491d3f7df4a8d06aba245bbfba31883a711995bb6b8d6de9f44c805cbba44b9e322f3bb5c3272106f66ec
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DOPTIONAL_LITE_OPT_BUILD_TESTS=OFF
+ -DOPTIONAL_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL index 4314774ab..c7b8d246f 100644 --- a/ports/opus/CONTROL +++ b/ports/opus/CONTROL @@ -1,3 +1,4 @@ Source: opus Version: 1.3.1 +Homepage: https://github.com/xiph/opus Description: Totally open, royalty-free, highly versatile audio codec diff --git a/ports/opusfile/CMakeLists.txt b/ports/opusfile/CMakeLists.txt index c70ea98bc..ecef1d01f 100644 --- a/ports/opusfile/CMakeLists.txt +++ b/ports/opusfile/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 3.4) project(opusfile C) +if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4267 /wd4244 /wd4090") +endif() find_path(OGG_INCLUDE_DIR ogg/ogg.h) find_library(OGG_LIBRARY ogg) diff --git a/ports/opusfile/CONTROL b/ports/opusfile/CONTROL index 65f6bada7..0ba3167a6 100644 --- a/ports/opusfile/CONTROL +++ b/ports/opusfile/CONTROL @@ -1,5 +1,6 @@ Source: opusfile
-Version: 0.11-2
+Version: 0.11-3
+Homepage: https://github.com/xiph/opusfile
Description: Stand-alone decoder library for .opus streams
Build-Depends: libogg, opus
diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL index 1cb8967ed..4cb08a814 100644 --- a/ports/orc/CONTROL +++ b/ports/orc/CONTROL @@ -1,4 +1,4 @@ Source: orc -Version: 1.5.5 +Version: 1.5.5-1 Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest Description: The smallest, fastest columnar storage for Hadoop workloads. diff --git a/ports/orc/no-werror.patch b/ports/orc/no-werror.patch new file mode 100644 index 000000000..d2572612f --- /dev/null +++ b/ports/orc/no-werror.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4484e373..87b5ed41 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -81,9 +81,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-covered-switch-default") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-missing-noreturn -Wno-unknown-pragmas") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") +- set (WARN_FLAGS "${WARN_FLAGS} -Wconversion -Werror") ++ set (WARN_FLAGS "${WARN_FLAGS} -Wconversion") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion -Werror") ++ set (WARN_FLAGS "-Wall -Wno-unknown-pragmas -Wconversion") + if (CMAKE_CXX_COMPILER_VERSION STREQUAL "" OR + CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") + set (CXX11_FLAGS "-std=c++0x") diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index e72f9fd69..f993755e9 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( HEAD_REF master PATCHES 0003-dependencies-from-vcpkg.patch - ) + no-werror.patch +) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") file(REMOVE "${SOURCE_PATH}/cmake_modules/FindLZ4.cmake") diff --git a/ports/orocos-kdl/CONTROL b/ports/orocos-kdl/CONTROL index af590b4b3..983219ca0 100644 --- a/ports/orocos-kdl/CONTROL +++ b/ports/orocos-kdl/CONTROL @@ -1,4 +1,4 @@ Source: orocos-kdl
-Version: 1.4
+Version: 1.4-1
Description: Kinematics and Dynamics Library
Build-Depends: eigen3
diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index 622a9da93..58e28a045 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -30,14 +30,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/orocos_kdl/cmake" TARGET_PATH share/orocos_kdl)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/orocos_kdl/cmake TARGET_PATH share/orocos_kdl)
-file(REMOVE_RECURSE
+file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share
${CURRENT_PACKAGES_DIR}/share/doc
${CURRENT_PACKAGES_DIR}/doc/liborocos-kdl)
-
+
# Handle copyright
diff --git a/ports/osg-qt/CONTROL b/ports/osg-qt/CONTROL index f1b20deb9..acc5db392 100644 --- a/ports/osg-qt/CONTROL +++ b/ports/osg-qt/CONTROL @@ -1,4 +1,4 @@ Source: osg-qt
-Version: 3.5.7
+Version: Qt4 Description: osgQt - Qt project for making use of OpenSceneGraph(OSG)
Build-Depends: osg, protobuf, qt5-base
\ No newline at end of file diff --git a/ports/osg-qt/portfile.cmake b/ports/osg-qt/portfile.cmake index aed06665c..1ab23e63f 100644 --- a/ports/osg-qt/portfile.cmake +++ b/ports/osg-qt/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO openscenegraph/osgQt
- REF 6d324db8a56feb7d1976e9fb3f1de9bf7d255646
- SHA512 6c6c0220de1b2314bc0e8ba149ef794229e0858914014dab91d577965acb19925dd64b8ee08add7b77f9353951ccf18f8e80b648509f894f3c2aaa08204b7625
+ REF Qt4 + SHA512 426a4ba88f680978d24817248b99c68cafa4517144e6e3d2480612870c4a224bb955539cacb438274d4ee1c93c36d94f8437d142070b2ecde2b81517bf357e71
HEAD_REF master
)
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index 421e96a9d..9b981af9d 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,5 +1,6 @@ Source: osg -Version: 3.6.2-2 +Version: 3.6.3-1 +Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. Build-Depends: freetype, jasper, openexr, zlib, gdal, giflib, libjpeg-turbo, libpng, tiff diff --git a/ports/osg/collada.patch b/ports/osg/collada.patch index 7c856c86d..9787b7f5c 100644 --- a/ports/osg/collada.patch +++ b/ports/osg/collada.patch @@ -59,6 +59,103 @@ index 8c9c2fc33..6a8ab04ca 100644 )
FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
+@@ -15,6 +15,8 @@
+
+
+ # Check if COLLADA_DIR is set, otherwise use ACTUAL_3DPARTY_DIR:
++include(SelectLibraryConfigurations)
++
+ SET( COLLADA_ENV_VAR_AVAILABLE $ENV{COLLADA_DIR} )
+ IF ( COLLADA_ENV_VAR_AVAILABLE )
+ SET(COLLADA_DOM_ROOT "$ENV{COLLADA_DIR}/dom" CACHE PATH "Location of Collada DOM directory" FORCE)
+@@ -192,31 +194,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+ ENDIF(WIN32)
+ ENDIF(LIBXML2_FOUND)
+
+- FIND_PACKAGE(ZLIB)
+- IF (ZLIB_FOUND)
+- IF (ZLIB_LIBRARY_RELEASE)
+- SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY_RELEASE}" CACHE FILEPATH "" FORCE)
+- ELSE(ZLIB_LIBRARY_RELEASE)
+- SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
+- ENDIF(ZLIB_LIBRARY_RELEASE)
+- IF (ZLIB_LIBRARY_DEBUG)
+- SET(COLLADA_ZLIB_LIBRARY_DEBUG "${ZLIB_LIBRARY_DEBUG}" CACHE FILEPATH "" FORCE)
+- ELSE(ZLIB_LIBRARY_DEBUG)
+- SET(COLLADA_ZLIB_LIBRARY_DEBUG "${COLLADA_ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
+- ENDIF(ZLIB_LIBRARY_DEBUG)
+- ELSE(ZLIB_FOUND)
+- IF(WIN32)
+- FIND_LIBRARY(COLLADA_ZLIB_LIBRARY
+- NAMES zlib
+- PATHS
+- ${COLLADA_DOM_ROOT}/external-libs/libxml2/win32/lib
+- ${COLLADA_DOM_ROOT}/external-libs/libxml2/mingw/lib
+- ${ACTUAL_3DPARTY_DIR}/lib
+- )
+- ENDIF(WIN32)
+- ENDIF(ZLIB_FOUND)
++ FIND_PACKAGE(ZLIB REQUIRED)
+
+- FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY
++ FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY_RELEASE
+ NAMES pcrecpp
+ PATHS
+ ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+@@ -233,8 +213,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+ ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+ ${ACTUAL_3DPARTY_DIR}/lib
+ )
++ select_library_configurations(COLLADA_PCRECPP)
+
+- FIND_LIBRARY(COLLADA_PCRE_LIBRARY
++ FIND_LIBRARY(COLLADA_PCRE_LIBRARY_RELEASE
+ NAMES pcre
+ PATHS
+ ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/${COLLADA_BUILDNAME}
+@@ -251,8 +232,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+ ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
+ ${ACTUAL_3DPARTY_DIR}/lib
+ )
++ select_library_configurations(COLLADA_PCRE)
+
+- FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY
++ FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY_RELEASE
+ NAMES minizip
+ PATHS
+ ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
+@@ -267,8 +249,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+ ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
+ ${ACTUAL_3DPARTY_DIR}/lib
+ )
+-
+- FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
++ select_library_configurations(COLLADA_MINIZIP)
++
++ FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_RELEASE
+ NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63
+ PATHS
+ ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+@@ -283,8 +266,9 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+ ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+ ${ACTUAL_3DPARTY_DIR}/lib
+ )
++ select_library_configurations(COLLADA_BOOST_FILESYSTEM)
+
+- FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
++ FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_RELEASE
+ NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63
+ PATHS
+ ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
+@@ -299,7 +283,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
+ ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
+ ${ACTUAL_3DPARTY_DIR}/lib
+ )
+-
++ select_library_configurations(COLLADA_BOOST_SYSTEM_LIBRARY)
+
+ SET(COLLADA_FOUND "NO")
+ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt
index af03fb866..7eadfc2f3 100644
--- a/src/osgPlugins/dae/CMakeLists.txt
diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 9b70cce14..cb759ca1a 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openscenegraph/OpenSceneGraph - REF OpenSceneGraph-3.6.2 - SHA512 6949dd4dea9dcffe4228086b72eafdb253bf1403b3b7a70a4727848c3cde23ad0270f41b1c3e2bdbfd410ec067ecce2052a5d26c61b032b6d46ce84b8c931bfb + REF OpenSceneGraph-3.6.3 + SHA512 5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322 HEAD_REF master PATCHES collada.patch @@ -17,7 +17,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") else() set(OSG_DYNAMIC ON) endif() - +file(REMOVE ${SOURCE_PATH}/CMakeModules/FindSDL2.cmake) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -38,12 +38,12 @@ file(REMOVE_RECURSE ${OSG_TOOLS}) file(GLOB OSG_TOOLS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(REMOVE_RECURSE ${OSG_TOOLS_DBG}) -file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.2/*.dll) -file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.6.2) -file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.2/*.dll) -file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.6.2) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.2/) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.2/) +file(GLOB OSG_PLUGINS_DBG ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.3/*.dll) +file(COPY ${OSG_PLUGINS_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/osg/osgPlugins-3.6.3) +file(GLOB OSG_PLUGINS_REL ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.3/*.dll) +file(COPY ${OSG_PLUGINS_REL} DESTINATION ${OSG_TOOL_PATH}/osgPlugins-3.6.3) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/osgPlugins-3.6.3/) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-3.6.3/) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/osg) diff --git a/ports/osgearth/CONTROL b/ports/osgearth/CONTROL index f056caf33..c46d03451 100644 --- a/ports/osgearth/CONTROL +++ b/ports/osgearth/CONTROL @@ -1,4 +1,4 @@ Source: osgearth
-Version: 2.10-1
+Version: 2.10.1 Description: osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.
Build-Depends: osg
diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 798b0df85..6bc95df7c 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -19,8 +19,8 @@ vcpkg_download_distfile( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF osgearth-2.10 - SHA512 ba742f4fc8dbbdaee65e413d477b713cad8da313a1dc68327997359aca88dadc871b03ad4b09172e3e048164989c2797108db67f14edff8ee5a0c63a8fe1bb0c + REF osgearth-2.10.1 + SHA512 a74e6922ae29f85b4227b23a83dbccba92e08b7880533c281ceb244703c38b51a02823fdee3199c975c969db963b35ebad0e3bfed3c1e218a36d130b20a48e5b HEAD_REF master PATCHES ${VS2017PATCH} ) diff --git a/ports/osi/CMakeLists.txt b/ports/osi/CMakeLists.txt index 7f4ca5ed1..0542339eb 100644 --- a/ports/osi/CMakeLists.txt +++ b/ports/osi/CMakeLists.txt @@ -1,108 +1,89 @@ -cmake_minimum_required(VERSION 3.11)
-
-project(Osi LANGUAGES C CXX)
-
-set(PROJECT_VERSION 0.107.9)
-set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 107)
-set(PROJECT_VERSION_PATCH 9)
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-if(MSVC)
- set(
- CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275"
- )
-endif(MSVC)
-if(APPLE)
- set(
- CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions"
- )
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9"
- CACHE STRING "Minimum OS X deployment version")
-endif(APPLE)
-
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-# options
-option(BUILD_SHARED_LIBS "" ON)
-
-#
-# Introduce variables: * CMAKE_INSTALL_LIBDIR * CMAKE_INSTALL_BINDIR
-include(GNUInstallDirs)
-
-# Include module with fuction 'write_basic_package_version_file'
-include(CMakePackageConfigHelpers)
-
-# Layout. This works for all platforms: * <prefix>/lib*/cmake/<PROJECT-NAME> *
-# <prefix>/lib*/ * <prefix>/include/
-set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
-# Configuration
-set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
-set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
-set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-set(namespace "Coin::")
-
-# Packages
-find_package(CoinUtils REQUIRED)
-
-# Add sources
-include_directories(Osi/src/Osi)
-
-file(GLOB OSI_SOURCES Osi/src/Osi/*.hpp Osi/src/Osi/*.cpp)
-
-add_library(${PROJECT_NAME} ${OSI_SOURCES})
-
-target_include_directories(${PROJECT_NAME}
- PUBLIC $<INSTALL_INTERFACE:include/coin>)
-target_compile_definitions(${PROJECT_NAME}
- PUBLIC
- $<INSTALL_INTERFACE:-DHAVE_CMATH>
- $<INSTALL_INTERFACE:-D_CRT_SECURE_NO_WARNINGS>)
-target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils)
-
-install(TARGETS ${PROJECT_NAME}
- EXPORT "${TARGETS_EXPORT_NAME}"
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
- INCLUDES
- DESTINATION include)
-
-install(DIRECTORY Osi/src/Osi/
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coin
- FILES_MATCHING
- PATTERN "*.h"
- PATTERN "*.hpp"
- PATTERN "config_default.h" EXCLUDE)
-
-#
-# Install Libraries
-#
-# Configure '<PROJECT-NAME>ConfigVersion.cmake' Use: * PROJECT_VERSION
-write_basic_package_version_file("${version_config}"
- COMPATIBILITY SameMajorVersion)
-
-# Configure '<PROJECT-NAME>Config.cmake' Use variables: * TARGETS_EXPORT_NAME *
-# PROJECT_NAME
-configure_package_config_file("Config.cmake.in"
- "${project_config}"
- INSTALL_DESTINATION
- "${config_install_dir}")
-
-# Config * <prefix>/lib/cmake/Foo/FooConfig.cmake *
-# <prefix>/lib/cmake/Foo/FooConfigVersion.cmake
-install(FILES "${project_config}" "${version_config}"
- DESTINATION "${config_install_dir}")
-
-# Config * <prefix>/lib/cmake/Foo/FooTargets.cmake
-install(EXPORT "${TARGETS_EXPORT_NAME}"
- NAMESPACE "${namespace}"
- DESTINATION "${config_install_dir}")
+cmake_minimum_required(VERSION 3.11) + +project(Osi LANGUAGES C CXX) + +set(PROJECT_VERSION 0.107.9) +set(PROJECT_VERSION_MAJOR 0) +set(PROJECT_VERSION_MINOR 107) +set(PROJECT_VERSION_PATCH 9) + +set(CMAKE_CXX_STANDARD 14) + +set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") +set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") +set(INSTALL_INCLUDE_DIR "include/Coin" CACHE PATH "Path where headers will be installed") +set(INSTALL_CMAKE_DIR "share/osi" CACHE PATH "Path where cmake configs will be installed") + +# Make relative paths absolute (needed later on) +set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) +foreach(p LIB BIN INCLUDE CMAKE) + set(var INSTALL_${p}_DIR) + if(NOT IS_ABSOLUTE "${${var}}") + set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +endforeach() + +if(MSVC) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} /bigobj /MP /wd4996 /wd4819 /wd4251 /wd4267 /wd4244 /wd4275" + ) +endif() + +if(APPLE) + set( + CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override -Wno-unused-command-line-argument -Wno-unused-result -Wno-exceptions" + ) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" + CACHE STRING "Minimum OS X deployment version") +endif() + +find_package(CoinUtils REQUIRED) + +file(GLOB OSI_SOURCES Osi/src/Osi/*.hpp Osi/src/Osi/*.cpp) + +add_library(${PROJECT_NAME} ${OSI_SOURCES}) + +target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:${RELATIVE_INSTALL_INCLUDE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Osi/src/Osi>) + +if(MSVC) + target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS) +endif() +target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_CMATH) + +target_link_libraries(${PROJECT_NAME} PRIVATE Coin::CoinUtils) + +install(DIRECTORY Osi/src/Osi/ + DESTINATION ${INSTALL_INCLUDE_DIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "*.hpp" + PATTERN "config_default.h" EXCLUDE) + +install(TARGETS ${PROJECT_NAME} + EXPORT "${PROJECT_NAME}Targets" + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin) + +include(CMakePackageConfigHelpers) + +set(version_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}ConfigVersion.cmake") +set(project_config "${CMAKE_CURRENT_BINARY_DIR}/temp/${PROJECT_NAME}Config.cmake") +set(namespace "Coin::") + +write_basic_package_version_file("${version_config}" + COMPATIBILITY SameMajorVersion) + +configure_package_config_file("Config.cmake.in" + "${project_config}" + INSTALL_DESTINATION + "${INSTALL_CMAKE_DIR}") + +install(FILES "${project_config}" "${version_config}" + DESTINATION "${INSTALL_CMAKE_DIR}") + +install(EXPORT "${PROJECT_NAME}Targets" + NAMESPACE "${namespace}" + DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/ports/osi/CONTROL b/ports/osi/CONTROL index 98cfbdcad..5f65e3cf2 100644 --- a/ports/osi/CONTROL +++ b/ports/osi/CONTROL @@ -1,4 +1,4 @@ -Source: osi
-Version: 0.107.9-1
-Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver.
-Build-Depends: coinutils
+Source: osi +Version: 0.108.4-2 +Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver. +Build-Depends: coinutils diff --git a/ports/osi/Config.cmake.in b/ports/osi/Config.cmake.in index ec01d2e5b..2c12f83f0 100644 --- a/ports/osi/Config.cmake.in +++ b/ports/osi/Config.cmake.in @@ -1,5 +1,5 @@ -
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
-check_required_components("@PROJECT_NAME@")
+ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/ports/osi/portfile.cmake b/ports/osi/portfile.cmake index 8c890581c..bb340eaca 100644 --- a/ports/osi/portfile.cmake +++ b/ports/osi/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO coin-or/Osi - REF releases/0.107.9 - SHA512 52501e2fa81ad9ec1412596b5945e11f2d5c5c91bdb148f41dad9efb8e4a033cfc2f76e389b9e546593b89ae6c7f74c32e6c5b78337c967ad0c90cd6a7183a28 + REF releases/0.108.4 + SHA512 43c4da11c7e8b83ef67b10b60fa0be9bd2302965a26447f85c4cf9e747b999710954948e041b7203ac69f5d3cb75ba9c383838184bee8399a95b9ba59eff3f06 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -19,8 +19,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Osi") # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/osi RENAME copyright) diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL index 1541c7fa5..bd0781fad 100644 --- a/ports/paho-mqtt/CONTROL +++ b/ports/paho-mqtt/CONTROL @@ -1,4 +1,5 @@ Source: paho-mqtt -Version: 1.2.1 +Version: 1.3.0 +Homepage: https://github.com/eclipse/paho.mqtt.c Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things Build-Depends: openssl diff --git a/ports/paho-mqtt/fix-install-path.patch b/ports/paho-mqtt/fix-install-path.patch new file mode 100644 index 000000000..478141931 --- /dev/null +++ b/ports/paho-mqtt/fix-install-path.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 64ae92c..6d552d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,11 +64,11 @@ ENDIF()
+ IF (PAHO_ENABLE_CPACK)
+ ### packaging settings
+ FILE(GLOB samples "src/samples/*.c")
+- INSTALL(FILES ${samples} DESTINATION samples)
++ INSTALL(FILES ${samples} DESTINATION share/paho-mqtt/samples)
+
+ SET(CPACK_PACKAGE_VENDOR "Eclipse Paho")
+ SET(CPACK_PACKAGE_NAME "Eclipse-Paho-MQTT-C")
+- INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
++ INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION share/paho-mqtt)
+
+ IF (WIN32)
+ SET(CPACK_GENERATOR "ZIP")
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index f15f314..54deec5 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -39,7 +39,7 @@ ENDFOREACH(DOXYFILE_SRC)
+
+ ADD_CUSTOM_TARGET(doc ALL DEPENDS ${DOXYTARGETS})
+ IF (PAHO_ENABLE_CPACK)
+- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share)
++ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share/paho-mqtt)
+ ELSE()
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ ENDIF()
+\ No newline at end of file
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b46eaca..a132062 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -89,7 +89,7 @@ INSTALL(TARGETS paho-mqtt3c paho-mqtt3a
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ INSTALL(TARGETS MQTTVersion
+- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++ RUNTIME DESTINATION tools/paho-mqtt)
+
+ IF (PAHO_BUILD_STATIC)
+ ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c)
+@@ -102,8 +102,8 @@ IF (PAHO_BUILD_STATIC)
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF()
+
+-INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h
+- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/paho-mqtt)
+
+ IF (PAHO_WITH_SSL)
+ SET(OPENSSL_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL libraries and includes")
diff --git a/ports/paho-mqtt/fix-static-build.patch b/ports/paho-mqtt/fix-static-build.patch new file mode 100644 index 000000000..5e6aab047 --- /dev/null +++ b/ports/paho-mqtt/fix-static-build.patch @@ -0,0 +1,97 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 14b94b1..508c5b1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -65,28 +65,29 @@ ENDIF() + ADD_LIBRARY(common_obj OBJECT ${common_src}) + SET_PROPERTY(TARGET common_obj PROPERTY POSITION_INDEPENDENT_CODE ON) + +-ADD_EXECUTABLE(MQTTVersion MQTTVersion.c) +- +-ADD_LIBRARY(paho-mqtt3c SHARED $<TARGET_OBJECTS:common_obj> MQTTClient.c) +-ADD_LIBRARY(paho-mqtt3a SHARED $<TARGET_OBJECTS:common_obj> MQTTAsync.c) +- +-TARGET_LINK_LIBRARIES(paho-mqtt3c ${LIBS_SYSTEM}) +-TARGET_LINK_LIBRARIES(paho-mqtt3a ${LIBS_SYSTEM}) +- +-TARGET_LINK_LIBRARIES(MQTTVersion paho-mqtt3a paho-mqtt3c ${LIBS_SYSTEM}) +-SET_TARGET_PROPERTIES( +- paho-mqtt3c paho-mqtt3a PROPERTIES +- VERSION ${CLIENT_VERSION} +- SOVERSION ${PAHO_VERSION_MAJOR}) +- +-INSTALL(TARGETS paho-mqtt3c paho-mqtt3a +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +-INSTALL(TARGETS MQTTVersion +- RUNTIME DESTINATION tools/paho-mqtt) +- +-IF (PAHO_BUILD_STATIC) ++IF (NOT PAHO_BUILD_STATIC) ++ ADD_EXECUTABLE(MQTTVersion MQTTVersion.c) ++ ++ ADD_LIBRARY(paho-mqtt3c SHARED $<TARGET_OBJECTS:common_obj> MQTTClient.c) ++ ADD_LIBRARY(paho-mqtt3a SHARED $<TARGET_OBJECTS:common_obj> MQTTAsync.c) ++ ++ TARGET_LINK_LIBRARIES(paho-mqtt3c ${LIBS_SYSTEM}) ++ TARGET_LINK_LIBRARIES(paho-mqtt3a ${LIBS_SYSTEM}) ++ ++ TARGET_LINK_LIBRARIES(MQTTVersion paho-mqtt3a paho-mqtt3c ${LIBS_SYSTEM}) ++ SET_TARGET_PROPERTIES( ++ paho-mqtt3c paho-mqtt3a PROPERTIES ++ VERSION ${CLIENT_VERSION} ++ SOVERSION ${PAHO_VERSION_MAJOR}) ++ ++ INSTALL(TARGETS paho-mqtt3c paho-mqtt3a ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ INSTALL(TARGETS MQTTVersion ++ RUNTIME DESTINATION tools/paho-mqtt) ++ELSE() ++ message("Build as static library") + ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c) + ADD_LIBRARY(paho-mqtt3a-static STATIC $<TARGET_OBJECTS:common_obj> MQTTAsync.c) + +@@ -132,22 +133,24 @@ IF (PAHO_WITH_SSL) + ADD_LIBRARY(common_ssl_obj OBJECT ${common_src}) + SET_PROPERTY(TARGET common_ssl_obj PROPERTY POSITION_INDEPENDENT_CODE ON) + SET_PROPERTY(TARGET common_ssl_obj PROPERTY COMPILE_DEFINITIONS "OPENSSL=1") +- ADD_LIBRARY(paho-mqtt3cs SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c) +- ADD_LIBRARY(paho-mqtt3as SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c) +- +- TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM}) +- TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM}) +- SET_TARGET_PROPERTIES( +- paho-mqtt3cs paho-mqtt3as PROPERTIES +- VERSION ${CLIENT_VERSION} +- SOVERSION ${PAHO_VERSION_MAJOR} +- COMPILE_DEFINITIONS "OPENSSL=1") +- INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +- +- IF (PAHO_BUILD_STATIC) ++ ++ IF (NOT PAHO_BUILD_STATIC) ++ ADD_LIBRARY(paho-mqtt3cs SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c) ++ ADD_LIBRARY(paho-mqtt3as SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c) ++ ++ TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM}) ++ TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM}) ++ SET_TARGET_PROPERTIES( ++ paho-mqtt3cs paho-mqtt3as PROPERTIES ++ VERSION ${CLIENT_VERSION} ++ SOVERSION ${PAHO_VERSION_MAJOR} ++ COMPILE_DEFINITIONS "OPENSSL=1") ++ INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ ELSE() ++ message("Build as static library") + ADD_LIBRARY(paho-mqtt3cs-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c) + ADD_LIBRARY(paho-mqtt3as-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c) + diff --git a/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch b/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch new file mode 100644 index 000000000..165901887 --- /dev/null +++ b/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch @@ -0,0 +1,12 @@ +diff --git a/src/SHA1.c b/src/SHA1.c
+index 9bb1175..b2ef930 100644
+--- a/src/SHA1.c
++++ b/src/SHA1.c
+@@ -19,6 +19,7 @@
+ #if !defined(OPENSSL)
+ #if defined(WIN32) || defined(WIN64)
+ #pragma comment(lib, "crypt32.lib")
++#pragma comment(lib, "Advapi32.lib")
+
+ int SHA1_Init(SHA_CTX *c)
+ {
diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 41c8eeb28..03b6c73bd 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -3,20 +3,17 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c - REF v1.2.1 - SHA512 98828852ecd127445591df31416adaebebd30848c027361ae62af6b14b84e3cf2a4b90cab692b983148cbf93f710a9e2dd722a3da8c4fd17eb2149e4227a8860 + REF 9f715d0862a8e16099b5837c4e53a1bf6a6a0675 + SHA512 3ab5e25bfe303f51485696248e78a8a10f20c0e69b7ea6016165a97d61172336e8fbe5b9d059ae546357bace9f3adb8e2026643b61a6af82fae448a024e51d21 HEAD_REF master -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) - - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - "${CMAKE_CURRENT_LIST_DIR}/remove_compiler_options.patch" + remove_compiler_options.patch + fix-install-path.patch + fix-static-build.patch + fix-unresolvedsymbol-arm.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -24,62 +21,11 @@ vcpkg_configure_cmake( OPTIONS -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC} -DPAHO_ENABLE_TESTING=FALSE ) - -vcpkg_build_cmake() - -file(GLOB DLLS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/*.dll" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.dll" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.dll" -) -file(GLOB LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/Release/*.lib" -) -file(GLOB DEBUG_DLLS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/*.dll" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.dll" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.dll" -) -file(GLOB DEBUG_LIBS - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/*.lib" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*/Debug/*.lib" -) -if(DLLS) - file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -endif() -if(LIBS) - file(INSTALL ${LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -endif() -if(DEBUG_DLLS) - file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() -if(DEBUG_LIBS) - file(INSTALL ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -endif() -file(COPY ${SOURCE_PATH}/src/MQTTAsync.h ${SOURCE_PATH}/src/MQTTClient.h ${SOURCE_PATH}/src/MQTTClientPersistence.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - foreach(libname paho-mqtt3as-static paho-mqtt3cs-static paho-mqtt3a-static paho-mqtt3c-static) - foreach(foldername "lib" "debug/lib") - string(REPLACE "-static" "" outlibname ${libname}) - file(RENAME ${CURRENT_PACKAGES_DIR}/${foldername}/${libname}.lib ${CURRENT_PACKAGES_DIR}/${foldername}/${outlibname}.lib) - endforeach() - endforeach() -endif() - -foreach(libname paho-mqtt3a paho-mqtt3c) - foreach(root "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/debug") - file(REMOVE - ${root}/lib/${libname}.lib - ${root}/bin/${libname}.dll - ) - endforeach() -endforeach() - +vcpkg_install_cmake() vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(RENAME ${CURRENT_PACKAGES_DIR}/share/paho-mqtt/README.md ${CURRENT_PACKAGES_DIR}/share/paho-mqtt/readme) file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/paho-mqtt RENAME copyright) diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index cc21d3eee..f0e6d85e7 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -11,6 +11,11 @@ else() configure_file(./config.h.unix ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY) endif() +if (WIN32) + # Set utf-8 charset to avoid compile error C2001 + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8") +endif() + add_definitions(-DHAVE_CONFIG_H) include_directories(. ./pango ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index 9b176290b..192c5c048 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,4 +1,5 @@ Source: pango
-Version: 1.40.11-3
+Version: 1.40.11-4
+Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/
Description: Text and font handling library.
Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!windows-static)
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL index 593c753b2..8963cc26b 100644 --- a/ports/pangolin/CONTROL +++ b/ports/pangolin/CONTROL @@ -1,4 +1,5 @@ Source: pangolin
-Version: 0.5-6
+Version: 0.5-7
Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
+Homepage: https://github.com/stevenlovegrove/Pangolin
Description: Lightweight GUI Library
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index ac4d31625..e22672ec0 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Pangolin") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Pangolin) vcpkg_copy_pdbs() diff --git a/ports/pangomm/CONTROL b/ports/pangomm/CONTROL index 68860b305..8109a5889 100644 --- a/ports/pangomm/CONTROL +++ b/ports/pangomm/CONTROL @@ -1,4 +1,5 @@ Source: pangomm Version: 2.40.1 +Homepage: https://ftp.gnome.org/pub/GNOME/sources/pangomm Description: pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class. Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz, pango, cairomm, glibmm diff --git a/ports/parallel-hashmap/CONTROL b/ports/parallel-hashmap/CONTROL index 8935060a4..91be82ab3 100644 --- a/ports/parallel-hashmap/CONTROL +++ b/ports/parallel-hashmap/CONTROL @@ -1,3 +1,3 @@ Source: parallel-hashmap -Version: 1.1.0 -Description: A header-only, very fast and memory-friendly hash map family. +Version: 1.23 +Description: A header-only, very fast and memory-friendly family of C++ hash maps. diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index 9c2c02289..d42dee4fd 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.1.0 - SHA512 ff9497d2a8009c9aa955f50e66269e5963a86d8593e3eb07ef968a8ea5e162fea7e145d6d4d9e7aa91380b49f22166d1a08445fa40d02f43327e4c39612f52d9 + REF 1.23 + SHA512 efdc717d965292949dc47c2614d97274d52e409a70b283d2b12a957bf3135c6682ed6f77a5b130b70f77eb2cc5c522626cc4b08cd792a7037844df5ba1538985 HEAD_REF master ) @@ -19,6 +19,8 @@ vcpkg_install_cmake() # Delete redundant directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/doc) +file(COPY ${SOURCE_PATH}/phmap.natvis DESTINATION ${CURRENT_PACKAGES_DIR}/include) + # Put the licence file where vcpkg expects it file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/parallel-hashmap) file(RENAME ${CURRENT_PACKAGES_DIR}/share/parallel-hashmap/LICENSE ${CURRENT_PACKAGES_DIR}/share/parallel-hashmap/copyright) diff --git a/ports/parmetis/CONTROL b/ports/parmetis/CONTROL index bdc95557a..7e5e3b21b 100644 --- a/ports/parmetis/CONTROL +++ b/ports/parmetis/CONTROL @@ -1,4 +1,5 @@ Source: parmetis
Version: 4.0.3-2
+Homepage: https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview
Description: Parallel Graph Partitioning and Fill-reducing Matrix Ordering
Build-Depends: metis, msmpi
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index a9f23813d..1a9852c8e 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,5 +1,6 @@ Source: pcl -Version: 1.9.1-1 +Version: 1.9.1-4 +Homepage: https://github.com/PointCloudLibrary/pcl Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio @@ -21,4 +22,4 @@ Build-Depends: boost-accumulators Feature: cuda Description: CUDA support for PCL -Build-Depends: cuda
\ No newline at end of file +Build-Depends: cuda diff --git a/ports/pcl/boost-1.70.patch b/ports/pcl/boost-1.70.patch new file mode 100644 index 000000000..1c8a02121 --- /dev/null +++ b/ports/pcl/boost-1.70.patch @@ -0,0 +1,13 @@ +diff --git a/segmentation/include/pcl/segmentation/supervoxel_clustering.h b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
+index 05e6002..99e3a07 100644
+--- a/segmentation/include/pcl/segmentation/supervoxel_clustering.h
++++ b/segmentation/include/pcl/segmentation/supervoxel_clustering.h
+@@ -525,7 +525,7 @@ namespace pcl
+ };
+
+ //Make boost::ptr_list can access the private class SupervoxelHelper
+- friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *);
++ //friend void boost::checked_delete<> (const typename pcl::SupervoxelClustering<PointT>::SupervoxelHelper *);
+
+ typedef boost::ptr_list<SupervoxelHelper> HelperListT;
+ HelperListT supervoxel_helpers_;
diff --git a/ports/pcl/find_flann.patch b/ports/pcl/find_flann.patch deleted file mode 100644 index 263be2926..000000000 --- a/ports/pcl/find_flann.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake -index 1cecacfa9..3169d6d7b 100644 ---- a/cmake/Modules/FindFLANN.cmake -+++ b/cmake/Modules/FindFLANN.cmake -@@ -10,8 +10,8 @@ - # look for shared ones - - if(FLANN_USE_STATIC) -- set(FLANN_RELEASE_NAME flann_cpp_s) -- set(FLANN_DEBUG_NAME flann_cpp_s-gd) -+ set(FLANN_RELEASE_NAME flann_cpp) -+ set(FLANN_DEBUG_NAME flann_cpp-gd) - else(FLANN_USE_STATIC) - set(FLANN_RELEASE_NAME flann_cpp) - set(FLANN_DEBUG_NAME flann_cpp-gd) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 4036d5346..b30ceb0d8 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -6,11 +6,15 @@ vcpkg_from_github( REF pcl-1.9.1 SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf HEAD_REF master - PATCHES pcl_utils.patch - pcl_config.patch - find_flann.patch + PATCHES + pcl_utils.patch + pcl_config.patch + use_flann_targets.patch + boost-1.70.patch ) +file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindFLANN.cmake) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) set(WITH_OPENNI2 OFF) @@ -64,7 +68,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/pcl) +vcpkg_fixup_cmake_targets() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/pcl/use_flann_targets.patch b/ports/pcl/use_flann_targets.patch new file mode 100644 index 000000000..7e6289267 --- /dev/null +++ b/ports/pcl/use_flann_targets.patch @@ -0,0 +1,155 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b4c1a3..94bb484 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,11 +280,9 @@ find_package(Eigen REQUIRED) + include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS}) + + # FLANN (required) +-if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32)) +- set(FLANN_USE_STATIC ON) +-endif() ++set(FLANN_USE_STATIC ON) + find_package(FLANN 1.7.0 REQUIRED) +-include_directories(${FLANN_INCLUDE_DIRS}) ++find_package(lz4) + + # libusb-1.0 + option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE) +diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in +index 6fadb59..6a9c5b7 100755 +--- a/PCLConfig.cmake.in ++++ b/PCLConfig.cmake.in +@@ -226,12 +226,6 @@ endmacro(find_rssdk) + + #remove this as soon as flann is shipped with FindFlann.cmake + macro(find_flann) +- if(PCL_ALL_IN_ONE_INSTALLER) +- set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann") +- elseif(NOT FLANN_ROOT) +- get_filename_component(FLANN_ROOT "@FLANN_INCLUDE_DIRS@" PATH) +- endif(PCL_ALL_IN_ONE_INSTALLER) +- + set(FLANN_USE_STATIC @FLANN_USE_STATIC@) + find_package(FLANN) + endmacro(find_flann) +@@ -651,7 +645,7 @@ endif(NOT "${PCL_DEFINITIONS}" STREQUAL "") + pcl_remove_duplicate_libraries(PCL_COMPONENTS PCL_LIBRARIES) + + # Add 3rd party libraries, as user code might include our .HPP implementations +-list(APPEND PCL_LIBRARIES ${BOOST_LIBRARIES} ${QHULL_LIBRARIES} ${OPENNI_LIBRARIES} ${OPENNI2_LIBRARIES} ${ENSENSO_LIBRARIES} ${davidSDK_LIBRARIES} ${DSSDK_LIBRARIES} ${RSSDK_LIBRARIES} ${FLANN_LIBRARIES} ${VTK_LIBRARIES}) ++list(APPEND PCL_LIBRARIES ${BOOST_LIBRARIES} ${QHULL_LIBRARIES} ${OPENNI_LIBRARIES} ${OPENNI2_LIBRARIES} ${ENSENSO_LIBRARIES} ${davidSDK_LIBRARIES} ${DSSDK_LIBRARIES} ${RSSDK_LIBRARIES} flann::flann_cpp ${VTK_LIBRARIES}) + + find_package_handle_standard_args(PCL DEFAULT_MSG PCL_LIBRARIES PCL_INCLUDE_DIRS) + mark_as_advanced(PCL_LIBRARIES PCL_INCLUDE_DIRS PCL_LIBRARY_DIRS) +diff --git a/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt b/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt +index 9693792..dcd4373 100755 +--- a/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt ++++ b/doc/tutorials/content/sources/vfh_recognition/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 2.8 FATAL_ERROR) + +-# we need FindFLANN.cmake ++# we need FindFLANN.cmake + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + + project(vfh_cluster_classifier) +@@ -14,16 +14,15 @@ find_package(HDF5) + if(HDF5_FOUND) + + find_package(FLANN) +- include_directories(${FLANN_INCLUDE_DIRS}) + + include_directories(${HDF5_INCLUDE_DIR}) + + add_executable(build_tree build_tree.cpp) + target_link_libraries(build_tree ${PCL_LIBRARIES} ${Boost_LIBRARIES} +- ${FLANN_LIBRARIES} ${HDF5_hdf5_LIBRARY}) ++ flann::flann_cpp ${HDF5_hdf5_LIBRARY}) + + add_executable(nearest_neighbors nearest_neighbors.cpp) +- target_link_libraries(nearest_neighbors ${PCL_LIBRARIES} +- ${Boost_LIBRARIES} ${FLANN_LIBRARIES} ${HDF5_hdf5_LIBRARY} ++ target_link_libraries(nearest_neighbors ${PCL_LIBRARIES} ++ ${Boost_LIBRARIES} flann::flann_cpp ${HDF5_hdf5_LIBRARY} + ) + endif(HDF5_FOUND) +diff --git a/kdtree/CMakeLists.txt b/kdtree/CMakeLists.txt +index 311dffc..1a7712f 100755 +--- a/kdtree/CMakeLists.txt ++++ b/kdtree/CMakeLists.txt +@@ -9,18 +9,18 @@ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS} EXT_DEPS flann) + PCL_ADD_DOC("${SUBSYS_NAME}") + + if(build) +- set(srcs ++ set(srcs + src/kdtree_flann.cpp + ) + +- set(incs ++ set(incs + "include/pcl/${SUBSYS_NAME}/kdtree.h" + "include/pcl/${SUBSYS_NAME}/io.h" + "include/pcl/${SUBSYS_NAME}/flann.h" + "include/pcl/${SUBSYS_NAME}/kdtree_flann.h" + ) + +- set(impl_incs ++ set(impl_incs + "include/pcl/${SUBSYS_NAME}/impl/io.hpp" + "include/pcl/${SUBSYS_NAME}/impl/kdtree_flann.hpp" + ) +@@ -28,7 +28,7 @@ if(build) + set(LIB_NAME "pcl_${SUBSYS_NAME}") + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") + PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs}) +- target_link_libraries("${LIB_NAME}" pcl_common ${FLANN_LIBRARIES}) ++ target_link_libraries("${LIB_NAME}" pcl_common flann::flann_cpp) + set(EXT_DEPS flann) + PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" + "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "") +@@ -38,4 +38,3 @@ if(build) + PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs}) + + endif(build) +- +diff --git a/search/CMakeLists.txt b/search/CMakeLists.txt +index cd82a0e..1d15241 100755 +--- a/search/CMakeLists.txt ++++ b/search/CMakeLists.txt +@@ -38,7 +38,7 @@ if(build) + set(LIB_NAME "pcl_${SUBSYS_NAME}") + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") + PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${incs} ${impl_incs}) +- target_link_libraries("${LIB_NAME}" pcl_common ${FLANN_LIBRARIES} pcl_octree pcl_kdtree) ++ target_link_libraries("${LIB_NAME}" pcl_common flann::flann_cpp pcl_octree pcl_kdtree) + list(APPEND EXT_DEPS flann) + PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") + +@@ -46,4 +46,3 @@ if(build) + PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs}) + + endif(build) +- +diff --git a/test/features/CMakeLists.txt b/test/features/CMakeLists.txt +index cedb0cb..4b37c73 100755 +--- a/test/features/CMakeLists.txt ++++ b/test/features/CMakeLists.txt +@@ -81,14 +81,14 @@ if (build) + PCL_ADD_TEST(feature_flare_estimation test_flare_estimation + FILES test_flare_estimation.cpp + LINK_WITH pcl_gtest pcl_features pcl_io +- ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd") ++ ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd") + PCL_ADD_TEST(feature_shot_lrf_estimation test_shot_lrf_estimation + FILES test_shot_lrf_estimation.cpp + LINK_WITH pcl_gtest pcl_features pcl_io + ARGUMENTS "${PCL_SOURCE_DIR}/test/bun0.pcd") + PCL_ADD_TEST(features_narf test_narf + FILES test_narf.cpp +- LINK_WITH pcl_gtest pcl_features ${FLANN_LIBRARIES}) ++ LINK_WITH pcl_gtest pcl_features flann::flann_cpp) + PCL_ADD_TEST(a_ii_normals_test test_ii_normals + FILES test_ii_normals.cpp + LINK_WITH pcl_gtest pcl_io pcl_features diff --git a/ports/pcre2/CONTROL b/ports/pcre2/CONTROL index c9b3438a6..3d7824a27 100644 --- a/ports/pcre2/CONTROL +++ b/ports/pcre2/CONTROL @@ -1,3 +1,4 @@ Source: pcre2 Version: 10.30-4 +Homepage: https://pcre.org/ Description: PCRE2 is a re-working of the original Perl Compatible Regular Expressions library diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL index 743f77c8e..7c465df4e 100644 --- a/ports/pdal/CONTROL +++ b/ports/pdal/CONTROL @@ -1,4 +1,4 @@ Source: pdal
-Version: 1.7.1-4
+Version: 1.7.1-5
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip
diff --git a/ports/pdal/FindGDAL.cmake b/ports/pdal/FindGDAL.cmake deleted file mode 100644 index 9683cb0e5..000000000 --- a/ports/pdal/FindGDAL.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(GDAL_INCLUDE_DIR gdal.h)
-
-find_library(GDAL_LIBRARY_DEBUG NAMES gdald)
-find_library(GDAL_LIBRARY_RELEASE NAMES gdal)
-
-include(SelectLibraryConfigurations)
-select_library_configurations(GDAL)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
- GDAL DEFAULT_MSG
- GDAL_LIBRARY GDAL_INCLUDE_DIR
-)
diff --git a/ports/pdal/FindGeoTIFF.cmake b/ports/pdal/FindGeoTIFF.cmake deleted file mode 100644 index 51a5fb2d8..000000000 --- a/ports/pdal/FindGeoTIFF.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(GEOTIFF_INCLUDE_DIR geotiff.h)
-
-find_library(GEOTIFF_LIBRARY_DEBUG NAMES geotiff_d)
-find_library(GEOTIFF_LIBRARY_RELEASE NAMES geotiff)
-
-include(SelectLibraryConfigurations)
-select_library_configurations(GEOTIFF)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
- GEOTIFF DEFAULT_MSG
- GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR
-)
diff --git a/ports/pdal/PDALConfig.patch b/ports/pdal/PDALConfig.patch new file mode 100644 index 000000000..ea7681dc1 --- /dev/null +++ b/ports/pdal/PDALConfig.patch @@ -0,0 +1,13 @@ +diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in +index a03ef142e..2d06a2937 100644 +--- a/PDALConfig.cmake.in ++++ b/PDALConfig.cmake.in +@@ -15,6 +15,8 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) + list(APPEND PDAL_LIBRARY_DIRS ${_foo}) + endforeach(_dir) + ++include(CMakeFindDependencyMacro) ++find_dependency(GeoTIFF) + include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") + + if (WIN32) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 6ab78024f..650849224 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -18,31 +18,35 @@ vcpkg_extract_source_archive_ex( 0001-win32_compiler_options.cmake.patch 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch + PDALConfig.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") # Deploy custom CMake modules to enforce expected dependencies look-up -foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF) +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/ ) endforeach() -# NOTE: CMake native BUILD_SHARED_LIBS option will be set by vcpkg_configure_cmake -# TODO: Remove this as soon as PDAL switches to use BUILD_SHARED_LIBS if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(PDAL_BUILD_STATIC OFF) + set(VCPKG_BUILD_SHARED_LIBS ON) + set(VCPKG_BUILD_STATIC_LIBS OFF) else() - set(PDAL_BUILD_STATIC ON) + set(VCPKG_BUILD_SHARED_LIBS OFF) + set(VCPKG_BUILD_STATIC_LIBS ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DPDAL_BUILD_STATIC:BOOL=${PDAL_BUILD_STATIC} + -DPDAL_BUILD_STATIC:BOOL=${VCPKG_BUILD_STATIC_LIBS} -DWITH_TESTS:BOOL=OFF -DWITH_COMPLETION:BOOL=OFF ) diff --git a/ports/pdcurses/CONTROL b/ports/pdcurses/CONTROL index 29cbff29b..3ea97de0b 100644 --- a/ports/pdcurses/CONTROL +++ b/ports/pdcurses/CONTROL @@ -1,3 +1,4 @@ Source: pdcurses -Version: 3.6 +Version: 3.8 +Homepage: https://sourceforge.net/projects/pdcurses/ Description: Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model. diff --git a/ports/pdcurses/portfile.cmake b/ports/pdcurses/portfile.cmake index 8581b5583..72c54e403 100644 --- a/ports/pdcurses/portfile.cmake +++ b/ports/pdcurses/portfile.cmake @@ -9,8 +9,8 @@ find_program(NMAKE nmake) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wmcbrine/PDCurses - REF 3.6 - SHA512 1ed34e7eb791c9e00aae60878339e79f6b3af086c45d88d2b59d9b2b4020481ff5a5c21e078e59ae24f2de3b4d412f0240f21a50eb743f7e172c832a7e17ed5e + REF 2467ab2b6c07163d0171b80ad6c252c29da28173 + SHA512 4d729a4e0ffa1b5d1fd35ed73329d08886e1e565936a008cd7b45f8e5fbaabcb86c65377fd1e33acef6271f828cd4158e8a56ed15cd664b2a8c8e1d66cf8c00a HEAD_REF master ) @@ -73,7 +73,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() file( - COPY ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h ${SOURCE_PATH}/term.h + COPY ${SOURCE_PATH}/curses.h ${SOURCE_PATH}/panel.h DESTINATION ${CURRENT_PACKAGES_DIR}/include ) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdcurses RENAME copyright) diff --git a/ports/pfultz2-linq/CONTROL b/ports/pfultz2-linq/CONTROL new file mode 100644 index 000000000..e8185c327 --- /dev/null +++ b/ports/pfultz2-linq/CONTROL @@ -0,0 +1,4 @@ +Source: pfultz2-linq
+Version: 2019-05-14
+Description: Linq for list comprehension in C++
+Build-Depends: boost-fusion, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-range, boost-static-assert, boost-type-traits, boost-unordered, boost-utility
diff --git a/ports/pfultz2-linq/portfile.cmake b/ports/pfultz2-linq/portfile.cmake new file mode 100644 index 000000000..de0980b6a --- /dev/null +++ b/ports/pfultz2-linq/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO pfultz2/Linq
+ REF 7ff0a73fed52be5e11df3d79128ce7b11f430af2
+ SHA512 6768e28bf17568436b4c3fed18f6b1edbe048b871ebee25580419b805498beb0800e473ecdc5acc0f9f89bec47d16fd3806018ce6395bdf14a8e2975cde9381f
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/linq TARGET_PATH share/linq)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME linq)
diff --git a/ports/physfs/CONTROL b/ports/physfs/CONTROL index 3900d77a8..07b90bcdf 100644 --- a/ports/physfs/CONTROL +++ b/ports/physfs/CONTROL @@ -1,4 +1,5 @@ Source: physfs Version: 3.0.2 +Homepage: https://icculus.org/physfs/ Description: a library to provide abstract access to various archives Build-Depends: zlib diff --git a/ports/picojson/CONTROL b/ports/picojson/CONTROL index a871ae3d4..4a3614202 100644 --- a/ports/picojson/CONTROL +++ b/ports/picojson/CONTROL @@ -1,4 +1,5 @@ Source: picojson Version: 1.3.0 +Homepage: https://github.com/kazuho/picojson Description: A header-file-only, JSON parser serializer in C++. diff --git a/ports/picosha2/CONTROL b/ports/picosha2/CONTROL index 7203b8aee..a388045a2 100644 --- a/ports/picosha2/CONTROL +++ b/ports/picosha2/CONTROL @@ -1,3 +1,4 @@ Source: picosha2 Version: 2018-07-30 +Homepage: https://github.com/okdshin/PicoSHA2 Description: PicoSHA2 - a C++ SHA256 hash generator diff --git a/ports/piex/CONTROL b/ports/piex/CONTROL index 3fb98201f..3f257fa20 100644 --- a/ports/piex/CONTROL +++ b/ports/piex/CONTROL @@ -1,3 +1,4 @@ Source: piex
Version: 2018-03-13-1
+Homepage: https://github.com/google/piex
Description: The Preview Image Extractor (PIEX) is designed to find and extract the largest
diff --git a/ports/pixman/CONTROL b/ports/pixman/CONTROL index 066d81076..129ba37fe 100644 --- a/ports/pixman/CONTROL +++ b/ports/pixman/CONTROL @@ -1,3 +1,4 @@ Source: pixman Version: 0.38.0-3 +Homepage: https://www.cairographics.org/releases Description: Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization. diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake index c66848096..fef2bf327 100644 --- a/ports/platform-folders/portfile.cmake +++ b/ports/platform-folders/portfile.cmake @@ -26,7 +26,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL ${TARGET_BUILD_PATH}-dbg/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) endif() -if (WIN32) +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/platform_folders) else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ TARGET_PATH /share/) diff --git a/ports/plibsys/CONTROL b/ports/plibsys/CONTROL index 3bb95f45b..2c71346bb 100644 --- a/ports/plibsys/CONTROL +++ b/ports/plibsys/CONTROL @@ -1,3 +1,4 @@ Source: plibsys
Version: 0.0.4-1
+Homepage: https://github.com/saprykin/plibsys
Description: Highly portable C system library: threads and synchronization, sockets, IPC, data structures and more.
diff --git a/ports/plog/CONTROL b/ports/plog/CONTROL index d1abd52a6..0d6adaa08 100644 --- a/ports/plog/CONTROL +++ b/ports/plog/CONTROL @@ -1,3 +1,4 @@ Source: plog
Version: 1.1.4
+Homepage: https://github.com/SergiusTheBest/plog
Description: Portable, simple and extensible C++ logging library.
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index 29291a730..1e98ccc74 100644 --- a/ports/poco/CONTROL +++ b/ports/poco/CONTROL @@ -1,7 +1,8 @@ Source: poco -Version: 2.0.0-pre-1 +Version: 2.0.0-pre-2 Build-Depends: expat, libpq, pcre, sqlite3, zlib -Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems. (https://github.com/pocoproject/poco) +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 Feature: mysql Build-Depends: libmysql diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 36a127489..46d9a439c 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -76,7 +76,7 @@ vcpkg_configure_cmake( -DPOCO_ENABLE_WSTRING=ON -DPOCO_ENABLE_FPENVIRONMENT=ON -DPOCO_ENABLE_CPPUNIT=ON - # + # -DMYSQL_INCLUDE_DIR=${MYSQL_INCLUDE_DIR} OPTIONS_RELEASE -DMYSQL_LIBRARY=${MYSQL_LIBRARY} @@ -144,9 +144,9 @@ endif() # if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake") + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/Poco") - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Poco") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Poco) endif() # remove unused files @@ -156,4 +156,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/poco) file(RENAME ${CURRENT_PACKAGES_DIR}/share/poco/LICENSE ${CURRENT_PACKAGES_DIR}/share/poco/copyright) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/podofo/unique_ptr.patch b/ports/podofo/0001-unique_ptr.patch index 5c70e8471..5c70e8471 100644 --- a/ports/podofo/unique_ptr.patch +++ b/ports/podofo/0001-unique_ptr.patch diff --git a/ports/podofo/002-HAVE_UNISTD_H.patch b/ports/podofo/0002-HAVE_UNISTD_H.patch index 6aed4b279..6aed4b279 100644 --- a/ports/podofo/002-HAVE_UNISTD_H.patch +++ b/ports/podofo/0002-HAVE_UNISTD_H.patch diff --git a/ports/podofo/0003-uwp_fix.patch b/ports/podofo/0003-uwp_fix.patch new file mode 100644 index 000000000..91872d7eb --- /dev/null +++ b/ports/podofo/0003-uwp_fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/base/PdfCompilerCompat.h b/src/base/PdfCompilerCompat.h +index 706875f..8efb349 100644 +--- a/src/base/PdfCompilerCompat.h ++++ b/src/base/PdfCompilerCompat.h +@@ -113,6 +113,10 @@ + #define NOMINMAX + #endif + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#include <combaseapi.h> ++#endif ++ + // Integer types - fixed size types guaranteed to work anywhere + // because we detect the right underlying type name to use with + // CMake. Use typedefs rather than macros for saner error messages diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL index 233a7011c..630b9efcf 100644 --- a/ports/podofo/CONTROL +++ b/ports/podofo/CONTROL @@ -1,7 +1,8 @@ Source: podofo -Version: 0.9.6-5 +Version: 0.9.6-7 +Homepage: https://sourceforge.net/projects/podofo/ Description: PoDoFo is a library to work with the PDF file format -Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl (!windows&!uwp), freetype +Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl, freetype Feature: fontconfig Description: Enable font manager support on Unix platforms. diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index 5fa631b18..759b6dbe1 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -6,13 +6,19 @@ vcpkg_download_distfile(ARCHIVE FILENAME "podofo-${PODOFO_VERSION}.tar.gz" SHA512 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130 ) + +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(ADDITIONAL_PATCH "0003-uwp_fix.patch") +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${PODOFO_VERSION} - PATCHES - "unique_ptr.patch" - "002-HAVE_UNISTD_H.patch" + PATCHES + 0001-unique_ptr.patch + 0002-HAVE_UNISTD_H.patch + ${ADDITIONAL_PATCH} ) set(PODOFO_NO_FONTMANAGER ON) @@ -28,6 +34,9 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM set(IS_WIN32 ON) endif() +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindOpenSSL.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindZLIB.cmake) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/polyclipping/CONTROL b/ports/polyclipping/CONTROL new file mode 100644 index 000000000..0e97f0a32 --- /dev/null +++ b/ports/polyclipping/CONTROL @@ -0,0 +1,3 @@ +Source: polyclipping +Version: 6.4.2 +Description: The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons. diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake new file mode 100644 index 000000000..b1b1997cf --- /dev/null +++ b/ports/polyclipping/portfile.cmake @@ -0,0 +1,28 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceforge.net/projects/polyclipping/files/clipper_ver6.4.2.zip/download" + FILENAME "clipper_ver6.4.2.zip" + SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL + REF 6.4.2 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/cpp + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/portaudio/CONTROL b/ports/portaudio/CONTROL index d72ff808c..a60d59859 100644 --- a/ports/portaudio/CONTROL +++ b/ports/portaudio/CONTROL @@ -1,3 +1,4 @@ Source: portaudio
Version: 19.0.6.00-5
+Homepage: https://www.portaudio.com/
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.
diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 9bb86005d..6fcbdf437 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_install_cmake() # Remove static builds from dynamic builds and otherwise
# Remove x86 and x64 from resulting files
-if (WIN32)
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file (REMOVE ${CURRENT_PACKAGES_DIR}/lib/portaudio_static_${VCPKG_TARGET_ARCHITECTURE}.lib)
file (REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/portaudio_static_${VCPKG_TARGET_ARCHITECTURE}.lib)
diff --git a/ports/portmidi/CONTROL b/ports/portmidi/CONTROL index 3534c1856..57550e485 100644 --- a/ports/portmidi/CONTROL +++ b/ports/portmidi/CONTROL @@ -1,3 +1,4 @@ Source: portmidi Version: 0.217.1 +Homepage: https://sourceforge.net/projects/portmedia/ Description: Free, cross-platform, open-source I/O library for MIDI diff --git a/ports/ppconsul/CONTROL b/ports/ppconsul/CONTROL new file mode 100644 index 000000000..4591b6a01 --- /dev/null +++ b/ports/ppconsul/CONTROL @@ -0,0 +1,5 @@ +Source: ppconsul +Version: 0.3 +Homepage: https://github.com/oliora/ppconsul +Description: A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure. +Build-Depends: boost-core, boost-variant, curl[openssl] diff --git a/ports/ppconsul/cmake_build.patch b/ports/ppconsul/cmake_build.patch new file mode 100644 index 000000000..f607e37e4 --- /dev/null +++ b/ports/ppconsul/cmake_build.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92e4698..002981e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,6 +75,8 @@ else () + set (CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${CURL_ROOT}/lib") + endif () + find_package(CURL REQUIRED) ++ find_package(OpenSSL REQUIRED) ++ find_package(ZLIB REQUIRED) + endif () + + set(LIBB64_DIR "${PROJECT_SOURCE_DIR}/ext/b64") +@@ -89,7 +91,6 @@ endif() + + add_subdirectory(ext/json11) + add_subdirectory(src) +-add_subdirectory(tests) + + install( + DIRECTORY "${HEADERS_DIR}" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 8e24aab..beaac68 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -85,7 +85,10 @@ if (${USE_CPPNETLIB}) + target_link_libraries(${PROJECT_NAME} PRIVATE ${CPPNETLIB_LIBRARIES}) + else () + target_include_directories(${PROJECT_NAME} PRIVATE ${CURL_INCLUDE_DIR}) +- target_link_libraries(${PROJECT_NAME} PRIVATE ${CURL_LIBRARIES}) ++ target_link_libraries(${PROJECT_NAME} PRIVATE ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES} ZLIB::ZLIB) ++ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++ target_link_libraries(${PROJECT_NAME} PRIVATE "-framework CoreFoundation" "-framework Security") ++ endif () + endif () + + source_group(${PROJECT_NAME} FILES ${SOURCES}) diff --git a/ports/ppconsul/portfile.cmake b/ports/ppconsul/portfile.cmake new file mode 100644 index 000000000..43e7eaeca --- /dev/null +++ b/ports/ppconsul/portfile.cmake @@ -0,0 +1,25 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oliora/ppconsul + REF fd3a22eba03a49623832a8f8c990fee499e3f8fb + SHA512 098f2fa0fdc3f219f5958d0d5b2a620231e3cd94dc3110cfbedb87e787e8402a7b0294f7ffa4fcb4169b0428b4f65376b621e5840706ff7cc8f02ac7fc1d7757 + HEAD_REF master + PATCHES "cmake_build.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + + +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppconsul RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + + +vcpkg_copy_pdbs() diff --git a/ports/pprint/CONTROL b/ports/pprint/CONTROL new file mode 100644 index 000000000..0f06b8c4c --- /dev/null +++ b/ports/pprint/CONTROL @@ -0,0 +1,3 @@ +Source: pprint
+Version: 2019-06-01
+Description: Pretty Printer for Modern C++
diff --git a/ports/pprint/portfile.cmake b/ports/pprint/portfile.cmake new file mode 100644 index 000000000..792b4851b --- /dev/null +++ b/ports/pprint/portfile.cmake @@ -0,0 +1,27 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO p-ranav/pprint
+ REF 71d85f0cd4ec2012c9cf19bfa741e094fcecfa3e
+ SHA512 6b0ff7a75a09226f775fa01fd9753d0f69c4838b40253fe9fc824eeee3c2efa1884e711188858f185f9c765f1dadace0bb72227d71e4d2218c493ddfb60224fa
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DPPRINT_BUILD_TESTS=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/pqp/CONTROL b/ports/pqp/CONTROL index 5eb701bc6..35986cf9f 100644 --- a/ports/pqp/CONTROL +++ b/ports/pqp/CONTROL @@ -1,3 +1,4 @@ Source: pqp
Version: 1.3-3
+Homepage: https://gamma.cs.unc.edu/SSV/
Description: a proximity query package
diff --git a/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch b/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch index 9be5438aa..2f1f9ca29 100644 --- a/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch +++ b/ports/proj4/0001-CMake-add-detection-of-recent-visual-studio-versions.patch @@ -15,8 +15,8 @@ index 294a50b..c7fb6bf 100644 if(MSVC_VERSION EQUAL 1800) set(PROJ_COMPILER_NAME "msvc-12.0") #Visual Studio 2013 endif() -+ if(MSVC_VERSION EQUAL 1900) -+ set(PROJ_COMPILER_NAME "msvc-14.0") #Visual Studio 2015 ++ if(MSVC_VERSION GREATER_EQUAL 1900) ++ set(PROJ_COMPILER_NAME "msvc-14.0") #Visual Studio 2015/2017/2019 + endif() endif(MSVC) diff --git a/ports/proj4/CONTROL b/ports/proj4/CONTROL index cf2519b12..265b8173d 100644 --- a/ports/proj4/CONTROL +++ b/ports/proj4/CONTROL @@ -1,3 +1,4 @@ Source: proj4 -Version: 4.9.3-1 +Version: 4.9.3-3 +Homepage: https://download.osgeo.org/proj Description: PROJ.4 library for cartographic projections diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index f7532a967..b34f04ac3 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,29 +1,33 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/proj-4.9.3) + +set(PROJ4_VERSION 4.9.3) + vcpkg_download_distfile(ARCHIVE - URLS "http://download.osgeo.org/proj/proj-4.9.3.zip" - FILENAME "proj-4.9.3.zip" + URLS "http://download.osgeo.org/proj/proj-${PROJ4_VERSION}.zip" + FILENAME "proj-${PROJ4_VERSION}.zip" SHA512 c9703008cd1f75fe1239b180158e560b9b88ae2ffd900b72923c716908eb86d1abbc4230647af5e3131f8c34481bdc66b03826d669620161ffcfbe67801cb631 ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH}/ +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PROJ4_VERSION} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001-CMake-add-detection-of-recent-visual-studio-versions.patch - ${CMAKE_CURRENT_LIST_DIR}/0002-CMake-fix-error-by-only-setting-properties-for-targe.patch - ${CMAKE_CURRENT_LIST_DIR}/0003-CMake-configurable-cmake-config-install-location.patch + 0001-CMake-add-detection-of-recent-visual-studio-versions.patch + 0002-CMake-fix-error-by-only-setting-properties-for-targe.patch + 0003-CMake-configurable-cmake-config-install-location.patch ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - list(APPEND CMAKE_OPTIONS "-DBUILD_LIBPROJ_SHARED=YES") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_SHARED_LIBS ON) else() - list(APPEND CMAKE_OPTIONS "-DBUILD_LIBPROJ_SHARED=NO") + set(VCPKG_BUILD_SHARED_LIBS OFF) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${CMAKE_OPTIONS} + OPTIONS + -DBUILD_LIBPROJ_SHARED=${VCPKG_BUILD_SHARED_LIBS} -DPROJ_LIB_SUBDIR=lib -DPROJ_INCLUDE_SUBDIR=include -DPROJ_DATA_SUBDIR=share/proj4 @@ -36,8 +40,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/proj4) +vcpkg_fixup_cmake_targets() # Rename library and adapt cmake configuration if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -68,11 +71,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore endif() endif() -# Remove duplicate headers installed from debug build file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Remove data installed from debug build file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -# Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/proj4) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/proj4/COPYING ${CURRENT_PACKAGES_DIR}/share/proj4/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/proj4 RENAME copyright) diff --git a/ports/prometheus-cpp/CONTROL b/ports/prometheus-cpp/CONTROL index e89b84cb2..341af0e8c 100644 --- a/ports/prometheus-cpp/CONTROL +++ b/ports/prometheus-cpp/CONTROL @@ -1,5 +1,5 @@ Source: prometheus-cpp -Version: 0.6.0 +Version: 0.7.0 Description: Prometheus Client Library for Modern C++ Default-Features: compression, pull @@ -7,6 +7,10 @@ Feature: compression Build-Depends: zlib Description: Enable zlib compression +Feature: tests +Build-Depends: gtest +Description: Additional testing support + Feature: pull Build-Depends: civetweb Description: Support for regular pull mode diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index 388623d48..20f58c8a2 100644 --- a/ports/prometheus-cpp/portfile.cmake +++ b/ports/prometheus-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jupp0r/prometheus-cpp - REF v0.6.0 - SHA512 a7e6f902f3007007ec68add5ac63e833c6f383ed0ce103e238b7248497f495e664446df7801000e36021adcb7cfb1d461bbb45e1b4fba9ffa4edfcaf5b5957dd + REF v0.7.0 + SHA512 ff946585e24d84596e851f838b42566512fe368f164254d309b2aa3bda770c5442b6eeb880055351f89e0e2d0b581fddb5b0e70dd5b2a15370e508c4aabbcb1c HEAD_REF master ) @@ -21,13 +21,13 @@ endmacro() feature(compression ENABLE_COMPRESSION) feature(pull ENABLE_PULL) feature(push ENABLE_PUSH) +feature(tests ENABLE_TESTING) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DUSE_THIRDPARTY_LIBRARIES=OFF # use vcpkg packages - -DENABLE_TESTING=FALSE # need gtest 1.8.1 ${FEATURE_OPTIONS} ) diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL index 6cd33935c..0dc2aa6dc 100644 --- a/ports/protobuf/CONTROL +++ b/ports/protobuf/CONTROL @@ -1,7 +1,8 @@ Source: protobuf -Version: 3.7.1 +Version: 3.8.0-1 +Homepage: https://github.com/google/protobuf Description: Protocol Buffers - Google's data interchange format Feature: zlib Description: ZLib based features like Gzip streams -Build-Depends: zlib +Build-Depends: zlib
\ No newline at end of file diff --git a/ports/protobuf/disable-lite.patch b/ports/protobuf/disable-lite.patch deleted file mode 100644 index 3a372e68f..000000000 --- a/ports/protobuf/disable-lite.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/cmake/install.cmake b/cmake/install.cmake
-index 9b2ae93c..7c9670a3 100644
---- a/cmake/install.cmake
-+++ b/cmake/install.cmake
-@@ -22,10 +22,12 @@ foreach(_library ${_protobuf_libraries})
- set_property(TARGET ${_library}
- PROPERTY INSTALL_RPATH "@loader_path")
- endif()
-+ if(NOT "${_library}" STREQUAL "libprotobuf-lite")
- install(TARGETS ${_library} EXPORT protobuf-targets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${_library}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library})
-+ endif()
- endforeach()
-
- if (protobuf_BUILD_PROTOC_BINARIES)
-@@ -40,7 +42,7 @@ if (protobuf_BUILD_PROTOC_BINARIES)
- endif()
- endif (protobuf_BUILD_PROTOC_BINARIES)
-
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
- file(STRINGS extract_includes.bat.in _extract_strings
- REGEX "^copy")
-@@ -121,12 +123,12 @@ configure_file(protobuf-options.cmake
- # Allows the build directory to be used as a find directory.
-
- if (protobuf_BUILD_PROTOC_BINARIES)
-- export(TARGETS libprotobuf-lite libprotobuf libprotoc protoc
-+ export(TARGETS libprotobuf libprotoc protoc
- NAMESPACE protobuf::
- FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake
- )
- else (protobuf_BUILD_PROTOC_BINARIES)
-- export(TARGETS libprotobuf-lite libprotobuf
-+ export(TARGETS libprotobuf
- NAMESPACE protobuf::
- FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake
- )
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 9e0bc15d7..7c04158a8 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -3,12 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/protobuf - REF v3.7.1 - SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f + REF v3.8.0 + SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2 HEAD_REF master PATCHES fix-uwp.patch - disable-lite.patch ) if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") @@ -24,15 +23,15 @@ if(NOT protobuf_BUILD_PROTOC_BINARIES AND NOT EXISTS ${CURRENT_INSTALLED_DIR}/.. endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(protobuf_BUILD_SHARED_LIBS ON) + set(VCPKG_BUILD_SHARED_LIBS ON) else() - set(protobuf_BUILD_SHARED_LIBS OFF) + set(VCPKG_BUILD_SHARED_LIBS OFF) endif() -if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(protobuf_MSVC_STATIC_RUNTIME ON) +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(VCPKG_BUILD_STATIC_CRT OFF) else() - set(protobuf_MSVC_STATIC_RUNTIME OFF) + set(VCPKG_BUILD_STATIC_CRT ON) endif() if("zlib" IN_LIST FEATURES) @@ -45,8 +44,8 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/cmake PREFER_NINJA OPTIONS - -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS} - -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME} + -Dprotobuf_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS} + -Dprotobuf_MSVC_STATIC_RUNTIME=${VCPKG_BUILD_STATIC_CRT} -Dprotobuf_WITH_ZLIB=${protobuf_WITH_ZLIB} -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_INSTALL_CMAKEDIR:STRING=share/protobuf @@ -91,10 +90,10 @@ protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share) if(CMAKE_HOST_WIN32) if(protobuf_BUILD_PROTOC_BINARIES) - file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/protobuf) + file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) else() - file(COPY ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/protobuf DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(COPY ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -107,22 +106,18 @@ if(CMAKE_HOST_WIN32) else() file(GLOB EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/protoc*) foreach(E IN LISTS EXECUTABLES) - file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/protobuf + file(INSTALL ${E} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ) endforeach() protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin) protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libprotobuf-lite.lib) - message(FATAL_ERROR "Expected to not build the lite runtime because it contains some of the same symbols as the full runtime.") -endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(READ ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h _contents) string(REPLACE "\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" "\#define PROTOBUF_USE_DLLS\n\#endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/google/protobuf/stubs/platform_macros.h "${_contents}") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/protobuf RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/ptex/CONTROL b/ports/ptex/CONTROL index e41db7678..17e2bbe5e 100644 --- a/ports/ptex/CONTROL +++ b/ports/ptex/CONTROL @@ -1,4 +1,5 @@ Source: ptex Version: 2.1.28-1 +Homepage: https://github.com/wdas/ptex Description: Per-Face Texture Mapping for Production Rendering. Build-Depends: zlib diff --git a/ports/pthread/CONTROL b/ports/pthread/CONTROL new file mode 100644 index 000000000..6ce319325 --- /dev/null +++ b/ports/pthread/CONTROL @@ -0,0 +1,4 @@ +Source: pthread
+Version: 3.0.0
+Build-Depends: pthreads
+Description: empty package, linking to other port
diff --git a/ports/pthread/portfile.cmake b/ports/pthread/portfile.cmake new file mode 100644 index 000000000..9aefc8241 --- /dev/null +++ b/ports/pthread/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/pthreads/CMakeLists.txt b/ports/pthreads/CMakeLists.txt deleted file mode 100644 index 32f25e716..000000000 --- a/ports/pthreads/CMakeLists.txt +++ /dev/null @@ -1,216 +0,0 @@ -cmake_minimum_required(VERSION 3.9.0) - -project(pthreads) - -set(PTHREAD_PUBLIC_HEADERS pthread.h sched.h semaphore.h) - -set(PTHREAD_SHARED_SOURCES - autostatic.c - barrier.c - cancel.c - cleanup.c - condvar.c - create.c - dll.c - errno.c - exit.c - fork.c - global.c - misc.c - mutex.c - nonportable.c - private.c - rwlock.c - sched.c - semaphore.c - signal.c - spin.c - sync.c - tsd.c - attr.C - version.rc -) -set(PTHREAD_STATIC_SOURCES - autostatic.c - cleanup.c - create.c - dll.c - errno.c - fork.c - global.c - pthread_attr_destroy.c - pthread_attr_getdetachstate.c - pthread_attr_getinheritsched.c - pthread_attr_getschedparam.c - pthread_attr_getschedpolicy.c - pthread_attr_getscope.c - pthread_attr_getstackaddr.c - pthread_attr_getstacksize.c - pthread_attr_init.c - pthread_attr_setdetachstate.c - pthread_attr_setinheritsched.c - pthread_attr_setschedparam.c - pthread_attr_setschedpolicy.c - pthread_attr_setscope.c - pthread_attr_setstackaddr.c - pthread_attr_setstacksize.c - pthread_barrier_destroy.c - pthread_barrier_init.c - pthread_barrier_wait.c - pthread_barrierattr_destroy.c - pthread_barrierattr_getpshared.c - pthread_barrierattr_init.c - pthread_barrierattr_setpshared.c - pthread_cancel.c - pthread_cond_destroy.c - pthread_cond_init.c - pthread_cond_signal.c - pthread_cond_wait.c - pthread_condattr_destroy.c - pthread_condattr_getpshared.c - pthread_condattr_init.c - pthread_condattr_setpshared.c - pthread_delay_np.c - pthread_detach.c - pthread_equal.c - pthread_exit.c - pthread_getconcurrency.c - pthread_getschedparam.c - pthread_getspecific.c - pthread_getunique_np.c - pthread_getw32threadhandle_np.c - pthread_join.c - pthread_key_create.c - pthread_key_delete.c - pthread_kill.c - pthread_mutex_consistent.c - pthread_mutex_destroy.c - pthread_mutex_init.c - pthread_mutex_lock.c - pthread_mutex_timedlock.c - pthread_mutex_trylock.c - pthread_mutex_unlock.c - pthread_mutexattr_destroy.c - pthread_mutexattr_getkind_np.c - pthread_mutexattr_getpshared.c - pthread_mutexattr_getrobust.c - pthread_mutexattr_gettype.c - pthread_mutexattr_init.c - pthread_mutexattr_setkind_np.c - pthread_mutexattr_setpshared.c - pthread_mutexattr_setrobust.c - pthread_mutexattr_settype.c - pthread_num_processors_np.c - pthread_once.c - pthread_rwlock_destroy.c - pthread_rwlock_init.c - pthread_rwlock_rdlock.c - pthread_rwlock_tryrdlock.c - pthread_rwlock_trywrlock.c - pthread_rwlock_unlock.c - pthread_rwlock_wrlock.c - pthread_rwlockattr_destroy.c - pthread_rwlockattr_getpshared.c - pthread_rwlockattr_init.c - pthread_rwlockattr_setpshared.c - pthread_self.c - pthread_setcancelstate.c - pthread_setcanceltype.c - pthread_setconcurrency.c - pthread_setschedparam.c - pthread_setspecific.c - pthread_spin_destroy.c - pthread_spin_init.c - pthread_spin_lock.c - pthread_spin_trylock.c - pthread_spin_unlock.c - pthread_testcancel.c - pthread_timechange_handler_np.c - pthread_win32_attach_detach_np.c - ptw32_calloc.c - ptw32_callUserDestroyRoutines.c - ptw32_cond_check_need_init.c - ptw32_getprocessors.c - ptw32_is_attr.c - ptw32_MCS_lock.c - ptw32_mutex_check_need_init.c - ptw32_new.c - ptw32_processInitialize.c - ptw32_processTerminate.c - ptw32_relmillisecs.c - ptw32_reuse.c - ptw32_rwlock_check_need_init.c - ptw32_semwait.c - ptw32_spinlock_check_need_init.c - ptw32_threadDestroy.c - ptw32_threadStart.c - ptw32_throw.c - ptw32_timespec.c - ptw32_tkAssocCreate.c - ptw32_tkAssocDestroy.c - sched_get_priority_max.c - sched_get_priority_min.c - sched_getscheduler.c - sched_setscheduler.c - sched_yield.c - sem_close.c - sem_destroy.c - sem_getvalue.c - sem_init.c - sem_open.c - sem_post_multiple.c - sem_post.c - sem_timedwait.c - sem_trywait.c - sem_unlink.c - sem_wait.c - signal.c - w32_CancelableWait.c -) - - - -add_definitions(-DPTW32_ARCH="${PTW32_ARCH}" -DPTW32_RC_MSC -DHAVE_PTW32_CONFIG_H -D_TIMESPEC_DEFINED) - -if(BUILD_SHARED_LIBS) - set(PTHREAD_SOURCES ${PTHREAD_SHARED_SOURCES}) - add_definitions(-DPTW32_BUILD) -else() - set(PTHREAD_SOURCES ${PTHREAD_STATIC_SOURCES}) - add_definitions(-DPTW32_STATIC_LIB) -endif() - - -if(PTHREADS_BUILD_CPP) - set(PTHREADS_EXCEPTION_SCHEME CE) - add_definitions(/__CLEANUP_CXX) -elseif(PTHREADS_BUILD_SEH) - set(PTHREADS_EXCEPTION_SCHEME SE) - add_definitions(/__CLEANUP_SEH) -else() - set(PTHREADS_EXCEPTION_SCHEME C) -endif() - -set(PTHREADS_COMPATIBILITY_VERSION 2) -set(CMAKE_DEBUG_POSTFIX d) -set(PTHREADS_COMPILER V) - -set(PTHREADS_LIBRARY "pthread${PTHREADS_COMPILER}${PTHREADS_EXCEPTION_SCHEME}${PTHREADS_COMPATIBILITY_VERSION}") - -add_library(pthreads ${PTHREAD_SOURCES}) -target_include_directories(pthreads PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -set_target_properties(pthreads PROPERTIES OUTPUT_NAME ${PTHREADS_LIBRARY}) -if(NOT DISABLE_INSTALL_HEADERS) - set_property(TARGET pthreads PROPERTY PUBLIC_HEADER ${PTHREAD_PUBLIC_HEADERS}) -endif() - -install( - TARGETS pthreads EXPORT pthreads-config - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - PUBLIC_HEADER DESTINATION include - INCLUDES DESTINATION include -) -install(EXPORT pthreads-config DESTINATION share/pthreads) - diff --git a/ports/pthreads/CONTROL b/ports/pthreads/CONTROL index d22280d90..e1b96a438 100644 --- a/ports/pthreads/CONTROL +++ b/ports/pthreads/CONTROL @@ -1,3 +1,4 @@ Source: pthreads -Version: 2.9.1-5 +Version: 3.0.0-1 +Homepage: https://sourceware.org/pub/pthreads-win32/ Description: pthreads for windows diff --git a/ports/pthreads/portfile.cmake b/ports/pthreads/portfile.cmake index 43489adb6..393fefddc 100644 --- a/ports/pthreads/portfile.cmake +++ b/ports/pthreads/portfile.cmake @@ -1,54 +1,100 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") +include(vcpkg_common_functions) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + message(FATAL_ERROR "${PORT} does not currently support UWP platform nor ARM architectures") endif() -if(VCPKG_CMAKE_SYSTEM_NAME) + +if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) return() endif() -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pthreads-w32-2-9-1-release) +set(PTHREADS4W_VERSION "3.0.0") + vcpkg_download_distfile(ARCHIVE - URLS "https://www.mirrorservice.org/sites/sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz" - FILENAME "pthreads-w32-2-9-1-release.tar.gz" - SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551 + URLS "https://sourceforge.net/projects/pthreads4w/files/pthreads4w-code-v${PTHREADS4W_VERSION}.zip/download" + FILENAME "pthreads4w-code-v${PTHREADS4W_VERSION}.zip" + SHA512 49e541b66c26ddaf812edb07b61d0553e2a5816ab002edc53a38a897db8ada6d0a096c98a9af73a8f40c94283df53094f76b429b09ac49862465d8697ed20013 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${PTHREADS4W_VERSION} ) -vcpkg_extract_source_archive(${ARCHIVE}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +find_program(NMAKE nmake REQUIRED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DPTW32_ARCH=${VCPKG_TARGET_ARCHITECTURE} - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +################ +# Release build +################ +message(STATUS "Building ${TARGET_TRIPLET}-rel") +file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL) +vcpkg_execute_required_process( + COMMAND ${NMAKE} -f Makefile all install + "DESTROOT=\"${INST_DIR_REL}\"" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME nmake-build-${TARGET_TRIPLET}-release ) +message(STATUS "Building ${TARGET_TRIPLET}-rel done") -vcpkg_install_cmake() +################ +# Debug build +################ +message(STATUS "Building ${TARGET_TRIPLET}-dbg") +file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug" INST_DIR_DBG) +vcpkg_execute_required_process( + COMMAND ${NMAKE} /G -f Makefile all install + "DESTROOT=\"${INST_DIR_DBG}\"" + WORKING_DIRECTORY ${SOURCE_PATH} + LOGNAME nmake-build-${TARGET_TRIPLET}-debug +) +message(STATUS "Building ${TARGET_TRIPLET}-dbg done") -vcpkg_fixup_cmake_targets() +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVC3d.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVCE3d.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pthreadVSE3d.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVC3.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVCE3.dll") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/pthreadVSE3.dll") -vcpkg_copy_pdbs() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3.lib") -file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/*.h") -foreach(HEADER ${HEADERS}) - file(READ "${HEADER}" _contents) - string(REPLACE "defined(_TIMESPEC_DEFINED)" "1" _contents "${_contents}") - string(REPLACE "defined(PTW32_RC_MSC)" "1" _contents "${_contents}") - if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - string(REPLACE "!defined(PTW32_STATIC_LIB)" "0" _contents "${_contents}") - endif() - file(WRITE "${HEADER}" "${_contents}") -endforeach() +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVC3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3d.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3.lib") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3.lib") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) -file(INSTALL - ${CURRENT_PACKAGES_DIR}/lib/pthreadVC2.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib/manual-link - RENAME pthread.lib -) -file(INSTALL - ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC2d.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link - RENAME pthread.lib -) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVC3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVC3.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVCE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVCE3.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpthreadVSE3.lib ${CURRENT_PACKAGES_DIR}/lib/pthreadVSE3.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVC3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVC3d.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVCE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVCE3d.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpthreadVSE3d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pthreadVSE3d.lib) +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads RENAME copyright) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthread) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/pthreads_windows) diff --git a/ports/pthreads/vcpkg-cmake-wrapper.cmake b/ports/pthreads/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..ec5c473fb --- /dev/null +++ b/ports/pthreads/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,218 @@ +#.rst: +# PThreads4W config wrap for vcpkg +# ------------ +# +# Find the PThread4W includes and library. +# +# Result Variables +# ^^^^^^^^^^^^^^^^ +# +# This script defines the following variables: +# +# ``PThreads4W_FOUND`` +# True if PThreads4W library found +# +# ``PThreads4W_VERSION`` +# Containing the PThreads4W version tag (manually defined) +# +# ``PThreads4W_INCLUDE_DIR`` +# Location of PThreads4W headers +# +# ``PThreads4W_LIBRARY`` +# List of libraries to link with when using PThreads4W (no exception handling) +# +# ``PThreads4W_CXXEXC_LIBRARY`` +# List of libraries to link with when using PThreads4W (C++ exception handling) +# +# ``PThreads4W_STRUCTEXC_LIBRARY`` +# List of libraries to link with when using PThreads4W (struct exception handling) +# +# Result Targets +# ^^^^^^^^^^^^^^^^ +# +# This script defines the following targets: +# +# ``PThreads4W::PThreads4W`` +# Target to use PThreads4W (no exception handling) +# +# ``PThreads4W::PThreads4W_CXXEXC`` +# Target to use PThreads4W (C++ exception handling) +# +# ``PThreads4W::PThreads4W_STRUCTEXC`` +# Target to use PThreads4W (struct exception handling) +# + +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) + +if(NOT PThreads4W_INCLUDE_DIR) + find_path(PThreads4W_INCLUDE_DIR NAMES pthread.h) +endif() + +set(PThreads4W_MAJOR_VERSION 3) +set(PThreads4W_MINOR_VERSION 0) +set(PThreads4W_PATCH_VERSION 0) +set(PThreads_VERSION "${PThreads4W_MAJOR_VERSION}.${PThreads4W_MINOR_VERSION}.${PThreads4W_PATCH_VERSION}") + +# Allow libraries to be set manually +if(NOT PThreads4W_LIBRARY) + find_library(PThreads4W_LIBRARY_RELEASE NAMES pthreadVC${PThreads4W_MAJOR_VERSION}) + find_library(PThreads4W_LIBRARY_DEBUG NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d) + select_library_configurations(PThreads4W) +endif() +if(NOT PThreads4W_CXXEXC_LIBRARY) + find_library(PThreads4W_CXXEXC_LIBRARY_RELEASE NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}) + find_library(PThreads4W_CXXEXC_LIBRARY_DEBUG NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d) + select_library_configurations(PThreads4W_CXXEXC) +endif() +if(NOT PThreads4W_STRUCTEXC_LIBRARY) + find_library(PThreads4W_STRUCTEXC_LIBRARY_RELEASE NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}) + find_library(PThreads4W_STRUCTEXC_LIBRARY_DEBUG NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d) + select_library_configurations(PThreads4W_STRUCTEXC) +endif() +if(WIN32) + string( REPLACE ".lib" ".dll" PThreads4W_LIBRARY_RELEASE_DLL "${PThreads4W_LIBRARY_RELEASE}" ) + string( REPLACE ".lib" ".dll" PThreads4W_LIBRARY_DEBUG_DLL "${PThreads4W_LIBRARY_DEBUG}" ) + string( REPLACE ".lib" ".dll" PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL "${PThreads4W_CXXEXC_LIBRARY_RELEASE}" ) + string( REPLACE ".lib" ".dll" PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" ) + string( REPLACE ".lib" ".dll" PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}" ) + string( REPLACE ".lib" ".dll" PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" ) +endif() + +find_package_handle_standard_args(PThreads4W DEFAULT_MSG PThreads4W_LIBRARY PThreads4W_CXXEXC_LIBRARY PThreads4W_STRUCTEXC_LIBRARY PThreads4W_INCLUDE_DIR) +mark_as_advanced(PThreads4W_INCLUDE_DIR PThreads4W_LIBRARY PThreads4W_CXXEXC_LIBRARY PThreads4W_STRUCTEXC_LIBRARY) + +#Compatibility definitions, deprecated +set(PTHREAD_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "" FORCE) +set(PTHREADS_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "" FORCE) +set(PThreads_windows_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "" FORCE) +set(PTHREAD_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "" FORCE) +set(PTHREADS_LIBRARIES ${PThreads4W_LIBRARY} CACHE STRING "" FORCE) +set(PTHREAD_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "" FORCE) +set(PTHREADS_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "" FORCE) +set(LIBPTHREAD ${PThreads4W_LIBRARY} CACHE STRING "" FORCE) +set(LIBPTHREADS ${PThreads4W_LIBRARY} CACHE STRING "" FORCE) +set(PThreads_windows_LIBRARY ${PThreads4W_LIBRARY} CACHE STRING "" FORCE) + + +#TARGETS +if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W_CXXEXC ) + if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads4W::PThreads4W_CXXEXC SHARED IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_CXXEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads4W::PThreads4W_CXXEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads4W::PThreads4W_CXXEXC UNKNOWN IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_CXXEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads4W::PThreads4W_CXXEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_CXXEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_CXXEXC_LIBRARY_DEBUG}" ) + endif() + endif() +endif() + +if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W_STRUCTEXC ) + if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads4W::PThreads4W_STRUCTEXC SHARED IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads4W::PThreads4W_STRUCTEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads4W::PThreads4W_STRUCTEXC UNKNOWN IMPORTED ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_STRUCTEXC_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads4W::PThreads4W_STRUCTEXC APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W_STRUCTEXC PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_STRUCTEXC_LIBRARY_DEBUG}" ) + endif() + endif() +endif() + +if( PThreads4W_FOUND AND NOT TARGET PThreads4W::PThreads4W ) + if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads4W::PThreads4W SHARED IMPORTED ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads4W::PThreads4W APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads4W::PThreads4W UNKNOWN IMPORTED ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads4W::PThreads4W APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads4W::PThreads4W PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + endif() +endif() + +#Compatibility targets, deprecated +if( PThreads4W_FOUND AND NOT TARGET PThreads_windows::PThreads_windows ) + if( EXISTS "${PThreads4W_LIBRARY_RELEASE_DLL}" ) + add_library( PThreads_windows::PThreads_windows SHARED IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE_DLL}" + IMPORTED_IMPLIB "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG_DLL}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + else() + add_library( PThreads_windows::PThreads_windows UNKNOWN IMPORTED ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_RELEASE "${PThreads4W_LIBRARY_RELEASE}" + INTERFACE_INCLUDE_DIRECTORIES "${PThreads4W_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS Release + IMPORTED_LINK_INTERFACE_LANGUAGES "C" ) + if( EXISTS "${PThreads4W_LIBRARY_DEBUG}" ) + set_property( TARGET PThreads_windows::PThreads_windows APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug ) + set_target_properties( PThreads_windows::PThreads_windows PROPERTIES + IMPORTED_LOCATION_DEBUG "${PThreads4W_LIBRARY_DEBUG}" ) + endif() + endif() +endif() diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 5e2dad599..a68f43833 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,3 +1,4 @@ Source: pugixml -Version: 1.9-1 +Version: 1.9-2 +Homepage: https://github.com/zeux/pugixml Description: C++ XML processing library diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index b0ec2cc58..62d0a4b74 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,14 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# include(vcpkg_common_functions) vcpkg_from_github( @@ -20,14 +9,13 @@ vcpkg_from_github( ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${SOURCE_PATH} ) vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/pugixml") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pugixml) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/pugixml RENAME copyright) diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index 880d6c3b7..634afca38 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,4 +1,5 @@ Source: pybind11 Version: 2.2.4 +Homepage: https://github.com/pybind/pybind11 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. Build-Depends: python3 (windows)
\ No newline at end of file diff --git a/ports/pystring/CONTROL b/ports/pystring/CONTROL index 9bdd7daf2..698e0466d 100644 --- a/ports/pystring/CONTROL +++ b/ports/pystring/CONTROL @@ -1,3 +1,4 @@ Source: pystring
Version: 1.1.3-2
+Homepage: https://github.com/imageworks/pystring
Description: Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string
diff --git a/ports/python3/CONTROL b/ports/python3/CONTROL index db8f63766..1b9a01988 100644 --- a/ports/python3/CONTROL +++ b/ports/python3/CONTROL @@ -1,3 +1,4 @@ Source: python3 Version: 3.7.3 +Homepage: https://github.com/python/cpython Description: The Python programming language as an embeddable library
\ No newline at end of file diff --git a/ports/qca/0002-fix-build-error.patch b/ports/qca/0002-fix-build-error.patch new file mode 100644 index 000000000..f4ddee3a0 --- /dev/null +++ b/ports/qca/0002-fix-build-error.patch @@ -0,0 +1,57 @@ +diff --git a/plugins/qca-gnupg/CMakeLists.txt b/plugins/qca-gnupg/CMakeLists.txt +index 1ed8e21..20890dd 100644 +--- a/plugins/qca-gnupg/CMakeLists.txt ++++ b/plugins/qca-gnupg/CMakeLists.txt +@@ -68,6 +68,4 @@ if(NOT DEVELOPER_MODE) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- install_pdb(qca-gnupg ${QCA_CRYPTO_INSTALL_DIR}) + endif() +diff --git a/plugins/qca-logger/CMakeLists.txt b/plugins/qca-logger/CMakeLists.txt +index ba6926e..45e1986 100644 +--- a/plugins/qca-logger/CMakeLists.txt ++++ b/plugins/qca-logger/CMakeLists.txt +@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- install_pdb(qca-logger ${QCA_CRYPTO_INSTALL_DIR}) + endif() +diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt +index af3d756..c8480a3 100644 +--- a/plugins/qca-ossl/CMakeLists.txt ++++ b/plugins/qca-ossl/CMakeLists.txt +@@ -65,8 +65,6 @@ if(OPENSSL_FOUND) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- install_pdb(qca-ossl ${QCA_CRYPTO_INSTALL_DIR}) + endif() + + else(OPENSSL_FOUND) +diff --git a/plugins/qca-softstore/CMakeLists.txt b/plugins/qca-softstore/CMakeLists.txt +index d7af072..3c64870 100644 +--- a/plugins/qca-softstore/CMakeLists.txt ++++ b/plugins/qca-softstore/CMakeLists.txt +@@ -20,6 +20,4 @@ if(NOT DEVELOPER_MODE) + LIBRARY DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + ARCHIVE DESTINATION "${QCA_CRYPTO_INSTALL_DIR}" + RUNTIME DESTINATION "${QCA_CRYPTO_INSTALL_DIR}") +- +- install_pdb(qca-softstore ${QCA_CRYPTO_INSTALL_DIR}) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2e81974..907049c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -184,6 +184,5 @@ if(NOT DEVELOPER_MODE) + FRAMEWORK DESTINATION "${QCA_LIBRARY_INSTALL_DIR}" + PUBLIC_HEADER DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}" INCLUDES DESTINATION "${QCA_FULL_INCLUDE_INSTALL_DIR}" + ) +- install_pdb(${QCA_LIB_NAME} ${QCA_BINARY_INSTALL_DIR}) + endif() + diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL index 4c09bf3b1..356dff560 100644 --- a/ports/qca/CONTROL +++ b/ports/qca/CONTROL @@ -1,4 +1,5 @@ Source: qca -Version: 2.2.0-4 -Description: Qt Cryptographic Architecture (QCA). Sources: https://cgit.kde.org/qca.git/ +Version: 2.2.1 +Description: Qt Cryptographic Architecture (QCA). +Homepage: https://cgit.kde.org/qca.git/ Build-Depends: qt5-base diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 55acdc0b6..9b2b15397 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -20,9 +20,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/qca - REF 19ec49f89a0a560590ec733c549b92e199792837 - SHA512 6a83ee6715a9a922f4fde5af571e2aad043ac5cbd522f57365038dd31879b44eb57a099ff797793d7ee19e320e0a151e5beacdff3bed525d39ea0b8e46efca9a - PATCHES 0001-fix-path-for-vcpkg.patch + REF v2.2.1 + SHA512 6b10f9bbf9ebf136655d1c6464f3849c8581b3cd5ef07b0697ddd5f32611dce301af5148e8e6fe91e763301e68994957a62a278334ee7a78559101f411f27d49 + PATCHES + 0001-fix-path-for-vcpkg.patch + 0002-fix-build-error.patch ) # According to: diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL index f14eb4344..d8a402049 100644 --- a/ports/qhull/CONTROL +++ b/ports/qhull/CONTROL @@ -1,3 +1,4 @@ Source: qhull Version: 7.2.1-3 +Homepage: https://github.com/qhull/qhull Description: computes the convex hull, Delaunay triangulation, Voronoi diagram diff --git a/ports/qpid-proton/CONTROL b/ports/qpid-proton/CONTROL index 3ce196241..8544cb959 100644 --- a/ports/qpid-proton/CONTROL +++ b/ports/qpid-proton/CONTROL @@ -1,4 +1,5 @@ Source: qpid-proton
-Version: 0.24.0-2
-Build-Depends: openssl, libuv (osx)
-Description: Qpid Proton is a high-performance, lightweight messaging library.
+Version: 0.28.0
+Build-Depends: openssl (!windows&!uwp), libuv (osx), jsoncpp
+Homepage: https://github.com/apache/qpid-proton
+Description: Qpid Proton is a high-performance, lightweight messaging library.
\ No newline at end of file diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 760f74371..53aebeb0c 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -1,43 +1,43 @@ include(vcpkg_common_functions) -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -# Use this throughout rather than literal string -set(QPID_PROTON_VERSION 0.24.0) vcpkg_find_acquire_program(PYTHON2) -# Go grab the code. Set SHA512 to 1 to get correct sha from download vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/qpid-proton - REF ${QPID_PROTON_VERSION} - SHA512 a22154d5ea96330e22245a54233101256f02d10ee814a7f0f4b654e56128615acee0cfc0387cbec9b877dd20cc23a5b1635aa9e1d1b60a4b9aa985e449dcb62e + REF 0.28.0 + SHA512 dc253218a076ea56d64e0aaeb6ef9e7345bb9ac700c58b8ea6cb9b3c79d66b0667bcc62cbb45f9ce3455fa8f97b7dfb1c2096d269d1b5b9c5c650ef61a126cfe HEAD_REF next ) -# Run cmake configure step vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + PREFER_NINJA + OPTIONS -DPYTHON_EXECUTABLE=${PYTHON2} + -DENABLE_JSONCPP=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON ) -# Run cmake install step vcpkg_install_cmake() -# Copy across any pdbs generated vcpkg_copy_pdbs() -# Rename share subdirectory -file(RENAME ${CURRENT_PACKAGES_DIR}/share/proton-${QPID_PROTON_VERSION} - ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(GLOB SHARE_DIR ${CURRENT_PACKAGES_DIR}/share/*) +file(RENAME ${SHARE_DIR} ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp) +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp/Proton) +file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp/Proton) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tmp/Proton TARGET_PATH share/proton) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ProtonCpp TARGET_PATH share/protoncpp) -# Vcpkg expects file with name "copyright" file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) -# Remove extraneous unrequired-for-vcpkg files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/examples) diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL index 41b86bba9..ee8a7be2f 100644 --- a/ports/qscintilla/CONTROL +++ b/ports/qscintilla/CONTROL @@ -1,4 +1,5 @@ Source: qscintilla Version: 2.10-8 +Homepage: https://sourceforge.net/projects/pyqt Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin) Build-Depends: qt5-base, qt5-macextras (osx), qt5-winextras (windows) diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index fedcd7bd8..515dd5513 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-3d -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 96df50dd7..444fbbcf2 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qt3d 4c054b1075e976043fca5033a27be8a3f0d2df5dde5da4a536a9e7d61cdfd91007a2bf687bc19ad59724a2d53a9730b5d2446238bb7c6289d6a5dd3bf220a409) +qt_modular_library(qt3d 679c2dbc60fc53c1c5469369f25244bd844c2e6e723a1b451f7cbb50bfa018e6fb715214e5a5df6fb32d7c7936bb6c99d85e299fe2b76344bcf774c93ed0acd0) diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL index 486dbf518..60ca38370 100644 --- a/ports/qt5-activeqt/CONTROL +++ b/ports/qt5-activeqt/CONTROL @@ -1,4 +1,4 @@ Source: qt5-activeqt -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 ActiveQt Module - ActiveX components Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-activeqt/portfile.cmake b/ports/qt5-activeqt/portfile.cmake index 9914ef6fd..1e63132d8 100644 --- a/ports/qt5-activeqt/portfile.cmake +++ b/ports/qt5-activeqt/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtactiveqt ff2871a7c0fa2674354f8bbd32196d8b2af34212e09e0f8c1df23182353959464dfb8c96800e45dae380f239082f62ed6f1904e72dc93e43141edb4f2606edd9) +qt_modular_library(qtactiveqt 477c42653a59739aeeb17ab54bdd5cc50bc72a117250926e940c34d3f81d1b92356074056fb49f3cd811a88840377836b2d97cea8cbc62ae1d895168e7860753) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/plugins/platforminputcontexts) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index a58004756..0082dc46c 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,5 @@ -Source: qt5-base -Version: 5.12.1-6 -Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl +Source: qt5-base
+Version: 5.12.3-1
+Homepage: https://www.qt.io/
+Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
+Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
diff --git a/ports/qt5-base/fix-gui-configure-json.patch b/ports/qt5-base/fix-gui-configure-json.patch deleted file mode 100644 index 060fd0b3c..000000000 --- a/ports/qt5-base/fix-gui-configure-json.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/gui/configure.json b/src/gui/configure.json -index 89934c8f..70d08177 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -239,7 +239,8 @@ - "sources": [ - { "type": "pkgConfig", "args": "freetype2" }, - { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, -- { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } -+ { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, -+ { "libs": "-lfreetype" } - ], - "use": [ - { "lib": "zlib", "condition": "features.system-zlib" } -@@ -250,7 +251,7 @@ - "test": { - "tail": [ - "#ifndef FC_RGBA_UNKNOWN", -- "# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define", -+ "# error This version of fontconfig is too old, it is missing the FC_RGBA_UNKNOWN define", - "#endif" - ], - "main": [ -@@ -1436,7 +1437,7 @@ - }, - "eglfs_x11": { - "label": "EGLFS X11", -- "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11", -+ "condition": "features.eglfs && features.xcb-xlib && features.egl_x11", - "output": [ "privateFeature" ] - }, - "gif": { -@@ -1569,7 +1570,6 @@ - }, - "xcb-xlib": { - "label": "XCB Xlib", -- "emitIf": "features.xcb", - "condition": "features.xlib && libs.xcb_xlib", - "output": [ "privateFeature" ] - }, diff --git a/ports/qt5-base/install_qt.cmake b/ports/qt5-base/install_qt.cmake index a67962200..4eed6cbe5 100644 --- a/ports/qt5-base/install_qt.cmake +++ b/ports/qt5-base/install_qt.cmake @@ -26,7 +26,21 @@ function(install_qt) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}") - set(_path "$ENV{PATH}") + + if (CMAKE_HOST_WIN32) + # flex and bison for ANGLE library + vcpkg_find_acquire_program(FLEX) + get_filename_component(FLEX_EXE_PATH ${FLEX} DIRECTORY) + get_filename_component(FLEX_DIR ${FLEX_EXE_PATH} NAME) + + file(COPY ${FLEX_EXE_PATH} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools" ) + set(FLEX_TEMP "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools/${FLEX_DIR}") + file(RENAME "${FLEX_TEMP}/win_bison.exe" "${FLEX_TEMP}/bison.exe") + file(RENAME "${FLEX_TEMP}/win_flex.exe" "${FLEX_TEMP}/flex.exe") + vcpkg_add_to_path("${FLEX_TEMP}") + endif() + + set(_path "$ENV{PATH}") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Package ${TARGET_TRIPLET}-dbg") diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 3e6c5ae46..6020376ba 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n" + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() @@ -12,20 +12,18 @@ include(configure_qt) include(install_qt) set(MAJOR_MINOR 5.12) -set(FULL_VERSION ${MAJOR_MINOR}.1) +set(FULL_VERSION ${MAJOR_MINOR}.3) set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" FILENAME ${ARCHIVE_NAME} - SHA512 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25 + SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE_FILE}" REF ${FULL_VERSION} - PATCHES - fix-gui-configure-json.patch ) # Remove vendored dependencies to ensure they are not picked up by the build @@ -71,7 +69,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore OPTIONS ${CORE_OPTIONS} -mp - -opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" + -opengl dynamic # other options are "-no-opengl", "-opengl angle", and "-opengl desktop" OPTIONS_RELEASE LIBJPEG_LIBS="-ljpeg" ZLIB_LIBS="-lzlib" @@ -171,7 +169,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY ${CMAKE_CURRENT_LIST_DIR}/qt_debug.conf DESTINATION ${CURRENT_PACKAGES_DIR}/tools/qt5) endif() -vcpkg_execute_required_process( +vcpkg_execute_required_process( COMMAND ${PYTHON3} ${CMAKE_CURRENT_LIST_DIR}/fixcmake.py WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/cmake LOGNAME fix-cmake @@ -251,4 +249,4 @@ endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5core) file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -#
\ No newline at end of file +# diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 7f3e7df2f..8e00aaca7 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -2,9 +2,9 @@ _find_package(${ARGS}) function(add_qt_library _target) foreach(_lib IN LISTS ARGN) - find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES plugins/platforms) + find_library(${_lib}_LIBRARY_DEBUG NAMES ${_lib}d PATH_SUFFIXES debug/plugins/platforms) find_library(${_lib}_LIBRARY_RELEASE NAMES ${_lib} PATH_SUFFIXES plugins/platforms) - set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES + set_property(TARGET ${_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES \$<\$<NOT:\$<CONFIG:DEBUG>>:${${_lib}_LIBRARY_RELEASE}>\$<\$<CONFIG:DEBUG>:${${_lib}_LIBRARY_DEBUG}>) endforeach() endfunction() @@ -21,28 +21,28 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") find_package(OpenSSL) find_package(harfbuzz CONFIG) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz - ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto + ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto ) - add_qt_library(Qt5::Core - pcre2-16 + add_qt_library(Qt5::Core + pcre2-16 Qt5ThemeSupport Qt5EventDispatcherSupport - Qt5PlatformCompositorSupport + Qt5PlatformCompositorSupport Qt5FontDatabaseSupport) if(MSVC) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES Netapi32.lib Ws2_32.lib Mincore.lib Winmm.lib Iphlpapi.lib Wtsapi32.lib Dwmapi.lib Imm32.lib) add_qt_library(Qt5::Core Qt5WindowsUIAutomationSupport qwindows qdirect2d) elseif(APPLE) - set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES - "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" - "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" + set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES + "-weak_framework DiskArbitration" "-weak_framework IOKit" "-weak_framework Foundation" "-weak_framework CoreServices" + "-weak_framework AppKit" "-weak_framework Security" "-weak_framework ApplicationServices" "-weak_framework CoreFoundation" "-weak_framework SystemConfiguration" "-weak_framework Carbon" "-weak_framework QuartzCore" @@ -53,10 +53,10 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") "-weak_framework CoreGraphics" "-weak_framework OpenGL" "-weak_framework AGL" - "-weak_framework ImageIO" + "-weak_framework ImageIO" "z" "m" cups) - add_qt_library(Qt5::Core + add_qt_library(Qt5::Core Qt5GraphicsSupport Qt5ClipboardSupport Qt5AccessibilitySupport diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL index 0b5964bb3..672aaf2d1 100644 --- a/ports/qt5-charts/CONTROL +++ b/ports/qt5-charts/CONTROL @@ -1,4 +1,4 @@ Source: qt5-charts -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-charts/portfile.cmake b/ports/qt5-charts/portfile.cmake index cb3c99d2a..0d7b7f170 100644 --- a/ports/qt5-charts/portfile.cmake +++ b/ports/qt5-charts/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtcharts 1915581f9cd644e0c6d9d38f5881ce388437ab1fa45554c01625ffd5c51067188450ff9329ccfcab17222389876658bd1e4595a426e75ef637311888451cfcd2) +qt_modular_library(qtcharts f5940589c7a2dc5fcd3484397613f13ab41311c8ffb70a3484e64dc5bad24e18c94c9ebbe6716c1ec7c81b7863113ebfdb593f2d194608b2e3fb0b0b5c9c9102) diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL index 45319857c..741af6767 100644 --- a/ports/qt5-connectivity/CONTROL +++ b/ports/qt5-connectivity/CONTROL @@ -1,4 +1,4 @@ Source: qt5-connectivity
-Version: 5.12.0
+Version: 5.12.3
Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-connectivity/portfile.cmake b/ports/qt5-connectivity/portfile.cmake index 91e15366a..5cc8777e5 100644 --- a/ports/qt5-connectivity/portfile.cmake +++ b/ports/qt5-connectivity/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtconnectivity 89a16da0bb958da3123a2cebec45b954b034b2a586490c8217769e2e0f22080676e57f847c9a6622ea2129f539ac8732e0968f38517236c9880ff9b715492ede)
+qt_modular_library(qtconnectivity 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269)
diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL index 2b6627465..5ef4728df 100644 --- a/ports/qt5-datavis3d/CONTROL +++ b/ports/qt5-datavis3d/CONTROL @@ -1,4 +1,4 @@ Source: qt5-datavis3d -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-datavis3d/portfile.cmake b/ports/qt5-datavis3d/portfile.cmake index 4927f7007..cc9df8c4a 100644 --- a/ports/qt5-datavis3d/portfile.cmake +++ b/ports/qt5-datavis3d/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdatavis3d a0eff0f58515720d9c8e37bce16a3f6f719ca748c6228f183eb7e2fe2cc024195e5122cc29b9d0dba3319a9d6147105c0b253fb5e633e16db1fb20cca563d956) +qt_modular_library(qtdatavis3d cb295deb9aa33132294d7d7f4daaa53dd9ab4815e2d3a2c916d88e1882e018a49d8d66db9088f69375d8da759a3f3566f251802aaba82d74cad2eb45d9bbbcff) diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index 87b5a8da0..1e7e6f6e6 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.12.1 +Version: 5.12.3-1 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index adda51330..1056d1b9f 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -2,6 +2,13 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtdeclarative e06032da5c1c151200215f55728b9ce0fac299076f0ca3150143525a56bcce15eb72f6aa982b439e3920d1cd7a30468b3f0913f135d644ecda277d763fb5e1b5) +qt_modular_library(qtdeclarative 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts)
\ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/plugins/platforminputcontexts) + +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(qt5decpath ${CURRENT_PACKAGES_DIR}/share/qt5/debug/mkspecs/modules/qt_lib_qmldevtools_private.pri) + file(READ "${qt5decpath}" _contents) + string(REPLACE [[QT.qmldevtools_private.libs = $$QT_MODULE_HOST_LIB_BASE]] [[QT.qmldevtools_private.libs = $$QT_MODULE_LIB_BASE]] _contents "${_contents}") + file(WRITE "${qt5decpath}" "${_contents}") +endif()
\ No newline at end of file diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL index 323bf6747..741c249cd 100644 --- a/ports/qt5-gamepad/CONTROL +++ b/ports/qt5-gamepad/CONTROL @@ -1,4 +1,4 @@ Source: qt5-gamepad -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-gamepad/portfile.cmake b/ports/qt5-gamepad/portfile.cmake index 7967f7f41..71bc35517 100644 --- a/ports/qt5-gamepad/portfile.cmake +++ b/ports/qt5-gamepad/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgamepad 5e5f2c06103493880793f94aa062b1eccccbe0f53ded457969a0d77e864cee31759267a19edc68f3a015e261b84727f34b991b4a6b3c838600a68b030e77fa1e) +qt_modular_library(qtgamepad fd4902b11021eb6b28b5d6e31e9857ddaace6de05106c665fa429223033e28f187ede5deaec6a7e27588c5db4fb1cc250a936f2ee2cadb24f1df31ddfc4b3123) diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL index 3e4fadbe8..71250701b 100644 --- a/ports/qt5-graphicaleffects/CONTROL +++ b/ports/qt5-graphicaleffects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-graphicaleffects -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 GraphicalEffects Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-graphicaleffects/portfile.cmake b/ports/qt5-graphicaleffects/portfile.cmake index 2ea131939..c639e4668 100644 --- a/ports/qt5-graphicaleffects/portfile.cmake +++ b/ports/qt5-graphicaleffects/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtgraphicaleffects f7c93fa9b33a4096d5a150a6db984400daecc0ee16203402f1d465fddd288a9ea55625fcbd4ccd4c0b8addaa458d7955244b076a9c6c13a83d7c61c6029ddd81) +qt_modular_library(qtgraphicaleffects 3c5e6d7dc51a92d48cce8424ab1fe60ee75b71ebe2e6bb22e719a35bdaf2210b03f90ac066569f5c086ed67ed1463510625307328299310fad7c587e9fd8b385) diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL index bfb362834..7033b42c5 100644 --- a/ports/qt5-imageformats/CONTROL +++ b/ports/qt5-imageformats/CONTROL @@ -1,4 +1,4 @@ Source: qt5-imageformats -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index 001661111..1d66c9a23 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtimageformats 1514c5d7a285d718fdf1f3ba11f00029551af70e8b7bd927e061c55a35fca6978164da2846f26b6d57a4c81af2a75eb3f8358f46fa74bd70ba3407aa3bbcb0e5) +qt_modular_library(qtimageformats 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL index fd647d83b..b881c1fae 100644 --- a/ports/qt5-location/CONTROL +++ b/ports/qt5-location/CONTROL @@ -1,4 +1,4 @@ Source: qt5-location -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index 1fde2fa48..55e7b23ce 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtlocation 08dceeef8681b1266763197d8d4cab1d2ae8e8d0b62ae50ab44c64698588652d6ecf976b8f0095fa33b3a93b66b43fd4acbde4ebc47af8bdd79ce708c4237ed2) +qt_modular_library(qtlocation 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082) diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL index 8344c9240..e0c686414 100644 --- a/ports/qt5-macextras/CONTROL +++ b/ports/qt5-macextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-macextras -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-macextras/portfile.cmake b/ports/qt5-macextras/portfile.cmake index ed8e2bb5b..a833541d9 100644 --- a/ports/qt5-macextras/portfile.cmake +++ b/ports/qt5-macextras/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtmacextras 0d307b85e09fd97f36c5ee333297ceda4c709f6dc995dba4e8b8c1a85bd95c83ed80ee641e13e05fe3b965060c7847ba1835b7e6d9099a03c8bf9f2c4bae1ded) +qt_modular_library(qtmacextras 56887c2a2d20c41a133af87aec8975e17c6335ffc51093f23a904e02a78f59a8117c7932827ca5dd33f538360e6fd9cfc9d0091c6f4c1e0b96528b5324c74033) diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index 2b5a0a465..4dc0032f9 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ -Source: qt5-modularscripts -Version: 2019-04-30 -Description: Vcpkg helpers to package qt5 modules +Source: qt5-modularscripts
+Version: 2019-04-30
+Description: Vcpkg helpers to package qt5 modules
diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index b3cf05b7b..61eea306b 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -2,14 +2,14 @@ set(_qt5base_port_dir "${CMAKE_CURRENT_LIST_DIR}") function(qt_modular_fetch_library NAME HASH TARGET_SOURCE_PATH) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) - if(BUILDTREES_PATH_LENGTH GREATER 45) - message(WARNING "Qt5's buildsystem uses very long paths and may fail on your system.\n" + if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() set(MAJOR_MINOR 5.12) - set(FULL_VERSION ${MAJOR_MINOR}.1) + set(FULL_VERSION ${MAJOR_MINOR}.3) set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE @@ -37,7 +37,7 @@ function(qt_modular_build_library SOURCE_PATH) #Find Python and add it to the path vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY) - set(ENV{PATH} "${PYTHON2_EXE_PATH};$ENV{PATH}") + vcpkg_add_to_path("${PYTHON2_EXE_PATH}") file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR) @@ -110,7 +110,7 @@ function(qt_modular_build_library SOURCE_PATH) #Move release and debug dlls to the correct directory if(EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5 ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/tools/qt5) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL index 0b99078fb..87da5cd92 100644 --- a/ports/qt5-mqtt/CONTROL +++ b/ports/qt5-mqtt/CONTROL @@ -1,5 +1,4 @@ Source: qt5-mqtt
-Version: 5.12.1
+Version: 5.12.3
Description: Qt5 MQTT module.
Build-Depends: qt5-modularscripts, qt5-base
-
diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake index 8c797abb0..e9b8c3c75 100644 --- a/ports/qt5-mqtt/portfile.cmake +++ b/ports/qt5-mqtt/portfile.cmake @@ -5,8 +5,8 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmak vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO qt/qtmqtt
- REF v5.12.1
- SHA512 c6f4000a032caaf5224ca6fe2442f22eddc26e3e53cc101885c717b706156cada716e45ff92d267928b87e1e5ceae5e81694f4b7c289d9836e75f27fd012de42
+ REF cf41d84738f0ed0c779f75db94d413ad938fb901
+ SHA512 e9a818999e4befb0b945d609a1ee28a3e2d7e3b6d8c12ab82ae827fdb8f6bf5e8b82114c1850438d634fa24c9ac608ebae1d461385bd4e088f8cabf7eec0182c
HEAD_REF dev
)
diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL index 25f96138b..cdc7e20c7 100644 --- a/ports/qt5-multimedia/CONTROL +++ b/ports/qt5-multimedia/CONTROL @@ -1,4 +1,4 @@ Source: qt5-multimedia -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake index 77aee6d10..d6292a1ba 100644 --- a/ports/qt5-multimedia/portfile.cmake +++ b/ports/qt5-multimedia/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtmultimedia cdf9161648abd9f6c6d20171a75e9edefd77a46e946263f7e22e9f2ae69a55132688c31e46378cdc74c3bdf528fd94383b7e3b20bd8befa485a02cabb398dea0) +qt_modular_library(qtmultimedia 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963) diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL index b4653798f..241e52cdc 100644 --- a/ports/qt5-networkauth/CONTROL +++ b/ports/qt5-networkauth/CONTROL @@ -1,4 +1,4 @@ Source: qt5-networkauth -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Network Authorization Module Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-networkauth/portfile.cmake b/ports/qt5-networkauth/portfile.cmake index 40fda857c..ef4e63989 100644 --- a/ports/qt5-networkauth/portfile.cmake +++ b/ports/qt5-networkauth/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtnetworkauth 219117019cb98b87a84d351aa6b5479f3fa220c82fd4ff7409d2003c79402ead21454dcd1280be4db78b77045707dfa0fbbdefc738b9ac1142bf338a67447c60) +qt_modular_library(qtnetworkauth 07bf159360fe126c23387c6ed5b955218771ac37848ddb83542733c786b415f9aa5c22fd4a965fff591869d2d819bba420b69718e487df3cce382f411f493142) diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL index 0c2df22e9..14a21138a 100644 --- a/ports/qt5-purchasing/CONTROL +++ b/ports/qt5-purchasing/CONTROL @@ -1,4 +1,4 @@ Source: qt5-purchasing
-Version: 5.12.1
+Version: 5.12.3
Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative
diff --git a/ports/qt5-purchasing/portfile.cmake b/ports/qt5-purchasing/portfile.cmake index 3ea4b192c..c172817df 100644 --- a/ports/qt5-purchasing/portfile.cmake +++ b/ports/qt5-purchasing/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtpurchasing 655283a32f02a4a5bb8b890081fa1276e1a0c1396f50bb5c8ea849b55a60d8dde368f05072ab786fb8bb14cc41be8394d635bf4af791f2ef289796e04395dbb6)
+qt_modular_library(qtpurchasing 3069ece2083d0661a3599c631cf0832a80e01262b5858ffd407bc0d80e35711f2f973b2c085b6dd5539f3ec26004c684df99d477e58ab62da63d705a8a5616c9)
diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL index 8b0552337..287daebe1 100644 --- a/ports/qt5-quickcontrols/CONTROL +++ b/ports/qt5-quickcontrols/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 QuickControls Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols/portfile.cmake b/ports/qt5-quickcontrols/portfile.cmake index ac74db9d5..bb4aa8a66 100644 --- a/ports/qt5-quickcontrols/portfile.cmake +++ b/ports/qt5-quickcontrols/portfile.cmake @@ -4,4 +4,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols 2275a9f0e3ddf7a4f42de5608b01686bf7faabe52c70dfae66ccdc7ab1283962aecb58481b42afbc5244d3abef56846bfabd9ed5229debe55d9f96cd88d16623) +qt_modular_library(qtquickcontrols 23410fb82088591a8bed7e8e4127d13929a03adc0dfd18f7e2f906acdac21f7dcbb15cb2257272b893d937bbb54860992667c11aa0c6157d4a3b871616c4641c) diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL index 027cb6e71..01f94c4c0 100644 --- a/ports/qt5-quickcontrols2/CONTROL +++ b/ports/qt5-quickcontrols2/CONTROL @@ -1,4 +1,4 @@ Source: qt5-quickcontrols2 -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 QuickControls2 Module. Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-quickcontrols2/portfile.cmake b/ports/qt5-quickcontrols2/portfile.cmake index 845a4c852..6b65b022f 100644 --- a/ports/qt5-quickcontrols2/portfile.cmake +++ b/ports/qt5-quickcontrols2/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtquickcontrols2 fecbde2d38e7b9d18c0cfba8a724bba43d92702b8fb7c15b589a47e584f6023e498b1fb81a864835dbfdf38af6ee20ce9965f233df497a0639aceb87e8c1b123) +qt_modular_library(qtquickcontrols2 afc1ae9a5a046845b085d5cf0019b79d99914a2d285676bd4d8966f1302513078c8279b71134281c03b2c1209295bca438b9e255774574520498b0b5385bad27) diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL index bea95b4ae..e1e9df450 100644 --- a/ports/qt5-remoteobjects/CONTROL +++ b/ports/qt5-remoteobjects/CONTROL @@ -1,4 +1,4 @@ Source: qt5-remoteobjects
-Version: 5.12.1
+Version: 5.12.3
Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-remoteobjects/portfile.cmake b/ports/qt5-remoteobjects/portfile.cmake index 7a238ebcf..8d2d45a6e 100644 --- a/ports/qt5-remoteobjects/portfile.cmake +++ b/ports/qt5-remoteobjects/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtremoteobjects 9b4222c6336374387aa5c5021833b4b12d4ab76f4af3a5f843ce2abca090a6af299b37d34b86bfc46e5ed8e54e50d8abc6804f88c8843327f90795c06a37ca0d)
+qt_modular_library(qtremoteobjects f01b9497dab7e5db24f090d227fca5703a50b5065ad6c0798b78e83b41c374a04eb2857ffaf0225071791c9bb6b8703e37e47d31bf905fa819395b4d69819178)
diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL index b47aa9798..e27e24b57 100755 --- a/ports/qt5-script/CONTROL +++ b/ports/qt5-script/CONTROL @@ -1,4 +1,4 @@ Source: qt5-script
-Version: 5.12.1
+Version: 5.12.3
Build-Depends: qt5-base, qt5-modularscripts
Description:Qt5 Script Module.
diff --git a/ports/qt5-script/portfile.cmake b/ports/qt5-script/portfile.cmake index b4e40355b..0d2a8418d 100755 --- a/ports/qt5-script/portfile.cmake +++ b/ports/qt5-script/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtscript 1fe7d0582e6c61fd146d66080bc91b40a6a2bda9b6bdb983339276b1aebb6f3c24070fc5acb2fd90556c11d51708c7bc75542532097b7f4f381b13dadaec5c9e)
+qt_modular_library(qtscript 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a)
diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL index 216fd3fd1..b61ed5922 100644 --- a/ports/qt5-scxml/CONTROL +++ b/ports/qt5-scxml/CONTROL @@ -1,4 +1,4 @@ Source: qt5-scxml -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-scxml/portfile.cmake b/ports/qt5-scxml/portfile.cmake index 51c855271..860e25246 100644 --- a/ports/qt5-scxml/portfile.cmake +++ b/ports/qt5-scxml/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtscxml 3bfb08eb8506ca1076a594fb48b09360d258ecf26596045d2bff8702ad1ac0d0cc16dbc5e4528bf2a0fc1fad93c44f5cf34dc86e4d1243764a49a56f99985501) +qt_modular_library(qtscxml d515506d90ace5eedfe8bf3439dad0853dbbdbd36dfb509dfa13e3358838353de66d5f6245afe4eeebd19dd3f0ab0ce5e4c3e6fe5d40e5ab46763c453a562a49) diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL index 55d620ee1..f0bceb31c 100644 --- a/ports/qt5-sensors/CONTROL +++ b/ports/qt5-sensors/CONTROL @@ -1,4 +1,4 @@ Source: qt5-sensors
-Version: 5.12.1
+Version: 5.12.3
Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-sensors/portfile.cmake b/ports/qt5-sensors/portfile.cmake index 1a90f5486..3af798117 100644 --- a/ports/qt5-sensors/portfile.cmake +++ b/ports/qt5-sensors/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtsensors 437c8fce62b4fde138a7927ae494526852a63c2c9a392aaa5f79da6b9ec134e54b17dcd908e5cd7d12474dd112672e0a6a478a307cf716cce9fed67937da3fdc)
+qt_modular_library(qtsensors cf0c8c58bbb84debd6b464bd9b91af7e79a301031613b8a2d0715fa276573dafea0a1c8e472fa2a2d4debd9b26f86a5e6efa9a8d57f7ab9102b1314d609579e5)
diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL index 7f725ffab..8e2572300 100644 --- a/ports/qt5-serialport/CONTROL +++ b/ports/qt5-serialport/CONTROL @@ -1,4 +1,4 @@ Source: qt5-serialport -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-serialport/portfile.cmake b/ports/qt5-serialport/portfile.cmake index 019ed1b17..0c2a0f116 100644 --- a/ports/qt5-serialport/portfile.cmake +++ b/ports/qt5-serialport/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtserialport c917e08f417677fb16058c4be95c20dcd5881f41daf6033b864f725b259bfa38ab07a993a6a19f26574f1b662116aaceea26965cd1d2a5df7465e2bda495e7ff) +qt_modular_library(qtserialport 42551b74abe1fcaa1972fb1134215987d7c1d0fe73874a4c6ad5b9aadad71a2066a1846c297569bb1562f94e54a406e8074d444deca510a566e27cd386b47ecf) diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL index 336601da2..cbc841086 100644 --- a/ports/qt5-speech/CONTROL +++ b/ports/qt5-speech/CONTROL @@ -1,4 +1,4 @@ Source: qt5-speech -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Speech Module Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows) diff --git a/ports/qt5-speech/portfile.cmake b/ports/qt5-speech/portfile.cmake index 61dfc802a..f4402508d 100644 --- a/ports/qt5-speech/portfile.cmake +++ b/ports/qt5-speech/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtspeech 321f6dafe0751af1e9cb5bd32f340ae445d2d148a8d2060bd5bd65d034f242547a79667253a4d1e220ccd4f59ea36a7fbe1b50093f36e2017b872f2b858050d2) +qt_modular_library(qtspeech 9623a83cdfbed07dffcd8f0808c2a514c97fda72b68827d917f1a8ee3072286ef8bce06b114db94d7a0c3fc79425c2540fa5cadc6551367fd4431e5396395932) diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index 8a199f1c7..9970a6fc0 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,4 @@ Source: qt5-svg -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index 091afa59b..a8379b131 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtsvg c09da58bb901546fa8f408528ed25c9cc57d2bda35e56112eab08a08bf8fdb06cdaed1995d46d6baa08cab8660a3661be3dfa51754cc55e4fab96f7c90533ea3) +qt_modular_library(qtsvg 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a) diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL index 492bf89fc..502635783 100644 --- a/ports/qt5-tools/CONTROL +++ b/ports/qt5-tools/CONTROL @@ -1,4 +1,4 @@ Source: qt5-tools -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index e430e4e95..a563767da 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qttools e3ae1974f0b20bad1b86d038c3585753183b8c24c133393e3ecf65a0487402ad8dcf8147bf263e9a4c2d3abef1b706981943fcf5268726e424f1b61f69ce4f2e) +qt_modular_library(qttools d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/plugins/platforminputcontexts)
\ No newline at end of file diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL index 3b21a1c6d..20b745844 100644 --- a/ports/qt5-virtualkeyboard/CONTROL +++ b/ports/qt5-virtualkeyboard/CONTROL @@ -1,4 +1,4 @@ Source: qt5-virtualkeyboard -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-virtualkeyboard/portfile.cmake b/ports/qt5-virtualkeyboard/portfile.cmake index 342fd6a5a..4d8310f7a 100644 --- a/ports/qt5-virtualkeyboard/portfile.cmake +++ b/ports/qt5-virtualkeyboard/portfile.cmake @@ -2,6 +2,6 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtvirtualkeyboard 17f85982bb7d39784b5a85fba7758d3c032c158ca453c30255ec03e5e61dc8bbcbcbc58afe8f43bcf0297bb00d4e8606f553501bde68252d097d7bb32af9d24f) +qt_modular_library(qtvirtualkeyboard 1aa00fec7e333e4fd52891b82c239b532cf41657d9c3f44c6cc1c211a1412dbf5584823511e54f3feb33b3fed9c6e0171b55afde2df9f0a358e2e4885e1b2686) set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL index 85edc4b81..64945edba 100644 --- a/ports/qt5-webchannel/CONTROL +++ b/ports/qt5-webchannel/CONTROL @@ -1,4 +1,4 @@ Source: qt5-webchannel
-Version: 5.12.1
+Version: 5.12.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.
Build-Depends: qt5-modularscripts, qt5-base
diff --git a/ports/qt5-webchannel/portfile.cmake b/ports/qt5-webchannel/portfile.cmake index f1b5ccd16..a453326c5 100644 --- a/ports/qt5-webchannel/portfile.cmake +++ b/ports/qt5-webchannel/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtwebchannel 71f2eb4b808e5892d246bafa289f7a4464e9705d568ceb01443b787d2eade8ee9bd20eef46900ba6fa2b251e7e15aebb7564e854360a3ad70992ad17cc1f9751)
+qt_modular_library(qtwebchannel 2dda4351f5f3a5895a955d0ee77e55f758233672005a068d3e840a01d379727f99287fc6c8fb96516f23a5a8c4ebcb61098690fd3351e79be608e28657534006)
diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL index f3ed649a9..e2cae414c 100644 --- a/ports/qt5-websockets/CONTROL +++ b/ports/qt5-websockets/CONTROL @@ -1,4 +1,4 @@ Source: qt5-websockets -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-websockets/portfile.cmake b/ports/qt5-websockets/portfile.cmake index 8aa9cc9ed..88cc1fd9a 100644 --- a/ports/qt5-websockets/portfile.cmake +++ b/ports/qt5-websockets/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwebsockets 4239563f05d65e85d2c46f24b3757e7fcfb119a2c9af0b221b321702f7849a4af05da1fdc1e77c0098df40af231ed781be5ead9361bae3dbf2c7808043601577) +qt_modular_library(qtwebsockets 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817) diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL index fda869331..e0816259a 100644 --- a/ports/qt5-webview/CONTROL +++ b/ports/qt5-webview/CONTROL @@ -1,4 +1,4 @@ Source: qt5-webview
-Version: 5.12.1
+Version: 5.12.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.
Build-Depends: qt5-base, qt5-modularscripts, qt5-declarative
diff --git a/ports/qt5-webview/portfile.cmake b/ports/qt5-webview/portfile.cmake index df9f90c0a..813c5601b 100644 --- a/ports/qt5-webview/portfile.cmake +++ b/ports/qt5-webview/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
-qt_modular_library(qtwebview 27e1904570678691e26831e87953e47d6b707bfe0504cde112ad6c8c18ea163eb83d90f8d4dbbf73873caee827e486691bb73e16a4c8b9e522bbeffbb68e9973)
+qt_modular_library(qtwebview 426227b9b4cb61c0e88958dbaab21e842a25989098a0e94a06fe3efc8a2b9d4a5d3216296c8228da977ef52cd5844b66048bcb84019da4f06de1b1009dfdffa5)
diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL index 0ed5317d2..97c443d8c 100644 --- a/ports/qt5-winextras/CONTROL +++ b/ports/qt5-winextras/CONTROL @@ -1,4 +1,4 @@ Source: qt5-winextras -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. Build-Depends: qt5-modularscripts, qt5-base, atlmfc diff --git a/ports/qt5-winextras/portfile.cmake b/ports/qt5-winextras/portfile.cmake index 64f112bbd..f0890bfaf 100644 --- a/ports/qt5-winextras/portfile.cmake +++ b/ports/qt5-winextras/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtwinextras 2adf2849359ed97724256ba2ce7492f6820c92e898142683b696be0af5393d8af26b5af3d827c25e9027e77f95eb7f12ebb2be22a5d4c99e645c65a7fd7fe0e6) +qt_modular_library(qtwinextras e50cb237359ce7a3bde6989ec4349fe67be3b4999092516e891bba12f0fb4acb9954de8e2f0171db0e849b7d3ef94bd80f77f81162afb239e49c6e2e0760343b) diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 04b00a415..917615922 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns -Version: 5.12.1 +Version: 5.12.3 Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index bd39b03f8..c92a6057b 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -2,4 +2,4 @@ include(vcpkg_common_functions) include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake) -qt_modular_library(qtxmlpatterns 2a75b6fdbe07317ce91b69e0fc9abe39899b5c48885033f734c0d018115762e7558723ae0fcb5ad5a2266a52471f139236778be8191c61abec9bf0b07a0f01f7) +qt_modular_library(qtxmlpatterns 4e421f0c78ca74f726f758bd95b33915297922f3b5a4fff84dde2600969f54f3914828fdb7903c7171e192f81966680b6c6bb4750de0be72728124470e7c798d)
\ No newline at end of file diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index fe0698293..74b69467a 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,5 @@ Source: qt5 -Version: 5.12.1-2 +Version: 5.12.3 +Homepage: https://www.qt.io/ Description: Qt5 Application Framework Build-Depends: qt5-3d, qt5-activeqt, qt5-base, qt5-charts, qt5-datavis3d, qt5-declarative, qt5-gamepad, qt5-graphicaleffects, qt5-imageformats, qt5-location, qt5-multimedia, qt5-mqtt, qt5-networkauth, qt5-purchasing, qt5-quickcontrols, qt5-quickcontrols2, qt5-script, qt5-scxml, qt5-sensors, qt5-serialport, qt5-speech, qt5-svg, qt5-tools, qt5-virtualkeyboard, qt5-webchannel, qt5-websockets, qt5-winextras (windows), qt5-macextras (osx), qt5-xmlpatterns diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL index fad52600f..230203b34 100644 --- a/ports/qwt/CONTROL +++ b/ports/qwt/CONTROL @@ -1,4 +1,5 @@ Source: qwt Version: 6.1.3-6 +Homepage: https://sourceforge.net/projects/qwt Description: Qt widgets library for technical applications Build-Depends: qt5-base, qt5-svg, qt5-tools diff --git a/ports/ragel/CONTROL b/ports/ragel/CONTROL index bb6595ac5..112128a52 100644 --- a/ports/ragel/CONTROL +++ b/ports/ragel/CONTROL @@ -1,3 +1,4 @@ Source: ragel Version: 6.10-1 +Homepage: https://www.colm.net/files/ragel Description: Ragel State Machine Compiler diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index ec7d32cf8..fb534ac29 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,4 @@ Source: range-v3 Version: 0.5.0 +Homepage: https://github.com/Microsoft/Range-V3-VS2015 Description: Range library for C++11/14/17. diff --git a/ports/rapidjson/CONTROL b/ports/rapidjson/CONTROL index b5fe3d4c9..02f7b5107 100644 --- a/ports/rapidjson/CONTROL +++ b/ports/rapidjson/CONTROL @@ -1,3 +1,4 @@ Source: rapidjson Version: 1.1.0-3 -Description: A fast JSON parser/generator for C++ with both SAX/DOM style API <http://rapidjson.org/> +Description: A fast JSON parser/generator for C++ with both SAX/DOM style API +Homepage: http://rapidjson.org/ diff --git a/ports/rapidxml-ns/CONTROL b/ports/rapidxml-ns/CONTROL index 1dd1ed546..f932481e1 100644 --- a/ports/rapidxml-ns/CONTROL +++ b/ports/rapidxml-ns/CONTROL @@ -1,3 +1,3 @@ Source: rapidxml-ns -Version: 1.13-04674e3 +Version: 1.13.2 Description: RapidXML with added XML namespaces support. diff --git a/ports/rapidxml-ns/portfile.cmake b/ports/rapidxml-ns/portfile.cmake index c38d6c4ec..d51fa0312 100644 --- a/ports/rapidxml-ns/portfile.cmake +++ b/ports/rapidxml-ns/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO svgpp/rapidxml_ns - REF 04674e33e3bbfeee05875a29a36734667c0f3cfd - SHA512 c82d55ca7ec358427f811689604ba02582de9d7f57d0caa3a96e2c36b9f3751e9acefc6f84348e6c619dacca31880f279bf9d9959f8eff251f3d3276c836bcd2 + REF v1.13.2 + SHA512 72cdd7e728471e8903ce64470f5172abe7f2300d4d115b3a27b4d4ffb3c20e59aefb9b23c535e37baa3f53c9125aa2932d6fa9ba24e658151e1c9b12f959523a HEAD_REF master ) diff --git a/ports/rapidxml/CONTROL b/ports/rapidxml/CONTROL index cfd7e0cd5..bfc1eb77b 100644 --- a/ports/rapidxml/CONTROL +++ b/ports/rapidxml/CONTROL @@ -1,3 +1,4 @@ Source: rapidxml Version: 1.13 +Homepage: https://sourceforge.net/projects/rapidxml Description: RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility. diff --git a/ports/raylib/CONTROL b/ports/raylib/CONTROL new file mode 100644 index 000000000..3be7c5eac --- /dev/null +++ b/ports/raylib/CONTROL @@ -0,0 +1,7 @@ +Source: raylib
+Version: 2019-04-27-2
+Description: A simple and easy-to-use library to enjoy videogames programming
+#Build-Depends: glfw3
+
+Feature: non-audio
+Description: Build raylib without audio module
diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake new file mode 100644 index 000000000..82c79a44c --- /dev/null +++ b/ports/raylib/portfile.cmake @@ -0,0 +1,89 @@ +# https://github.com/raysan5/raylib/issues/388
+if(TARGET_TRIPLET MATCHES "^arm" OR TARGET_TRIPLET MATCHES "uwp$")
+ message(FATAL_ERROR "raylib doesn't support ARM or UWP.")
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ message(
+ "raylib currently requires the following libraries from the system package manager:
+ libgl1-mesa-dev
+ libx11-dev
+ libxcursor-dev
+ libxinerama-dev
+ libxrandr-dev
+These can be installed on Ubuntu systems via sudo apt install libgl1-mesa-dev libx11-dev libxcursor-dev libxinerama-dev libxrandr-dev"
+ )
+endif()
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO raysan5/raylib
+ REF f37e55a77bd6177dbaea4d7f484961c09104e104
+ SHA512 57146ebc7ab22a4e60c1d9eecd4c7a8f1930d6709f45761af809da9ea4f161e9fd450fa1042252a80bd7952ed9571a5d8dee4d454c8903a778e3e1328300b2bd
+ HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC)
+
+if("non-audio" IN_LIST FEATURES)
+ set(USE_AUDIO OFF)
+else()
+ set(USE_AUDIO ON)
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_GAMES=OFF
+ -DSHARED=${SHARED}
+ -DSTATIC=${STATIC}
+ -DUSE_AUDIO=${USE_AUDIO}
+ -DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows
+ OPTIONS_DEBUG
+ -DENABLE_ASAN=ON
+ -DENABLE_UBSAN=ON
+ -DENABLE_MSAN=OFF
+ OPTIONS_RELEASE
+ -DENABLE_ASAN=OFF
+ -DENABLE_UBSAN=OFF
+ -DENABLE_MSAN=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+vcpkg_fixup_cmake_targets(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
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug/include
+ ${CURRENT_PACKAGES_DIR}/debug/share
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+ vcpkg_replace_string(
+ ${CURRENT_PACKAGES_DIR}/include/raylib.h
+ "defined(USE_LIBTYPE_SHARED)"
+ "1 // defined(USE_LIBTYPE_SHARED)"
+ )
+endif()
+
+# Install usage
+configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/raylib/usage b/ports/raylib/usage new file mode 100644 index 000000000..936b74f50 --- /dev/null +++ b/ports/raylib/usage @@ -0,0 +1,5 @@ +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 new file mode 100644 index 000000000..1efda7c9e --- /dev/null +++ b/ports/raylib/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,14 @@ +set(raylib_USE_STATIC_LIBS @STATIC@)
+
+_find_package(${ARGS})
+
+if(raylib_FOUND)
+ get_filename_component(_raylib_lib_name ${raylib_LIBRARY} NAME)
+
+ set(raylib_LIBRARY
+ debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/${_raylib_lib_name}
+ optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/${_raylib_lib_name}
+ )
+
+ set(raylib_LIBRARIES ${raylib_LIBRARY})
+endif()
diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL index 4661cd9bf..4bf7106e7 100644 --- a/ports/re2/CONTROL +++ b/ports/re2/CONTROL @@ -1,3 +1,4 @@ Source: re2 -Version: 2019-04-19 -Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.
\ No newline at end of file +Version: 2019-05-07-1 +Homepage: https://github.com/google/re2 +Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 901ed32c1..ef2c9e842 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/re2
- REF 653f9e2a6a17bcdf8dba2b3f8671aa8880efca29
- SHA512 2411904082662c60e05c97d3a0de6e5d9f9654a8703e4e520eba1018a3542670db81f2b78ff9ee3267bb9c1b24e4c6a9b5b35b0f62836198ac152acb4b37c744
+ REF cd23be77c716bf75ebb3ddc07fa3ef0c943da6d2
+ SHA512 c307fc9294497dc3b4ae95db117f310e0db8f91a90c32bb316fe7e32414b2ade48264471e7a7bb0860aa9b0afe7dd460dadc552b1173ac35235ad3624c6f2ed5
HEAD_REF master
)
@@ -14,7 +14,7 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/re2 TARGET_PATH share/re2)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/re2)
vcpkg_copy_pdbs()
diff --git a/ports/readline-win32/CONTROL b/ports/readline-win32/CONTROL index d04614bac..f8beab3d9 100644 --- a/ports/readline-win32/CONTROL +++ b/ports/readline-win32/CONTROL @@ -1,3 +1,4 @@ Source: readline-win32
Version: 5.0-2
-Description: Implementation of readline for Windows Desktop provided by https://github.com/lltcggie
\ No newline at end of file +Description: Implementation of readline for Windows Desktop
+Homepage: https://github.com/lltcggie
\ No newline at end of file diff --git a/ports/readosm/CONTROL b/ports/readosm/CONTROL index 08e696e6d..caf32bf4b 100644 --- a/ports/readosm/CONTROL +++ b/ports/readosm/CONTROL @@ -1,4 +1,5 @@ Source: readosm Version: 1.1.0-1 +Homepage: https://www.gaia-gis.it/gaia-sins/readosm-sources Description: ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf) Build-Depends: expat, zlib diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index 2802c0f9d..40341f080 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,7 +1,12 @@ -Source: realsense2
-Version: 2.16.1-2
-Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).
-
-Feature: tools
-Build-Depends: opengl
-Description: Build Intel® RealSense™ examples and tools
+Source: realsense2 +Version: 2.22.0-1 +Homepage: https://github.com/IntelRealSense/librealsense +Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300). + +Feature: tools +Build-Depends: opengl +Description: Build Intel® RealSense™ examples and tools + +Feature: openni2 +Build-Depends: openni2 +Description: Build Intel® RealSense™ OpenNI2 driver diff --git a/ports/realsense2/fix_openni2.patch b/ports/realsense2/fix_openni2.patch new file mode 100644 index 000000000..541f8376a --- /dev/null +++ b/ports/realsense2/fix_openni2.patch @@ -0,0 +1,18 @@ +diff --git a/wrappers/openni2/CMakeLists.txt b/wrappers/openni2/CMakeLists.txt
+index 0eee84c2..769e67ff 100755
+--- a/wrappers/openni2/CMakeLists.txt
++++ b/wrappers/openni2/CMakeLists.txt
+@@ -6,12 +6,7 @@ set(OPENNI2_DIR "c:/Program Files/OpenNI2" CACHE FILEPATH "OpenNI2 SDK directory
+ set(REALSENSE2_DIR "c:/Program Files (x86)/Intel RealSense SDK 2.0" CACHE FILEPATH "RealSense2 SDK directory")
+
+ # INCLUDE DIR
+-if (UNIX)
+- include_directories (${OPENNI2_DIR})
+-else ()
+- include_directories (${OPENNI2_DIR}/Include)
+-endif ()
+-
++include_directories (${OPENNI2_DIR})
+ include_directories (${REALSENSE2_DIR}/include)
+ include_directories (src)
+
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 0d8ae7cdc..decc9b504 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -3,57 +3,65 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF v2.16.1 - SHA512 e030f7b1833db787b8976ead734535fb2209a19317d74d4f68bd8f8cae38abe2343d584e88131a1a66bf6f9f1c0a17bc2c64540841a74cf6300fecf3e69f9dff + REF v2.22.0 + SHA512 7595780c1955a2d4a91df5b70ab6366c672f389bc3d2dcb9f2e78a2ea1fc875c65f878103df483205e17f62dfd024ee5f7ccb15afc5d18978d3c25aa071652ab HEAD_REF development + PATCHES + "fix_openni2.patch" ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE) -set(BUILD_EXAMPLES OFF) -set(BUILD_GRAPHICAL_EXAMPLES OFF) +set(BUILD_TOOLS OFF) if("tools" IN_LIST FEATURES) - set(BUILD_EXAMPLES ON) - set(BUILD_GRAPHICAL_EXAMPLES ON) + set(BUILD_TOOLS ON) +endif() + +set(BUILD_OPENNI2_BINDINGS OFF) +if(("openni2" IN_LIST FEATURES) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) + set(BUILD_OPENNI2_BINDINGS ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS - #Ungrouped Entries -DENFORCE_METADATA=ON - # BUILD - -DBUILD_EXAMPLES=${BUILD_EXAMPLES} - -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_GRAPHICAL_EXAMPLES} - -DBUILD_UNIT_TESTS=OFF + -DBUILD_WITH_TM2=OFF -DBUILD_WITH_OPENMP=OFF + -DBUILD_UNIT_TESTS=OFF -DBUILD_WITH_STATIC_CRT=${BUILD_CRT_LINKAGE} + -DBUILD_OPENNI2_BINDINGS=${BUILD_OPENNI2_BINDINGS} + -DOPENNI2_DIR=${CURRENT_INSTALLED_DIR}/include/openni2 + OPTIONS_RELEASE + -DBUILD_EXAMPLES=${BUILD_TOOLS} + -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_TOOLS} OPTIONS_DEBUG - # BUILD -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF - # CMAKE - -DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - -DCMAKE_DEBUG_POSTFIX=_d ) vcpkg_install_cmake() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/realsense2) + vcpkg_copy_pdbs() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -if(BUILD_EXAMPLES) - file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/rs-* ${CURRENT_PACKAGES_DIR}/bin/realsense-*) +if(BUILD_TOOLS) + file(GLOB EXEFILES_RELEASE + ${CURRENT_PACKAGES_DIR}/bin/rs-* + ${CURRENT_PACKAGES_DIR}/bin/realsense-* + ) + if (EXEFILES_RELEASE) file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/realsense2) file(REMOVE ${EXEFILES_RELEASE}) endif() - file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*) - if (EXEFILES_DEBUG) - file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG}) - endif() + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/realsense2) file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*) @@ -62,5 +70,11 @@ if(BUILD_EXAMPLES) endif() endif() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/realsense2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/realsense2/COPYING ${CURRENT_PACKAGES_DIR}/share/realsense2/copyright) + +if(BUILD_OPENNI2_BINDINGS) + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/_out/rs2driver* + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers) +endif() + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/realsense2) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/realsense2/LICENSE ${CURRENT_PACKAGES_DIR}/share/realsense2/copyright) diff --git a/ports/recast/CONTROL b/ports/recast/CONTROL index 969b9d172..e19df38c8 100644 --- a/ports/recast/CONTROL +++ b/ports/recast/CONTROL @@ -1,3 +1,4 @@ Source: recast
Version: 1.5.1-2
+Homepage: https://github.com/recastnavigation/recastnavigation
Description: Navigation-mesh Toolset for Games
diff --git a/ports/refprop-headers/CONTROL b/ports/refprop-headers/CONTROL index 00b78cc55..c9356556e 100644 --- a/ports/refprop-headers/CONTROL +++ b/ports/refprop-headers/CONTROL @@ -1,3 +1,4 @@ Source: refprop-headers Version: 2017-11-7-882aec454b2bc3d5323b8691736ff09c288f4ed6 +Homepage: https://github.com/CoolProp/REFPROP-headers Description: The REFPROP Headers diff --git a/ports/reproc/CONTROL b/ports/reproc/CONTROL index 14b08a416..d55102f55 100644 --- a/ports/reproc/CONTROL +++ b/ports/reproc/CONTROL @@ -1,3 +1,3 @@ -Source: reproc
-Version: v1.0.0
-Description: Cross-platform library that simplifies working with external CLI applications from C and C++
+Source: reproc +Version: 6.0.0-1 +Description: Cross-platform library that simplifies working with external CLI applications from C and C++ diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake index 54c0cc70c..e263c194c 100644 --- a/ports/reproc/portfile.cmake +++ b/ports/reproc/portfile.cmake @@ -1,29 +1,32 @@ -include(vcpkg_common_functions)
-
-vcpkg_from_github(
- OUT_SOURCE_PATH SOURCE_PATH
- REPO DaanDeMeyer/reproc
- REF v1.0.0
- SHA512 f567de9d6cd8bca0b34f1f48231a59c6698730c5b63f1d733de14fecf09991de74e4b3a99cc98ae7f62dcba8b2b7831d5e617fd32ca38b296b9073bc07fb2d92
- HEAD_REF master
-)
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS
- -DREPROC_BUILD_CXX_WRAPPER=ON
- -DREPROC_INSTALL=ON
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/reproc)
-
-
-# Debug
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle License
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/reproc)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/reproc/LICENSE ${CURRENT_PACKAGES_DIR}/share/reproc/copyright)
\ No newline at end of file +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DaanDeMeyer/reproc + REF v6.0.0 + SHA512 482eb7b52961878877d1e4a4f1e1a5a867ff5b83f0df3ce47c0eb68f43eabcde720ea7ccb2eeb960dbc29fc61c888db62751984425e9b27c7498dfa4441aa801 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DREPROC++=ON + -DREPROC++_INSTALL=ON + -DREPROC_INSTALL=ON +) + +vcpkg_install_cmake() + +file(GLOB REPROC_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/lib/cmake/reproc++/*) +file(COPY ${REPROC_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib/cmake/reproc) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/reproc) + +# Debug +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle License +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/reproc) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/reproc/LICENSE ${CURRENT_PACKAGES_DIR}/share/reproc/copyright) diff --git a/ports/restclient-cpp/0001_fix_cmake_linking.patch b/ports/restclient-cpp/0001_fix_cmake_linking.patch new file mode 100644 index 000000000..815c2198c --- /dev/null +++ b/ports/restclient-cpp/0001_fix_cmake_linking.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45fc887..8b90048 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,7 @@ find_package(Threads REQUIRED) + find_package(CURL REQUIRED) + find_package(jsoncpp) + +-add_library(restclient-cpp SHARED ++add_library(restclient-cpp + source/restclient.cc + source/connection.cc + source/helpers.cc diff --git a/ports/restclient-cpp/CONTROL b/ports/restclient-cpp/CONTROL new file mode 100644 index 000000000..975f5df7a --- /dev/null +++ b/ports/restclient-cpp/CONTROL @@ -0,0 +1,4 @@ +Source: restclient-cpp +Version: 0.5.1-1 +Build-Depends: curl +Description: Binn is a binary data serialization format designed to be compact, fast and easy to use. diff --git a/ports/restclient-cpp/portfile.cmake b/ports/restclient-cpp/portfile.cmake new file mode 100644 index 000000000..116e60920 --- /dev/null +++ b/ports/restclient-cpp/portfile.cmake @@ -0,0 +1,30 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mrtazz/restclient-cpp + REF 0.5.1 + SHA512 d5e17a984af44f863bc7cdc7307c2b06cae9252f86c6c6c2377cdb317f61b6419d8e9aedc5e5ccdb08fd1ee13848ec3b9ef8067a8d26dcf438a5c8793b5a2ce3 + HEAD_REF master + PATCHES + 0001_fix_cmake_linking.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/restclient-cpp) + +# Remove includes in debug +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/bin) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/restclient-cpp) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/restclient-cpp/LICENSE ${CURRENT_PACKAGES_DIR}/share/restclient-cpp/copyright) + +# Copy pdb files +vcpkg_copy_pdbs() diff --git a/ports/restinio/CONTROL b/ports/restinio/CONTROL index 1ea1a7c28..a7c81a55f 100644 --- a/ports/restinio/CONTROL +++ b/ports/restinio/CONTROL @@ -1,4 +1,4 @@ -Source: restinio
-Version: 0.4.8.7
-Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.
-Build-Depends: asio, fmt, http-parser
+Source: restinio +Version: 0.5.1-1 +Description: A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests. +Build-Depends: asio, fmt, http-parser diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 9520e2dd4..5ae3cc2e2 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -2,9 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket(
OUT_SOURCE_PATH SOURCE_PATH
- REPO sobjectizerteam/restinio-0.4
- REF v.0.4.8.7
- SHA512 2472facc3e6a718a3dadb251f705ab84221588c336ae0db5756650c133a219796b00607ebb2eacddc5b32cb648fd8ae30b1ced38a893861bd669766fe23ee573
+ REPO sobjectizerteam/restinio
+ REF v.0.5.1
+ SHA512 e8d1f9ac6dcb87012a656ba9f80412db93280b436199013ed36aa31398f0c0e65b634e2e714b9709afae717e2bc432891d5125f4af01b0d3a0ce79169de40870
)
vcpkg_configure_cmake(
@@ -13,8 +13,7 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/restinio")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/restinio)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug)
diff --git a/ports/rhash/CONTROL b/ports/rhash/CONTROL index 14b8768d4..a2bb52c2f 100644 --- a/ports/rhash/CONTROL +++ b/ports/rhash/CONTROL @@ -1,3 +1,4 @@ Source: rhash -Version: 1.3.6 +Version: 1.3.8 +Homepage: https://github.com/rhash/RHash Description: C library for computing a wide variety of hash sums diff --git a/ports/rhash/portfile.cmake b/ports/rhash/portfile.cmake index cc1188c38..6eace63e4 100644 --- a/ports/rhash/portfile.cmake +++ b/ports/rhash/portfile.cmake @@ -6,8 +6,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rhash/RHash - REF v1.3.6 - SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6 + REF v1.3.8 + SHA512 9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1 HEAD_REF master) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/librhash) diff --git a/ports/ring-span-lite/CONTROL b/ports/ring-span-lite/CONTROL new file mode 100644 index 000000000..9d620b709 --- /dev/null +++ b/ports/ring-span-lite/CONTROL @@ -0,0 +1,3 @@ +Source: ring-span-lite
+Version: 0.3.0
+Description: A C++yy-like ring_span type for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/ring-span-lite/portfile.cmake b/ports/ring-span-lite/portfile.cmake new file mode 100644 index 000000000..b9b993054 --- /dev/null +++ b/ports/ring-span-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/ring-span-lite
+ REF v0.3.0
+ SHA512 5ecbfc63b4a09cc382edc2acae41a45946c9c6a18aa48e855201366b7696df7cbf46c2de1b5aa5296ae2dde4360d5abd8efdc3e3a1c3d427fbbddadab7dcfe79
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DRING_SPAN_LITE_OPT_BUILD_TESTS=OFF
+ -DRING_SPAN_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/robin-hood-hashing/CONTROL b/ports/robin-hood-hashing/CONTROL new file mode 100644 index 000000000..d30871519 --- /dev/null +++ b/ports/robin-hood-hashing/CONTROL @@ -0,0 +1,3 @@ +Source: robin-hood-hashing +Version: 3.2.13 +Description: Fast & memory efficient hashtable based on robin hood hashing for C++14 diff --git a/ports/robin-hood-hashing/portfile.cmake b/ports/robin-hood-hashing/portfile.cmake new file mode 100644 index 000000000..890d6f86a --- /dev/null +++ b/ports/robin-hood-hashing/portfile.cmake @@ -0,0 +1,16 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martinus/robin-hood-hashing + REF 3.2.13 + SHA512 5c508a1f43d2ca86c89b9aac3b17493a23b8ee3c7485438afc8e5eb4e697d663588e1945001ba3ba95dd1480b3c1b846079fadec5972e5ac4462117379052433 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/src/include/robin_hood.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/robin-map/CONTROL b/ports/robin-map/CONTROL index f24dc8337..c11d67999 100644 --- a/ports/robin-map/CONTROL +++ b/ports/robin-map/CONTROL @@ -1,3 +1,3 @@ Source: robin-map -Version: 0.2.0 +Version: 0.6.1 Description: A C++ implementation of a fast hash map and hash set using robin hood hashing diff --git a/ports/robin-map/portfile.cmake b/ports/robin-map/portfile.cmake index 6436f6194..73cd9c7d8 100644 --- a/ports/robin-map/portfile.cmake +++ b/ports/robin-map/portfile.cmake @@ -3,12 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/robin-map - REF v0.2.0 - SHA512 6d16c612a0d646fd08857f2f6ee2909fb607ff05fa9c7733a2b618d662f63bba2f99677b75a09870a1582b7b37f255c4ff1f9171c897c3cfa73dd8879de1ec18 + REF 3285ed7615b72020bd68ba6d30f9ec0c0c526098 + SHA512 3850a0ea06f62ba177a1746a92a3f9c999f6398d4d786dbc63dd276569e77e3d9c15e83c0cb74a1314e3c2b5ff73225675d914cf4ab3f052353b237ab9219bc8 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/tsl DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${SOURCE_PATH}/include/tsl DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL ${SOURCE_PATH}/LICENSE diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 6588f527c..6e35d8a9b 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -1,5 +1,6 @@ Source: rocksdb -Version: 6.0.1 +Version: 6.0.2 +Homepage: https://github.com/facebook/rocksdb Description: A library that provides an embeddable, persistent key-value store for fast storage Default-Features: zlib diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index b5356c31e..27a9d70d5 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF v6.0.1 - SHA512 ce44baa407ea692b1e4c6ca76578d14f7f15df81e7687f17d6ac19e1f9bcb81fa1d0cc921fe0b137f960d95c85aba219c2a981365635531206d0cf1cf1cfe473 + REF v6.0.2 + SHA512 6659f04c9823750b9b635e2a247b59dbda4975458615392df82bdbeb4ac7ac783e6de86a32fcc318aae1bb27880557390c544c99caa3db3885f9c3d836cc1df8 HEAD_REF master PATCHES 0001-disable-gtest.patch diff --git a/ports/rpclib/CONTROL b/ports/rpclib/CONTROL index d3531e9b5..15e6abd3e 100644 --- a/ports/rpclib/CONTROL +++ b/ports/rpclib/CONTROL @@ -1,3 +1,4 @@ Source: rpclib
Version: 2.2.1-1
+Homepage: https://github.com/rpclib/rpclib
Description: a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.
diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL index 6b48e9cc0..1a766286b 100644 --- a/ports/rs-core-lib/CONTROL +++ b/ports/rs-core-lib/CONTROL @@ -1,4 +1,5 @@ Source: rs-core-lib -Version: 2019-04-19 +Version: 2019-05-07 +Homepage: https://github.com/CaptainCrowbar/rs-core-lib Description: Minimal common utilities by Ross Smith diff --git a/ports/rs-core-lib/portfile.cmake b/ports/rs-core-lib/portfile.cmake index d3e8e7a75..239d61126 100644 --- a/ports/rs-core-lib/portfile.cmake +++ b/ports/rs-core-lib/portfile.cmake @@ -3,12 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/rs-core-lib - REF 65235aec3b72ac622d1c9cf146dbf78aa3dfab0d - SHA512 6cae59bf4d254a4fe968d51ecab2910a7fedabed0eaaa549bc05df4b2960cbe1c7206e1408b3c7afeee3c9aa3ef1883f3cdc15dde35a3c39e50ba99a0115dc5e + REF 4828e0dc8b7e7ed76935865cfe99181da0da211b + SHA512 97298d94c1cc4cd4cb580bde6c1413a2f429544dc80cae58bc436aad25e385d9ced611a2512a45f1e3d10fd613f26958fc5d3a03ea9bfaefd5170a4b2d1ac124 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 +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/rtmidi/CONTROL b/ports/rtmidi/CONTROL index 9eaad9735..3742ec9b1 100644 --- a/ports/rtmidi/CONTROL +++ b/ports/rtmidi/CONTROL @@ -1,3 +1,4 @@ Source: rtmidi -Version: 2.1.1-2 +Version: 4.0.0 +Homepage: https://github.com/thestk/rtmidi 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) diff --git a/ports/rtmidi/fix-POSIXname.patch b/ports/rtmidi/fix-POSIXname.patch new file mode 100644 index 000000000..a2a5b0ee1 --- /dev/null +++ b/ports/rtmidi/fix-POSIXname.patch @@ -0,0 +1,17 @@ +diff --git a/rtmidi_c.cpp b/rtmidi_c.cpp
+index 248c9e5..ec1dd38 100644
+--- a/rtmidi_c.cpp
++++ b/rtmidi_c.cpp
+@@ -136,7 +136,11 @@ const char* rtmidi_get_port_name (RtMidiPtr device, unsigned int portNumber)
+ {
+ try {
+ std::string name = ((RtMidi*) device->ptr)->getPortName (portNumber);
+- return strdup (name.c_str ());
++#if defined(_WIN) || defined(WINAPI_FAMILY) //Windows platform
++ return _strdup (name.c_str ());
++#else // Unix platform
++ return strdup (name.c_str ());
++#endif
+
+ } catch (const RtMidiError & err) {
+ device->ok = false;
diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index cee6e1a73..8aa949b5a 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -3,9 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtmidi - REF 2.1.1 - SHA512 4d378720dd0f7c0e1a87741c088756839878ed56465b053040f70a1e039828fe221a6b1669b77b2fdd146cb192934c5719cc934c2c6a6304f44dbee2972c68e8 + REF 4.0.0 + SHA512 39383f121320c9471b31f8b9d283167bfadf4c7328b6664d1d54a4c52e3dd9b76362875258d90363c6044e87fcee31ccce80e19435dc620c88e6d60fc82d0f9d HEAD_REF master + PATCHES + fix-POSIXname.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -17,4 +19,4 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/readme DESTINATION ${CURRENT_PACKAGES_DIR}/share/rtmidi RENAME copyright) +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/rtmidi RENAME copyright) diff --git a/ports/rttr/CONTROL b/ports/rttr/CONTROL index 55e6e6b67..739492784 100644 --- a/ports/rttr/CONTROL +++ b/ports/rttr/CONTROL @@ -1,3 +1,4 @@ Source: rttr
Version: 0.9.6-1
+Homepage: https://github.com/rttrorg/rttr
Description: an easy and intuitive way to use reflection in C++
diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index 2c2c7e863..a85a2b157 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -23,9 +23,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if(UNIX) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") vcpkg_fixup_cmake_targets(CONFIG_PATH share/rttr/cmake) -elseif(WIN32) +elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) else() message(FATAL_ERROR "RTTR does not support this platform") diff --git a/ports/rxcpp/CONTROL b/ports/rxcpp/CONTROL index 7bf2aca17..2ada65d3b 100644 --- a/ports/rxcpp/CONTROL +++ b/ports/rxcpp/CONTROL @@ -1,3 +1,4 @@ Source: rxcpp -Version: 4.0.0-1 +Version: 4.1.0 +Homepage: https://github.com/Reactive-Extensions/RxCpp Description: Reactive Extensions for C++
\ No newline at end of file diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index 00b154989..5844f469b 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -5,8 +5,8 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-4.0.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Reactive-Extensions/RxCpp - REF v4.0.0 - SHA512 df7582925e749fb7f9fbc085566d57a46571e18202aacaa7d35cf9da8152b29dd2886b2d07dae93e538f2a0f7b91d93fb3da23c34c7ea4467772515c794a25b7 + REF v4.1.0 + SHA512 a92e817ecbdf6f235cae724ada2615af9fa0c243249625d0f2c2f09ff5dd7f53fdabd03a0278fe2995fe27528c5511d71f87b7a6b3d54f73b49b65aef56e32fd HEAD_REF master ) diff --git a/ports/rxqt/CONTROL b/ports/rxqt/CONTROL index dc87425aa..eeaab0986 100644 --- a/ports/rxqt/CONTROL +++ b/ports/rxqt/CONTROL @@ -1,4 +1,5 @@ Source: rxqt
Version: bb2138c
-Description: The Reactive Extensions for Qt. <https://github.com/tetsurom/rxqt>
+Description: The Reactive Extensions for Qt.
+Homepage: https://github.com/tetsurom/rxqt
Build-Depends: rxcpp
\ No newline at end of file diff --git a/ports/safeint/CONTROL b/ports/safeint/CONTROL index 726ebdc6b..6ac85d36b 100644 --- a/ports/safeint/CONTROL +++ b/ports/safeint/CONTROL @@ -1,3 +1,3 @@ Source: safeint -Version: 3.19.2 +Version: 3.20.0 Description: SafeInt is a class library for C++ that manages integer overflows diff --git a/ports/safeint/portfile.cmake b/ports/safeint/portfile.cmake index dd8e41aca..bacd54541 100644 --- a/ports/safeint/portfile.cmake +++ b/ports/safeint/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dcleblanc/SafeInt - REF b1c48bd32b5e748ed57c153c418a5ed67538045a - SHA512 d0b59430da353e0af55a9ab83964e35bfb61edff00f8a2aef6df139720f271aae851ea9de54ca4280e220eff9946590a7b5c85c102f3c2e5f051a6cb7d7a3e5e + REF 3.20.0 + SHA512 ebd10ac2578b4ab7968b2f89b7c8114a55bfd1967d625498a555b5354acf5a8c6b145b38429eb0dc853e7a0a33728a2a5acb505888bc983e7b0de81d09f50918 HEAD_REF master ) diff --git a/ports/scintilla/CONTROL b/ports/scintilla/CONTROL index 8f1b2f38c..6b7aa54f6 100644 --- a/ports/scintilla/CONTROL +++ b/ports/scintilla/CONTROL @@ -1,3 +1,4 @@ Source: scintilla Version: 4.1.2 +Homepage: https://www.scintilla.org/ Description: A free source code editing component for Win32, GTK+, and OS X diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL index 69f2d68a0..0cd3bb219 100644 --- a/ports/sciter/CONTROL +++ b/ports/sciter/CONTROL @@ -1,4 +1,5 @@ Source: sciter
Version: 4.2.6.9-1
+Homepage: https://github.com/c-smile/sciter-sdk
Description: Sciter is an embeddable HTML/CSS/scripting engine.
Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com
diff --git a/ports/scylla-wrapper/CONTROL b/ports/scylla-wrapper/CONTROL index e320224b0..bbe37c117 100644 --- a/ports/scylla-wrapper/CONTROL +++ b/ports/scylla-wrapper/CONTROL @@ -1,4 +1,4 @@ Source: scylla-wrapper
Version: 2018-08-26-16e6f435
Build-Depends: distorm
-Description: This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on http://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b).
\ No newline at end of file +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).
\ No newline at end of file diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL index 2788f032a..1c28b50f0 100644 --- a/ports/sdl2-image/CONTROL +++ b/ports/sdl2-image/CONTROL @@ -1,6 +1,7 @@ Source: sdl2-image -Version: 2.0.4-2 +Version: 2.0.4-3 Build-Depends: sdl2, libpng +Homepage: https://www.libsdl.org/projects/SDL_image 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 Feature: libjpeg-turbo diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index 4d02e93f4..a1e69af54 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${SDL2_IMAGE_VERSION} + REF ${SDL2_IMAGE_VERSION} ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -43,12 +43,12 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/sdl2-image") 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()
\ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index f9912346c..1265145fa 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -49,9 +49,11 @@ endif() # Opus support if(SDL_MIXER_ENABLE_OPUS) find_path(OPUS_INCLUDE_DIR opus/opusfile.h) + find_package(ogg CONFIG REQUIRED) + find_package(Opus CONFIG REQUIRED) find_library(OPUSFILE_LIBRARY opusfile) list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR}) - list(APPEND SDL_MIXER_LIBRARIES ${OPUSFILE_LIBRARY}) + list(APPEND SDL_MIXER_LIBRARIES ${OPUSFILE_LIBRARY} Ogg::ogg Opus::opus) list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS) endif() diff --git a/ports/sdl2-mixer/CONTROL b/ports/sdl2-mixer/CONTROL index 4c55575f4..2c76639dc 100644 --- a/ports/sdl2-mixer/CONTROL +++ b/ports/sdl2-mixer/CONTROL @@ -1,5 +1,6 @@ Source: sdl2-mixer -Version: 2.0.4-2 +Version: 2.0.4-3 +Homepage: https://www.libsdl.org/projects/SDL_mixer Description: Multi-channel audio mixer library for SDL. Build-Depends: sdl2 diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 0b1b6dcea..977062a19 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -53,8 +53,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/sdl2-mixer") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-mixer) diff --git a/ports/sdl2-net/CONTROL b/ports/sdl2-net/CONTROL index e855e2656..9270c5a82 100644 --- a/ports/sdl2-net/CONTROL +++ b/ports/sdl2-net/CONTROL @@ -1,4 +1,5 @@ Source: sdl2-net -Version: 2.0.1-6 +Version: 2.0.1-7 +Homepage: https://www.libsdl.org/projects/SDL_net Description: Networking library for SDL Build-Depends: sdl2 diff --git a/ports/sdl2-net/portfile.cmake b/ports/sdl2-net/portfile.cmake index 2a8928e16..b047be96b 100644 --- a/ports/sdl2-net/portfile.cmake +++ b/ports/sdl2-net/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/sdl2-net") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-net) diff --git a/ports/sdl2-ttf/CONTROL b/ports/sdl2-ttf/CONTROL index 22598164e..34d12bafd 100644 --- a/ports/sdl2-ttf/CONTROL +++ b/ports/sdl2-ttf/CONTROL @@ -1,4 +1,5 @@ Source: sdl2-ttf -Version: 2.0.15-2 +Version: 2.0.15-3 +Homepage: https://www.libsdl.org/projects/SDL_ttf/ Description: A library for rendering TrueType fonts with SDL Build-Depends: sdl2, freetype diff --git a/ports/sdl2-ttf/portfile.cmake b/ports/sdl2-ttf/portfile.cmake index 55451dcf1..eb623e13e 100644 --- a/ports/sdl2-ttf/portfile.cmake +++ b/ports/sdl2-ttf/portfile.cmake @@ -24,8 +24,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/sdl2-ttf") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf) diff --git a/ports/sdl2/CONTROL b/ports/sdl2/CONTROL index b03d96e81..d76db966f 100644 --- a/ports/sdl2/CONTROL +++ b/ports/sdl2/CONTROL @@ -1,5 +1,6 @@ Source: sdl2 -Version: 2.0.9-3 +Version: 2.0.9-4 +Homepage: https://github.com/SDL-Mirror/SDL 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. Feature: vulkan diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 468560575..a2bc6363a 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -36,11 +36,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake") + vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/SDL2") - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/SDL2") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SDL2) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/SDL2.framework/Resources") - vcpkg_fixup_cmake_targets(CONFIG_PATH "SDL2.framework/Resources") + vcpkg_fixup_cmake_targets(CONFIG_PATH SDL2.framework/Resources) endif() file(REMOVE_RECURSE diff --git a/ports/sdl2pp/CONTROL b/ports/sdl2pp/CONTROL index 19fecb092..6a3f7c509 100644 --- a/ports/sdl2pp/CONTROL +++ b/ports/sdl2pp/CONTROL @@ -1,4 +1,5 @@ Source: sdl2pp Version: 0.16.0-1 -Description: C++11 bindings/wrapper for SDL2 https://sdl2pp.amdmi3.ru +Description: C++11 bindings/wrapper for SDL2 +Homepage: https://sdl2pp.amdmi3.ru Build-Depends: sdl2, sdl2-mixer, sdl2-image, sdl2-ttf diff --git a/ports/secp256k1/CONTROL b/ports/secp256k1/CONTROL index 16761cc4d..a0414b60c 100644 --- a/ports/secp256k1/CONTROL +++ b/ports/secp256k1/CONTROL @@ -1,3 +1,4 @@ Source: secp256k1
Version: 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-2
+Homepage: https://github.com/bitcoin-core/secp256k1
Description: Optimized C library for EC operations on curve
diff --git a/ports/selene/CONTROL b/ports/selene/CONTROL index ce266e859..b3bbed2b6 100644 --- a/ports/selene/CONTROL +++ b/ports/selene/CONTROL @@ -1,4 +1,4 @@ Source: selene
-Version: 0.3.1
+Version: 0.3.1-1
Description: A C++17 image representation, processing and I/O library.
Build-Depends: zlib, libpng, libjpeg-turbo, tiff
diff --git a/ports/selene/disable_x86_intrinsics_on_arm.patch b/ports/selene/disable_x86_intrinsics_on_arm.patch new file mode 100644 index 000000000..79e38c57c --- /dev/null +++ b/ports/selene/disable_x86_intrinsics_on_arm.patch @@ -0,0 +1,13 @@ +diff --git a/selene/base/Bitcount.hpp b/selene/base/Bitcount.hpp +index a4d69e4..709f650 100755 +--- a/selene/base/Bitcount.hpp ++++ b/selene/base/Bitcount.hpp +@@ -69,7 +69,7 @@ inline std::size_t bit_count(unsigned long long x) + return static_cast<std::size_t>(__builtin_popcountll(x)); + } + +-#elif defined(_MSC_VER) ++#elif defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64) + + /** \brief Performs a bit count on the supplied value. + * diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake index 97f05a38b..11a2e89eb 100644 --- a/ports/selene/portfile.cmake +++ b/ports/selene/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF v0.3.1
SHA512 7bc57ebe9e2442da2716eb5c1af11f8d610b0b09fe96e3122d1028575732b6045a987c499bbf7de53003edd627b8809d86c80ea4975fc2264a1c61d5891a46c3
HEAD_REF master
+ PATCHES
+ disable_x86_intrinsics_on_arm.patch
)
vcpkg_configure_cmake(
@@ -16,7 +18,7 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/selene")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/selene)
vcpkg_copy_pdbs()
# Include files should not be duplicated into the /debug/include directory.
diff --git a/ports/sentencepiece/CONTROL b/ports/sentencepiece/CONTROL new file mode 100644 index 000000000..41db3d5ff --- /dev/null +++ b/ports/sentencepiece/CONTROL @@ -0,0 +1,3 @@ +Source: sentencepiece
+Version: v0.1.82
+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
\ No newline at end of file diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake new file mode 100644 index 000000000..2623acac1 --- /dev/null +++ b/ports/sentencepiece/portfile.cmake @@ -0,0 +1,34 @@ +include(vcpkg_common_functions)
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_STATIC_CRT)
+endif()
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO google/sentencepiece
+ REF v0.1.82
+ SHA512 669d6a1e86c44587d725b1e93f11b707e510a180dec08afb79268158f5de009cb20ffccc72c501c84f032360e52e53ae227504f3538f59978629433e0d6fcf65
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DSPM_ENABLE_SHARED=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece.lib ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepieced.lib)
+ file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib)
+endif()
+
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
\ No newline at end of file diff --git a/ports/sf2cute/CONTROL b/ports/sf2cute/CONTROL index 7d850c694..bdba56cc7 100644 --- a/ports/sf2cute/CONTROL +++ b/ports/sf2cute/CONTROL @@ -1,6 +1,6 @@ Source: sf2cute
-Version: 0.2.0
+Version: 0.2.0-1
Description: C++14 Library for SoundFont 2
Feature: example
-Description: Installs an example application
\ No newline at end of file +Description: Installs an example application
diff --git a/ports/sf2cute/portfile.cmake b/ports/sf2cute/portfile.cmake index 5a99ca11b..e46222396 100644 --- a/ports/sf2cute/portfile.cmake +++ b/ports/sf2cute/portfile.cmake @@ -26,12 +26,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-# move the .cmake files from the given directory to the expected directory by vcpkg
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/sf2cute)
-
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sf2cute RENAME copyright)
diff --git a/ports/sfgui/CONTROL b/ports/sfgui/CONTROL index da3ee41a9..cd9f17ab9 100644 --- a/ports/sfgui/CONTROL +++ b/ports/sfgui/CONTROL @@ -1,4 +1,5 @@ Source: sfgui Version: 0.4.0 +Homepage: https://github.com/TankOs/SFGUI Description: simple and fast graphical user interface library Build-Depends: sfml diff --git a/ports/sfml/CONTROL b/ports/sfml/CONTROL index 8fcda5bc1..d23645a30 100644 --- a/ports/sfml/CONTROL +++ b/ports/sfml/CONTROL @@ -1,4 +1,5 @@ Source: sfml
Version: 2.5.1-1
+Homepage: https://github.com/sfml/sfml
Description: Simple and fast multimedia library
Build-Depends: freetype, libflac, libogg, libvorbis, openal-soft, stb
diff --git a/ports/shaderc/CONTROL b/ports/shaderc/CONTROL index c428c0ea9..36f82852a 100644 --- a/ports/shaderc/CONTROL +++ b/ports/shaderc/CONTROL @@ -1,4 +1,5 @@ Source: shaderc Version: 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2 +Homepage: https://github.com/google/shaderc Description: A collection of tools, libraries and tests for shader compilation. Build-Depends: glslang, spirv-tools diff --git a/ports/shapelib/CONTROL b/ports/shapelib/CONTROL index 57fbecb53..338be3ebe 100644 --- a/ports/shapelib/CONTROL +++ b/ports/shapelib/CONTROL @@ -1,3 +1,4 @@ Source: shapelib Version: 1.4.1-1 +Homepage: https://download.osgeo.org/shapelib Description: Shapefile C Library is simple C API for reading and writing ESRI Shapefiles diff --git a/ports/shiva/CONTROL b/ports/shiva/CONTROL index ef9154a29..0ce81203d 100644 --- a/ports/shiva/CONTROL +++ b/ports/shiva/CONTROL @@ -1,4 +1,4 @@ Source: shiva
-Version: 1.0
+Version: 1.0-2
Description: Modern C++ Game Engine
-Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, lua (windows), luafilesystem (windows), sol2, pybind11, spdlog, nlohmann-json
+Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, lua, luafilesystem (windows), sol2, pybind11, spdlog, nlohmann-json
diff --git a/ports/shiva/portfile.cmake b/ports/shiva/portfile.cmake index 1f64fa220..372c318e0 100644 --- a/ports/shiva/portfile.cmake +++ b/ports/shiva/portfile.cmake @@ -1,5 +1,7 @@ include(vcpkg_common_functions)
+vcpkg_find_acquire_program(PYTHON2)
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Milerius/shiva
@@ -11,7 +13,9 @@ vcpkg_from_github( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS -DSHIVA_BUILD_TESTS=OFF
+ OPTIONS
+ -DSHIVA_BUILD_TESTS=OFF
+ -DPYTHON_EXECUTABLE=${PYTHON2}
)
vcpkg_install_cmake()
diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL index 5188892da..e57f129fe 100644 --- a/ports/shogun/CONTROL +++ b/ports/shogun/CONTROL @@ -1,4 +1,4 @@ -Source: shogun
-Version: 6.1.3-1
-Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
-Description: Unified and efficient Machine Learning
+Source: shogun +Version: 6.1.3-3 +Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64&!osx), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent +Description: Unified and efficient Machine Learning diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake index b207116c8..37a755894 100644 --- a/ports/shogun/portfile.cmake +++ b/ports/shogun/portfile.cmake @@ -2,32 +2,29 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_DISABLE_FIND_PACKAGE_BLAS 0) +else() + set(CMAKE_DISABLE_FIND_PACKAGE_BLAS 1) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO shogun-toolbox/shogun REF shogun_6.1.3 SHA512 11aeed456b13720099ca820ab9742c90ce4af2dc049602a425f8c44d2fa155327c7f1d3af2ec840666f600a91e75902d914ffe784d76ed35810da4f3a5815673 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch + PATCHES + cmake.patch ) file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/external) file(MAKE_DIRECTORY ${SOURCE_PATH}/cmake/external) file(COPY ${CMAKE_CURRENT_LIST_DIR}/MSDirent.cmake DESTINATION ${SOURCE_PATH}/cmake/external) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(CMAKE_DISABLE_FIND_PACKAGE_BLAS 0) -else() - set(CMAKE_DISABLE_FIND_PACKAGE_BLAS 1) -endif() - vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}") +vcpkg_add_to_path(${PYTHON3_DIR}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -38,9 +35,7 @@ vcpkg_configure_cmake( -DUSE_SVMLIGHT=OFF -DENABLE_TESTING=OFF -DLICENSE_GPL_SHOGUN=OFF - # Conflicting definitions in OpenBLAS and Eigen - -DENABLE_EIGEN_LAPACK=OFF - + -DLIBSHOGUN_BUILD_STATIC=ON -DCMAKE_DISABLE_FIND_PACKAGE_JSON=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=TRUE @@ -53,14 +48,15 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Ctags=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_CCache=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=${CMAKE_DISABLE_FIND_PACKAGE_BLAS} -DINSTALL_TARGETS=shogun-static ) vcpkg_install_cmake() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/shogun) file(REMOVE_RECURSE diff --git a/ports/signalrclient/0002_fix-compile-error.patch b/ports/signalrclient/0002_fix-compile-error.patch index bcda3646b..e3631379b 100644 --- a/ports/signalrclient/0002_fix-compile-error.patch +++ b/ports/signalrclient/0002_fix-compile-error.patch @@ -11,14 +11,19 @@ index 91c2300..2439fec 100644 set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir")
include_directories (
-@@ -22,6 +24,7 @@ if(NOT DISABLE_TESTS)
- add_subdirectory(test)
- endif()
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 506680d04..d8bd404a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,7 +13,7 @@ include_directories (
+ include
+ "${CPPREST_INCLUDE_DIR}")
-+
- if(BUILD_SHARED_LIBS)
- install(FILES include/signalrclient/_exports.h DESTINATION include/signalrclient)
- else()
+-find_library(CPPREST_SO NAMES "cpprest" PATHS ${CPPREST_LIB_DIR} REQUIRED)
++find_package(cpprestsdk REQUIRED)
+
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt
index db141eb..c4306d8 100644
--- a/src/signalrclient/CMakeLists.txt
@@ -28,7 +33,7 @@ index db141eb..c4306d8 100644 add_library (signalrclient ${SOURCES})
-target_link_libraries(signalrclient ${CPPREST_SO})
-+target_link_libraries(signalrclient ${CPPREST_SO} OpenSSL::SSL OpenSSL::Crypto)
++target_link_libraries(signalrclient cpprestsdk::cpprest OpenSSL::SSL OpenSSL::Crypto)
install(
TARGETS signalrclient
diff --git a/ports/signalrclient/CONTROL b/ports/signalrclient/CONTROL index c7bb1ea4a..e64b920ba 100644 --- a/ports/signalrclient/CONTROL +++ b/ports/signalrclient/CONTROL @@ -1,4 +1,5 @@ Source: signalrclient -Version: 1.0.0-beta1-5 +Version: 1.0.0-beta1-6 Build-Depends: cpprestsdk, openssl +Homepage: https://github.com/aspnet/SignalR-Client-Cpp Description: C++ client for SignalR. diff --git a/ports/simde/CONTROL b/ports/simde/CONTROL new file mode 100644 index 000000000..7f70f4911 --- /dev/null +++ b/ports/simde/CONTROL @@ -0,0 +1,3 @@ +Source: simde
+Version: 2019-06-05
+Description: Implementations of SIMD instruction sets for systems which don't natively support them
diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake new file mode 100644 index 000000000..e79594ace --- /dev/null +++ b/ports/simde/portfile.cmake @@ -0,0 +1,16 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO nemequ/simde
+ REF 6e3ba90605361069cf3422c44242c79171b87275
+ SHA512 d62ff40882c2b3a17c900104b36ae77137cbb77917d409cba1c0693fdcf317a38ff3184deaaecca0ef31d88393bebf0102a8ab57a23ad5d0cee2d3e5fe799f6a
+ HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/simde DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/smpeg2/CMakeLists.txt b/ports/smpeg2/CMakeLists.txt index 87a3586be..b0e284b05 100644 --- a/ports/smpeg2/CMakeLists.txt +++ b/ports/smpeg2/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) project(SMPEG2 CXX) find_path(SDL_INCLUDE_DIR SDL2/SDL.h) -find_library(SDL_LIBRARY NAMES SDL2d SDL2) +find_package(SDL2 CONFIG REQUIRED) include_directories(${SDL_INCLUDE_DIR}) include_directories(${SDL_INCLUDE_DIR}/SDL2) @@ -46,7 +46,11 @@ add_library(smpeg2 smpeg.cpp) set_target_properties(smpeg2 PROPERTIES DEFINE_SYMBOL SDL2_EXPORTS) -target_link_libraries(smpeg2 ${SDL_LIBRARY}) +if(BUILD_SHARED_LIBS) + target_link_libraries(smpeg2 SDL2::SDL2) +else() + target_link_libraries(smpeg2 SDL2::SDL2-static) +endif() install(TARGETS smpeg2 RUNTIME DESTINATION bin diff --git a/ports/smpeg2/CONTROL b/ports/smpeg2/CONTROL index 0de1c4700..3a761287e 100644 --- a/ports/smpeg2/CONTROL +++ b/ports/smpeg2/CONTROL @@ -1,4 +1,5 @@ Source: smpeg2
-Version: 2.0.0-5
+Version: 2.0.0-6
+Homepage: https://www.libsdl.org/projects/smpeg/
Description: SDL MPEG Player Library
Build-Depends: sdl2
diff --git a/ports/snappy/CONTROL b/ports/snappy/CONTROL index d90f5039c..a0a0cae03 100644 --- a/ports/snappy/CONTROL +++ b/ports/snappy/CONTROL @@ -1,3 +1,4 @@ Source: snappy Version: 1.1.7-2 +Homepage: https://github.com/google/snappy Description: A fast compressor/decompressor. diff --git a/ports/sndfile/CONTROL b/ports/sndfile/CONTROL index eeee6d909..fb01b6408 100644 --- a/ports/sndfile/CONTROL +++ b/ports/sndfile/CONTROL @@ -1,8 +1,9 @@ Source: sndfile -Version: 1.0.29-cebfdf2-1 -Description: Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo +Version: 0 +Description:x Library to read, write and manipulate many soundfile types. +Build-Depends: libsndfile Default-Features: external-libs Feature: external-libs Description: Support Ogg Vorbis and FLAC audio files -Build-Depends: libogg, libflac, libvorbis +Build-Depends: libsndfile[external-libs] diff --git a/ports/sndfile/portfile.cmake b/ports/sndfile/portfile.cmake index 22f1579e8..d3910bb2c 100644 --- a/ports/sndfile/portfile.cmake +++ b/ports/sndfile/portfile.cmake @@ -1,62 +1,3 @@ -include(vcpkg_common_functions) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO erikd/libsndfile - REF cebfdf275e6173259bee6bfd40de22c8c102cf23 - SHA512 b981b9a5a457b73f444f4b134a76d9d7ab328369171a0043f89cfcf4567ca29a91ff75abfb362c4bc76c5fb0d25cb88cc397c37dd8f9d98b8892999c2e4e4123 - HEAD_REF master - PATCHES - "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize.patch" - "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize-addendum.patch" -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" CRT_LIB_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) - -option(BUILD_EXECUTABLES "Build sndfile tools and install to folder tools" OFF) - -if("external-libs" IN_LIST FEATURES) - set(SNDFILE_WITH_EXTERNAL_LIBS ON) -else() - set(SNDFILE_WITH_EXTERNAL_LIBS OFF) -endif() - -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(${PYTHON3_EXE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_EXAMPLES=0 -DBUILD_REGTEST=0 -DBUILD_TESTING=0 -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DENABLE_EXTERNAL_LIBS=${SNDFILE_WITH_EXTERNAL_LIBS} - OPTIONS_RELEASE -DBUILD_PROGRAMS=${BUILD_EXECUTABLES} - # Setting ENABLE_PACKAGE_CONFIG=0 has no effect - OPTIONS_DEBUG -DBUILD_PROGRAMS=0 -) - -vcpkg_install_cmake() - -if(WIN32) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SndFile) -endif() - -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/libsndfile ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) - -if(BUILD_EXECUTABLES) - file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(REMOVE ${TOOLS}) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif(BUILD_EXECUTABLES) - -# Handle copyright -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) +message(WARNING "The sndfile port is deprecated, using libsndfile instead") diff --git a/ports/sndfile/uwp-createfile-getfilesize-addendum.patch b/ports/sndfile/uwp-createfile-getfilesize-addendum.patch deleted file mode 100644 index 62e6b1131..000000000 --- a/ports/sndfile/uwp-createfile-getfilesize-addendum.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/file_io.c b/src/file_io.c -index 47351bc..54741c9 100644 ---- a/src/file_io.c -+++ b/src/file_io.c -@@ -799,6 +799,8 @@ psf_open_handle (PSF_FILE * pfile) - - if (handle == INVALID_HANDLE_VALUE) - return NULL; -+ -+ return handle; - #else - if (pfile->use_wchar) - handle = CreateFileW ( diff --git a/ports/sndfile/uwp-createfile-getfilesize.patch b/ports/sndfile/uwp-createfile-getfilesize.patch deleted file mode 100644 index 0e60cde54..000000000 --- a/ports/sndfile/uwp-createfile-getfilesize.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/file_io.c b/src/file_io.c -index 7cf8f0c..47351bc 100644 ---- a/src/file_io.c -+++ b/src/file_io.c -@@ -787,6 +787,19 @@ psf_open_handle (PSF_FILE * pfile) - return NULL ; - } ; - -+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) -+ if (!pfile->use_wchar) -+ return NULL; -+ -+ CREATEFILE2_EXTENDED_PARAMETERS cfParams = {0}; -+ cfParams.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS); -+ cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; -+ -+ handle = CreateFile2(pfile->path.wc, dwDesiredAccess, dwShareMode, dwCreationDistribution, &cfParams); -+ -+ if (handle == INVALID_HANDLE_VALUE) -+ return NULL; -+#else - if (pfile->use_wchar) - handle = CreateFileW ( - pfile->path.wc, /* pointer to name of the file */ -@@ -812,6 +825,7 @@ psf_open_handle (PSF_FILE * pfile) - return NULL ; - - return handle ; -+#endif - } /* psf_open_handle */ - - /* USE_WINDOWS_API */ static void -@@ -1104,7 +1118,16 @@ psf_is_pipe (SF_PRIVATE *psf) - - /* USE_WINDOWS_API */ sf_count_t - psf_get_filelen_handle (HANDLE handle) --{ sf_count_t filelen ; -+{ -+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) -+ LARGE_INTEGER size; -+ -+ if (!GetFileSizeEx(handle, &size) && GetLastError() != NO_ERROR) -+ return (sf_count_t) -1 ; -+ -+ return size.QuadPart; -+#else -+ sf_count_t filelen ; - DWORD dwFileSizeLow, dwFileSizeHigh, dwError = NO_ERROR ; - - dwFileSizeLow = GetFileSize (handle, &dwFileSizeHigh) ; -@@ -1118,6 +1141,7 @@ psf_get_filelen_handle (HANDLE handle) - filelen = dwFileSizeLow + ((__int64) dwFileSizeHigh << 32) ; - - return filelen ; -+#endif - } /* psf_get_filelen_handle */ - - /* USE_WINDOWS_API */ void diff --git a/ports/snowhouse/CONTROL b/ports/snowhouse/CONTROL index b376f4639..ebd1a6192 100644 --- a/ports/snowhouse/CONTROL +++ b/ports/snowhouse/CONTROL @@ -1,3 +1,3 @@ Source: snowhouse
-Version: 3.0.1
+Version: 3.1.0 Description: An assertion library for C++
diff --git a/ports/snowhouse/portfile.cmake b/ports/snowhouse/portfile.cmake index 229a6e5d5..de5fd57e5 100644 --- a/ports/snowhouse/portfile.cmake +++ b/ports/snowhouse/portfile.cmake @@ -3,12 +3,12 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO banditcpp/snowhouse
- REF v3.0.1
- SHA512 b20a703e79a2821bdc43b2a235ed7634499f877f9e96bd0d39eb563ce5c94d4577449cc15dc850176a1b44eb55cf3425885cb4d46a92444a7aa3001ce5d0a3eb
+ REF 5a612c248524a3b1bdd388bc0ef5a9ea0d2fa684 + SHA512 fd737b0f433093246883975ec70a407a62547e768f538e0540ac0634db1578f0ea46979b7055ae428f146499a0df3b1d6292b8d38c22d346476211757a271d21
HEAD_REF master
)
-file(COPY ${SOURCE_PATH}/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h)
+file(COPY ${SOURCE_PATH}/include/snowhouse DESTINATION ${CURRENT_PACKAGES_DIR}/include/ FILES_MATCHING PATTERN *.h)
file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/snowhouse)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/snowhouse/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/snowhouse/copyright)
\ No newline at end of file diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL index e40d92945..882ac0712 100644 --- a/ports/so5extra/CONTROL +++ b/ports/so5extra/CONTROL @@ -1,4 +1,4 @@ Source: so5extra -Version: 1.2.2 +Version: 1.2.3-1 Description: A set of additional tools for SObjectizer framework. Build-Depends: sobjectizer diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index 6fdc213d7..26472935e 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 1.2.2) +set(VERSION 1.2.3) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so_5_extra-${VERSION}/dev/so_5_extra) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/so_5_extra/so_5_extra-${VERSION}.zip/download" FILENAME "so_5_extra-${VERSION}.zip" - SHA512 957b8953f172cc2ea996fe1bd4e4979b0e3fd5fe8d2abff810ff3800c061e4bf5e2935e6bf190d0385621a182a7a623598959716451d9ad5a8f0f14faed725e2 + SHA512 ed12cdae9d23d652cbedd12e37b7faa935ace4c951eb5cb3881306c1384973ac0a90bd59244471a671ec734f6319f0a3144f7a727342c94cec6330eb4195bae9 ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -17,8 +17,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/so5extra") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/so5extra) # Remove unnecessary stuff. # These paths are empty and should be removed too. diff --git a/ports/sobjectizer/CONTROL b/ports/sobjectizer/CONTROL index bf9868021..3e37f70e3 100644 --- a/ports/sobjectizer/CONTROL +++ b/ports/sobjectizer/CONTROL @@ -1,3 +1,4 @@ Source: sobjectizer -Version: 5.5.24.3 +Version: 5.5.24.4-1 +Homepage: https://sourceforge.net/projects/sobjectizer Description: SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels. diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 8b1e53be9..4588ea4f2 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,12 +1,12 @@ include(vcpkg_common_functions) -set(VERSION 5.5.24.3) +set(VERSION 5.5.24.4) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/so-${VERSION}/dev) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/sobjectizer/files/sobjectizer/SObjectizer%20Core%20v.5.5/so-${VERSION}.zip" FILENAME "so-${VERSION}.zip" - SHA512 b3421dd2c84d9143a425f2144ce8810a75a55182316107f72513ee931d737e7f86867640010cab0e67ff6d3ea79ebe9eda22b7f1876b632b1575dfc52de3eeef + SHA512 83f20091b9aa9ecec08b72a97c9190da7bfbe7cc69076dd70074f814208a2712ec722a8c9e7367ab8a416a5c0d488edebb6066371f7cec5dd566f51ef297b382 ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -29,7 +29,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/sobjectizer") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sobjectizer) # Handle copyright file(COPY ${SOURCE_PATH}/../LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sobjectizer) diff --git a/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch b/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch new file mode 100644 index 000000000..cab358512 --- /dev/null +++ b/ports/soci/0001-Deduce-reference-in-boost-fusion-for_each.patch @@ -0,0 +1,75 @@ +From 5c3b1e0a61d83d7a3c70fb882c7e0918777f0e00 Mon Sep 17 00:00:00 2001 +From: Andrei Lebedev <lebdron@gmail.com> +Date: Sun, 5 May 2019 19:52:01 +0300 +Subject: [PATCH] Deduce reference in boost::fusion::for_each + +Signed-off-by: Andrei Lebedev <lebdron@gmail.com> +--- + include/soci/bind-values.h | 27 +++++++++++++++++++++++---- + 1 file changed, 23 insertions(+), 4 deletions(-) + +diff --git a/include/soci/bind-values.h b/include/soci/bind-values.h +index eee416e..e84fb0e 100644 +--- a/include/soci/bind-values.h ++++ b/include/soci/bind-values.h +@@ -13,6 +13,13 @@ + #ifdef SOCI_HAVE_BOOST + # include <boost/fusion/algorithm/iteration/for_each.hpp> + # include <boost/mpl/bool.hpp> ++# include <boost/version.hpp> ++ ++# if BOOST_VERSION >= 106800 ++# define SOCI_BOOST_FUSION_FOREACH_REFERENCE & ++# else ++# define SOCI_BOOST_FUSION_FOREACH_REFERENCE ++# endif + #endif // SOCI_HAVE_BOOST + #include <vector> + +@@ -83,13 +90,19 @@ private: + template <typename T, typename Indicator> + void exchange_(use_container<T, Indicator> const &uc, boost::mpl::true_ * /* fusion sequence */) + { +- boost::fusion::for_each(uc.t, use_sequence<T, Indicator>(*this, uc.ind)); ++ use_sequence<T, Indicator> f(*this, uc.ind); ++ boost::fusion::for_each<T, ++ use_sequence<T, Indicator> ++ SOCI_BOOST_FUSION_FOREACH_REFERENCE>(uc.t, f); + } + + template <typename T> + void exchange_(use_container<T, details::no_indicator> const &uc, boost::mpl::true_ * /* fusion sequence */) + { +- boost::fusion::for_each(uc.t, use_sequence<T, details::no_indicator>(*this)); ++ use_sequence<T, details::no_indicator> f(*this); ++ boost::fusion::for_each<T, ++ use_sequence<T, details::no_indicator> ++ SOCI_BOOST_FUSION_FOREACH_REFERENCE>(uc.t, f); + } + + #endif // SOCI_HAVE_BOOST +@@ -173,13 +186,19 @@ private: + template <typename T, typename Indicator> + void exchange_(into_container<T, Indicator> const &ic, boost::mpl::true_ * /* fusion sequence */) + { +- boost::fusion::for_each(ic.t, into_sequence<T, Indicator>(*this, ic.ind)); ++ into_sequence<T, Indicator> f(*this, ic.ind); ++ boost::fusion::for_each<T, ++ into_sequence<T, Indicator> ++ SOCI_BOOST_FUSION_FOREACH_REFERENCE>(ic.t, f); + } + + template <typename T> + void exchange_(into_container<T, details::no_indicator> const &ic, boost::mpl::true_ * /* fusion sequence */) + { +- boost::fusion::for_each(ic.t, into_sequence<T, details::no_indicator>(*this)); ++ into_sequence<T, details::no_indicator> f(*this); ++ boost::fusion::for_each<T, ++ into_sequence<T, details::no_indicator> ++ SOCI_BOOST_FUSION_FOREACH_REFERENCE>(ic.t, f); + } + #endif // SOCI_HAVE_BOOST + +-- +2.20.1.windows.1 + diff --git a/ports/soci/0002-Find-PostgreSQL-debug-library.patch b/ports/soci/0002-Find-PostgreSQL-debug-library.patch new file mode 100644 index 000000000..fef23b751 --- /dev/null +++ b/ports/soci/0002-Find-PostgreSQL-debug-library.patch @@ -0,0 +1,62 @@ +From f1fa9cc84e67c9f28f651b926f55f93d60bbb963 Mon Sep 17 00:00:00 2001 +From: Andrei Lebedev <lebdron@gmail.com> +Date: Sun, 5 May 2019 21:22:49 +0300 +Subject: [PATCH] Find PostgreSQL debug library + +Signed-off-by: Andrei Lebedev <lebdron@gmail.com> +--- + cmake/modules/FindPostgreSQL.cmake | 31 +++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) + +diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake +index 48937e2..e2e557b 100644 +--- a/cmake/modules/FindPostgreSQL.cmake ++++ b/cmake/modules/FindPostgreSQL.cmake +@@ -124,16 +124,21 @@ if ( WIN32 ) + set (POSTGRESQL_LIBRARY_TO_FIND ${POSTGRESQL_LIB_PREFIX}${POSTGRESQL_LIBRARY_TO_FIND}) + endif() + +-find_library(POSTGRESQL_LIBRARY +- NAMES ${POSTGRESQL_LIBRARY_TO_FIND} +- PATHS +- ${POSTGRESQL_ROOT_DIRECTORIES} +- PATH_SUFFIXES +- lib +- ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES} +- # Help the user find it if we cannot. +- DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}" +-) ++function(__postgresql_find_library _name) ++ find_library(${_name} ++ NAMES ${ARGN} ++ PATHS ++ ${POSTGRESQL_ROOT_DIRECTORIES} ++ PATH_SUFFIXES ++ lib ++ ${POSTGRESQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES} ++ # Help the user find it if we cannot. ++ DOC "The ${POSTGRESQL_LIBRARY_DIR_MESSAGE}" ++ ) ++endfunction() ++ ++__postgresql_find_library(POSTGRESQL_LIBRARY ${POSTGRESQL_LIBRARY_TO_FIND}) ++__postgresql_find_library(POSTGRESQL_LIBRARY_DEBUG ${POSTGRESQL_LIBRARY_TO_FIND}d) + get_filename_component(POSTGRESQL_LIBRARY_DIR ${POSTGRESQL_LIBRARY} PATH) + + if (POSTGRESQL_INCLUDE_DIR) +@@ -169,7 +174,11 @@ set(POSTGRESQL_FOUND ${POSTGRESQL_FOUND}) + if(POSTGRESQL_FOUND) + set(POSTGRESQL_INCLUDE_DIRS ${POSTGRESQL_INCLUDE_DIR}) + set(POSTGRESQL_LIBRARY_DIRS ${POSTGRESQL_LIBRARY_DIR}) +- set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY}) ++ if(POSTGRESQL_LIBRARY AND POSTGRESQL_LIBRARY_DEBUG) ++ set(POSTGRESQL_LIBRARIES optimized ${POSTGRESQL_LIBRARY} debug ${POSTGRESQL_LIBRARY_DEBUG}) ++ else() ++ set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARY}) ++ endif() + set(POSTGRESQL_VERSION ${POSTGRESQL_VERSION_STRING}) + endif() + +-- +2.20.1.windows.1 + diff --git a/ports/soci/CONTROL b/ports/soci/CONTROL index aaab2490e..224e3de64 100644 --- a/ports/soci/CONTROL +++ b/ports/soci/CONTROL @@ -1,5 +1,6 @@ Source: soci -Version: 3.2.3-3 +Version: 3.2.3-4 +Homepage: https://github.com/SOCI/soci Description: SOCI database access library Feature: boost diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index 1ba4115ae..b70e43d3c 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( REF c15b178a44b99ed3ff7fd953837fb97f6314abb7 SHA512 037c44f29e80b5ec57046606b4672088917d469e9d2254e3e15253e170026cf0fe17e4f79a4b01df22fe7032708ca87354b1560d9880d4d165cdef869c3c6081 HEAD_REF master + PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Deduce-reference-in-boost-fusion-for_each.patch" + "${CMAKE_CURRENT_LIST_DIR}/0002-Find-PostgreSQL-debug-library.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC) diff --git a/ports/sol2/CONTROL b/ports/sol2/CONTROL index 9534432da..a43b1c7b4 100644 --- a/ports/sol2/CONTROL +++ b/ports/sol2/CONTROL @@ -1,4 +1,5 @@ Source: sol2 -Version: 2.20.4 +Version: 3.0.2 +Homepage: https://github.com/ThePhD/sol2 Description: Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great Build-Depends: lua (windows)
\ No newline at end of file diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake index 403e9e646..ee89b9f54 100644 --- a/ports/sol2/portfile.cmake +++ b/ports/sol2/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/sol2 - REF 7f1c2e3ecfc2b78e396c60e067f6486ae1df66c5 - SHA512 a7e84d3eca26fb3cd4eb73ce0daa2f6f41136e9e919f27713d2d903ec7793017dfd87e7c4fdf54b9ee9b601da1412dad02a191dd614661dfa96da521dfc58a65 + REF 5a4d7dca7f77e65aed15c0fb8f8acf1570677335 + SHA512 5fc88a000d7a8379c3c8d8ee2dc3371514c4a58dcc3340b700565278ec69b7be0f108d599e3fe3b3ca347ef7c5b25ac01d83b1a988ac0189c8517b6ae66e96d6 HEAD_REF develop ) diff --git a/ports/sophus/CONTROL b/ports/sophus/CONTROL index f6433e410..d3c81de77 100644 --- a/ports/sophus/CONTROL +++ b/ports/sophus/CONTROL @@ -1,4 +1,5 @@ Source: sophus -Version: 1.0.0-1 -Build-Depends: eigen3, ceres +Version: 1.0.0-6 +Build-Depends: eigen3, ceres, suitesparse +Homepage: https://github.com/strasdat/Sophus Description: Lie group library for C++ diff --git a/ports/sophus/fix_cmakelists.patch b/ports/sophus/fix_cmakelists.patch new file mode 100644 index 000000000..33916cf1d --- /dev/null +++ b/ports/sophus/fix_cmakelists.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fa51e2c..3e07396 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,7 @@ SET( Sophus_INCLUDE_DIR ${PROJECT_SOURCE_DIR} ) + + ################################################################################ + FIND_PACKAGE( Eigen3 REQUIRED ) ++FIND_PACKAGE( suitesparse REQUIRED ) + LIST( APPEND Sophus_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR} ) + + ################################################################################ diff --git a/ports/sophus/portfile.cmake b/ports/sophus/portfile.cmake index 9a45e62b8..c7480b904 100644 --- a/ports/sophus/portfile.cmake +++ b/ports/sophus/portfile.cmake @@ -3,9 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strasdat/Sophus - REF v1.0.0 + REF v1.0.0 SHA512 569634a8be9237d2240cf30c01e2677ece75d55f1196030f1228baca62fa22460e8ceb2a63bd46afdf7f02d8eb79c59d6ed666228b852da78590de897b278fab HEAD_REF master + PATCHES + fix_cmakelists.patch ) vcpkg_configure_cmake( @@ -14,14 +16,10 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Sophus") - +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sophus) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -# Put the license file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/Sophus/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/Sophus/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/Sophus/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright) diff --git a/ports/soundtouch/CONTROL b/ports/soundtouch/CONTROL index 012b7c9df..2e358f55e 100644 --- a/ports/soundtouch/CONTROL +++ b/ports/soundtouch/CONTROL @@ -1,4 +1,5 @@ Source: soundtouch
Version: 2.0.0-2
+Homepage: https://www.surina.net/soundtouch
Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.
Build-Depends: atlmfc
diff --git a/ports/span-lite/CONTROL b/ports/span-lite/CONTROL new file mode 100644 index 000000000..e7001a83a --- /dev/null +++ b/ports/span-lite/CONTROL @@ -0,0 +1,3 @@ +Source: span-lite
+Version: 0.5.0
+Description: A C++20-like span for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/span-lite/portfile.cmake b/ports/span-lite/portfile.cmake new file mode 100644 index 000000000..ad53591bd --- /dev/null +++ b/ports/span-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/span-lite
+ REF v0.5.0
+ SHA512 4221d9897736257077b8ff6a5246d70315bebb975a30a119778f22c1859d14cca5e3035447561ca9684bef6dbca5a00b3b5ca208dada4fcf1f3b31df2aa0cb1f
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DSPAN_LITE_OPT_BUILD_TESTS=OFF
+ -DSPAN_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL index 19b2aafbb..3ba32121c 100644 --- a/ports/spatialite-tools/CONTROL +++ b/ports/spatialite-tools/CONTROL @@ -1,4 +1,5 @@ Source: spatialite-tools Version: 4.3.0-1 +Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat diff --git a/ports/spdlog/CONTROL b/ports/spdlog/CONTROL index 801cd3697..aa5474709 100644 --- a/ports/spdlog/CONTROL +++ b/ports/spdlog/CONTROL @@ -1,4 +1,9 @@ Source: spdlog -Version: 1.3.1 +Version: 1.3.1-1 +Homepage: https://github.com/gabime/spdlog Description: Very fast, header only, C++ logging library Build-Depends: fmt + +Feature: benchmark +Description: Use google benchmark +Build-Depends: benchmark
\ No newline at end of file diff --git a/ports/spdlog/fix-feature-export.patch b/ports/spdlog/fix-feature-export.patch new file mode 100644 index 000000000..ad1239fd7 --- /dev/null +++ b/ports/spdlog/fix-feature-export.patch @@ -0,0 +1,14 @@ +diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt +index 3c4a3f9..3bc3813 100644 +--- a/bench/CMakeLists.txt ++++ b/bench/CMakeLists.txt +@@ -46,3 +46,8 @@ add_executable(formatter-bench formatter-bench.cpp) + target_link_libraries(formatter-bench PRIVATE benchmark::benchmark spdlog::spdlog Threads::Threads) + + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs") ++ ++install(TARGETS bench async_bench latency ++ RUNTIME DESTINATION tools/spdlog ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) +\ No newline at end of file diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 530e8b084..37cd8644f 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,5 +1,6 @@ #header-only library include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog @@ -8,19 +9,28 @@ vcpkg_from_github( HEAD_REF v1.x PATCHES disable-master-project-check.patch + fix-feature-export.patch ) +set(SPDLOG_USE_BENCHMARK OFF) +if("benchmark" IN_LIST FEATURES) + set(SPDLOG_USE_BENCHMARK ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DSPDLOG_FMT_EXTERNAL=ON + -DSPDLOG_BUILD_BENCH=${SPDLOG_USE_BENCHMARK} ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/spdlog) +vcpkg_copy_pdbs() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/spectra/CONTROL b/ports/spectra/CONTROL index a53636ce7..6aa712afd 100644 --- a/ports/spectra/CONTROL +++ b/ports/spectra/CONTROL @@ -1,4 +1,5 @@ Source: spectra
-Version: 0.7.0
-Description: A header-only C++ library for large scale eigenvalue problems https://spectralib.org
+Version: 0.8.0 +Description: A header-only C++ library for large scale eigenvalue problems
+Homepage: https://spectralib.org
Build-Depends: eigen3
diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake index 66765259a..94ac9b4d7 100644 --- a/ports/spectra/portfile.cmake +++ b/ports/spectra/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO yixuan/spectra
- REF v0.7.0
- SHA512 2a1cd9eed6cebabb551cc2f662d38d75c6b24edc8f19ee4feb122958653ecb4533b936447d36712225b48a4f1aa6590b17ca5076d78d506a515e8701752bf32d
+ REF v0.8.0 + SHA512 186bcd8efd5dc6cf0aa81b909184e056d1df1e55870c700f0ca060f504fa997e3ce27c3d15d7b4c74422e4d18bcbd471558392a89e307693b89cc1f480fecc71
HEAD_REF master
)
diff --git a/ports/speex/CONTROL b/ports/speex/CONTROL index 6fcda84be..3291927c2 100644 --- a/ports/speex/CONTROL +++ b/ports/speex/CONTROL @@ -1,3 +1,4 @@ Source: speex Version: 1.2.0-4 +Homepage: https://github.com/xiph/speex Description: Speex is an Open Source/Free Software patent-free audio compression format designed for speech. diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL index d7e8bac98..d96eb11c1 100644 --- a/ports/speexdsp/CONTROL +++ b/ports/speexdsp/CONTROL @@ -1,4 +1,5 @@ Source: speexdsp Version: 1.2rc3-2 +Homepage: https://ftp.osuosl.org/pub/xiph/releases/speex/ Description: A patent-free, Open Source/Free Software DSP library. Build-Depends: diff --git a/ports/spirit-po/CONTROL b/ports/spirit-po/CONTROL index eb3b319b7..e31bdcb2e 100644 --- a/ports/spirit-po/CONTROL +++ b/ports/spirit-po/CONTROL @@ -1,4 +1,5 @@ Source: spirit-po
Version: 1.1.2-1
+Homepage: https://github.com/cbeck88/spirit-po
Description: A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit.
Build-Depends: boost
diff --git a/ports/spirv-cross/CONTROL b/ports/spirv-cross/CONTROL index cfba267dd..665637d43 100644 --- a/ports/spirv-cross/CONTROL +++ b/ports/spirv-cross/CONTROL @@ -1,3 +1,3 @@ Source: spirv-cross
-Version: 2018-08-07-1
+Version: 2019-05-09
Description: SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.
diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake index 6495e82bc..f40c6b2de 100644 --- a/ports/spirv-cross/portfile.cmake +++ b/ports/spirv-cross/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Cross - REF 2018-08-07 - SHA512 1ac6ee6b2864d950199d4e856ae1576f9435827501baa5d53821a973cd68aaa03ec428094bf74c570784997baac5b2e3802ddc7f02844e2ee546741fa726bf91 + REF fce83b7e8b0f6599efd4481992b2eb30f69f21de + SHA512 24bdb965f0248b57081d314f078a522ef8da842ee5480e1276da7bc70cae002cfe7a58903f99d13bcdee1e3863f77dfcd5a74e084e63a9c20edf42a833b2a874 HEAD_REF master ) diff --git a/ports/spirv-tools/CONTROL b/ports/spirv-tools/CONTROL index 38995e356..b5f0c536a 100644 --- a/ports/spirv-tools/CONTROL +++ b/ports/spirv-tools/CONTROL @@ -1,4 +1,5 @@ Source: spirv-tools
Version: 2018.1-2
+Homepage: https://github.com/KhronosGroup/SPIRV-Tools
Description: API and commands for processing SPIR-V modules
Build-Depends: spirv-headers
diff --git a/ports/sqlite-modern-cpp/CONTROL b/ports/sqlite-modern-cpp/CONTROL index fde7c2eb1..c8e3ccb64 100644 --- a/ports/sqlite-modern-cpp/CONTROL +++ b/ports/sqlite-modern-cpp/CONTROL @@ -1,4 +1,5 @@ Source: sqlite-modern-cpp
-Version: 3.2-e2248fa
+Version: 3.2-936cd0c8
Build-Depends: sqlite3
+Homepage: https://github.com/aminroosta/sqlite_modern_cpp
Description: The C++14 wrapper around sqlite library
diff --git a/ports/sqlite-modern-cpp/portfile.cmake b/ports/sqlite-modern-cpp/portfile.cmake index d51dc0bd2..35b364dde 100644 --- a/ports/sqlite-modern-cpp/portfile.cmake +++ b/ports/sqlite-modern-cpp/portfile.cmake @@ -3,9 +3,9 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- REPO aminroosta/sqlite_modern_cpp
- REF e2248fae15c9e1a240f54d29a148e501f4ea2347
- SHA512 89f0ff234e5600ff5f51cb75934fa71d86b51f4e06f1cf4b7cffc0498985120877f8d58bbdbe02fc3cae212acc071a74cd5a3e44fdaf95c3aeaf79338f43fe9d
+ REPO SqliteModernCpp/sqlite_modern_cpp
+ REF 936cd0c86aacac87a3dab32906397944ae5f6c3d
+ SHA512 8ce1b7593fe77dcab297ab4cae0158b43d55b33c1823b2dc5bf22e5545d9781d675ba5ac82b81782f502b34d2335eee2c26167726746a61a0ad566b657d2faf0
HEAD_REF master
)
diff --git a/ports/sqlite-orm/CONTROL b/ports/sqlite-orm/CONTROL index 622e7b9c8..6382eeca0 100644 --- a/ports/sqlite-orm/CONTROL +++ b/ports/sqlite-orm/CONTROL @@ -1,4 +1,4 @@ Source: sqlite-orm -Version: 1.3 +Version: 1.3-1 Build-Depends: sqlite3 Description: SQLite ORM light header only library for modern C++ diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake index c7fcec417..6df00f77f 100644 --- a/ports/sqlite-orm/portfile.cmake +++ b/ports/sqlite-orm/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fnc12/sqlite_orm - REF 1.3 - SHA512 9d61d65a8987f875aacca9dd262d5b1e4dca273aef938fc5c292469b215b244edc63fb6428199e16ed6d254f752e1a9574306b15ebb099a4bf4f744510975da3 + REF v1.3 + SHA512 43adcd28bdca5d0165ca0313c5ff90e048144e4841541704f49e443deaf0d8e027655a3bb88677f3f3c62c5764fdda8b1e472d74e68f3a32cad052f3b4ed63a7 HEAD_REF master ) diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index a2f0aeb03..16f529daf 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -3,7 +3,13 @@ project(sqlite3 C) include_directories(.) if(BUILD_SHARED_LIBS) - set(API "-DSQLITE_API=__declspec(dllexport)") + if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(API "-DSQLITE_API=__attribute__((visibility(\"default\")))") + elseif(CMAKE_SYSTEM_NAME MATCHES "Windows") + set(API "-DSQLITE_API=__declspec(dllexport)") + else() + message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}") + endif() else() set(API "-DSQLITE_API=extern") endif() diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL index ab5f103fd..829b66254 100644 --- a/ports/sqlite3/CONTROL +++ b/ports/sqlite3/CONTROL @@ -1,5 +1,6 @@ Source: sqlite3 -Version: 3.27.2 +Version: 3.28.0-1 +Homepage: https://sqlite.org/ Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine. Feature: tool diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 789cfe948..131469c12 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions)
-set(SQLITE_VERSION 3270200)
-set(SQLITE_HASH f84a6a3101c989164f17b85a6c2674ae2728a75d70daf5e33627a6eaa399adaf763deb968d891ad0660f1ebe660d27fbd55ace379d807f3bb8af4e95c01b68c4)
+set(SQLITE_VERSION 3280000)
+set(SQLITE_HASH 6a2b9c0accd286b09d7e077393a627e22112ef11c76ff6a5896f5ff1a11eb62a8b2700f5a99eebda82df63b3968814ca460582aa4619852f96a899d2f59b9f8d)
vcpkg_download_distfile(ARCHIVE
URLS "https://sqlite.org/2019/sqlite-amalgamation-${SQLITE_VERSION}.zip"
diff --git a/ports/sqlitecpp/0001-Find-external-sqlite3.patch b/ports/sqlitecpp/0001-Find-external-sqlite3.patch index f9473ff53..a59df97ae 100644 --- a/ports/sqlitecpp/0001-Find-external-sqlite3.patch +++ b/ports/sqlitecpp/0001-Find-external-sqlite3.patch @@ -1,26 +1,14 @@ -From 495f0f8bf2caf158ffed78e479d68359f51289a2 Mon Sep 17 00:00:00 2001 -From: Stanislav Ershov <digital.stream.of.mind@gmail.com> -Date: Sat, 6 Jan 2018 11:26:55 +0300 -Subject: [PATCH] Find external sqlite3 - ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a3e492..f7e22a5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -193,7 +193,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME}) - ## Build provided copy of SQLite3 C library ## - - # TODO NOCOMMIT --#find_package(sqlite3) -+find_package(sqlite3 CONFIG) -+target_link_libraries(SQLiteCpp PRIVATE sqlite3) - #if(sqlite3_VERSION VERSION_LESS "3.19") - # set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") - #endif() --- -2.15.0.windows.1 - +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00e058c..489b884 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME})
+ ## Build provided copy of SQLite3 C library ##
+
+ # TODO
+-#find_package(sqlite3)
++find_package(sqlite3 CONFIG)
++target_link_libraries(SQLiteCpp PRIVATE sqlite3)
+ #if(sqlite3_VERSION VERSION_LESS "3.19")
+ # set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
+ #endif()
diff --git a/ports/sqlitecpp/CONTROL b/ports/sqlitecpp/CONTROL index 3374074d1..8d0fb047e 100644 --- a/ports/sqlitecpp/CONTROL +++ b/ports/sqlitecpp/CONTROL @@ -1,4 +1,5 @@ Source: sqlitecpp
-Version: 2.2-2
+Version: 2.3.0 Build-Depends: sqlite3
+Homepage: https://github.com/SRombauts/SQLiteCpp
Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.
diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index 6876bdf8c..b57573d73 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "SRombauts/SQLiteCpp" - REF "2.2.0" + REF 09dd10886c560ab5af41cfe694567f34c88cd101 HEAD_REF master - SHA512 769857c50cc24596cbd7c6f057ca1e158a3bfecf00d7865d6ef0b90a2ff8ecb9ccb9e1d0e660bb9df8ecd50075a94a9bc9e3a71b96f2ef1c30780c6da9446cf0) + SHA512 d0a440e2e96fca9aac7fe73d46bb6508825a82547dca1e9c93d8c3ca46878fa137e7a2a7a865bcfa641d0236e26307a3342d55fc83578552a37eec7565642d91 +) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL index bd5101f8f..282598dc5 100644 --- a/ports/sqlpp11/CONTROL +++ b/ports/sqlpp11/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11
-Version: 0.57-1
+Version: 0.58 Description: A type safe embedded domain specific language for SQL queries and results in C++.
Build-Depends: date
diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index be99572e3..a11d563d9 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rbock/sqlpp11
- REF 0.57
- SHA512 6bf48189f35cf2ff20b09e27ab83b6fb36415bed7e5c818c1ea2c9b30b5fe0a60c0f7e9930e92a0637c7b567ccfead4a9208a3aff99be89fed361778cf8c45f1
+ REF 0.58 + SHA512 c391e72638a748e0e25b53176dc371ba468bc14bdcb6dda2f2418c4ab4d620ebc5507ee284ff81c3104888d0d959703c6c91b55ccd69a8641b07dcb20cd56209
HEAD_REF master
PATCHES FixForMSVC.patch
)
diff --git a/ports/stb/CONTROL b/ports/stb/CONTROL index e052f09c4..ff7778020 100644 --- a/ports/stb/CONTROL +++ b/ports/stb/CONTROL @@ -1,3 +1,4 @@ Source: stb -Version: 2019-04-19 +Version: 2019-05-07 +Homepage: https://github.com/nothings/stb Description: stb single-file public domain libraries for C/C++ diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake index 8369bbb1f..0a0f2397b 100644 --- a/ports/stb/portfile.cmake +++ b/ports/stb/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nothings/stb - REF 2c2908f50515dcd939f24be261c3ccbcd277bb49 - SHA512 d039346a4117f230eba344e8fd45b55290026c6611ef9aab1a6f504d7207ae724c978062e85613dda05f96d3e1eb8ee04c78a289c142cad34bc7ef24e2cf8689 + REF 1034f5e5c4809ea0a7f4387e0cd37c5184de3cdd + SHA512 efc3deedd687615a6706b0d315ded8d76edb28fcd6726531956fde9bba81cc62f25df0a1f998b56e16ab0c62989687c7d5b58875789470c2bf7fd457b1ff6535 HEAD_REF master ) diff --git a/ports/stormlib/CONTROL b/ports/stormlib/CONTROL new file mode 100644 index 000000000..348e09616 --- /dev/null +++ b/ports/stormlib/CONTROL @@ -0,0 +1,4 @@ +Source: stormlib
+Version: 9.22
+Build-Depends: zlib, bzip2
+Description: StormLib is a library for opening and manipulating Blizzard MPQ files
diff --git a/ports/stormlib/disable-building-tests.patch b/ports/stormlib/disable-building-tests.patch new file mode 100644 index 000000000..fe0d7f70c --- /dev/null +++ b/ports/stormlib/disable-building-tests.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5211b1..4025ea1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -358,10 +358,4 @@ install(TARGETS ${LIBRARY_NAME} + + INCLUDE(CPack) + +-if(STORM_BUILD_TESTS) +- target_link_libraries(storm_test ${LIBRARY_NAME}) +- install(TARGETS storm_test DESTINATION bin) +-endif() + +-add_executable(storm_test ${SRC_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES} ${ZLIB_BZIP2_FILES} ${TEST_SRC_FILES}) +-install(TARGETS storm_test RUNTIME DESTINATION bin) diff --git a/ports/stormlib/portfile.cmake b/ports/stormlib/portfile.cmake new file mode 100644 index 000000000..82e0aedf9 --- /dev/null +++ b/ports/stormlib/portfile.cmake @@ -0,0 +1,24 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO ladislav-zezula/StormLib
+ REF v9.22
+ SHA512 e08571fca21be2e853d390b8feda32001df810b8f4b60d36822a9de2a877f2be9d3dadacfeec181a2eb80e00b8fed66d0dc9a0d8d9e043e2959478a41ed4d13a
+ HEAD_REF master
+)
+
+vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES
+ ${CMAKE_CURRENT_LIST_DIR}/disable-building-tests.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stormlib RENAME copyright)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/strict-variant/CONTROL b/ports/strict-variant/CONTROL index cc8af9ef0..598dd376c 100644 --- a/ports/strict-variant/CONTROL +++ b/ports/strict-variant/CONTROL @@ -1,3 +1,3 @@ Source: strict-variant -Version: v0.5 +Version: 0.5 Description: Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves. diff --git a/ports/strict-variant/portfile.cmake b/ports/strict-variant/portfile.cmake index ef0b34361..98108b9b1 100644 --- a/ports/strict-variant/portfile.cmake +++ b/ports/strict-variant/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cbeck88/strict-variant - REF 5ab330edcb5e3eea67fbedf8ac89648e5bc1e9a1 - SHA512 c80e5cd7cff389174447f5825af57ddea079956b2a4cb89337479e02289e89df19713ff031e914bdff2c823e8d2518311a1118701ae4e173f6557c770e553cd0 + REF 6378755e3c612cd870c2720232db1e5423dbbe73 + SHA512 45432caab51d42b86839f5ed194e79630ee5cbedd6e41eaadc10d28788ceb8c4629c0432ce888a5729266585e03cf4e6206c8ec66d1b1bc3d7d60220b3909f1d HEAD_REF master ) diff --git a/ports/string-theory/CONTROL b/ports/string-theory/CONTROL index 841f6abef..538b4a989 100644 --- a/ports/string-theory/CONTROL +++ b/ports/string-theory/CONTROL @@ -1,3 +1,4 @@ Source: string-theory -Version: 2.1 +Version: 2.1-1 +Homepage: https://github.com/zrax/string_theory Description: Flexible C++11 string library with type-safe formatting. diff --git a/ports/string-theory/portfile.cmake b/ports/string-theory/portfile.cmake index 3cfb24c92..002eae1b1 100644 --- a/ports/string-theory/portfile.cmake +++ b/ports/string-theory/portfile.cmake @@ -22,8 +22,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/string_theory") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/string_theory) file(RENAME ${CURRENT_PACKAGES_DIR}/share/string-theory ${CURRENT_PACKAGES_DIR}/share/string_theory) diff --git a/ports/string-view-lite/CONTROL b/ports/string-view-lite/CONTROL new file mode 100644 index 000000000..f14d36c97 --- /dev/null +++ b/ports/string-view-lite/CONTROL @@ -0,0 +1,3 @@ +Source: string-view-lite
+Version: 1.3.0
+Description: A C++17-like string_view for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/string-view-lite/portfile.cmake b/ports/string-view-lite/portfile.cmake new file mode 100644 index 000000000..068b16c08 --- /dev/null +++ b/ports/string-view-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/string-view-lite
+ REF v1.3.0
+ SHA512 52fb76198249ade5352d95af4a4e305b3e22b464a5d0a702e4b2228b1ca30df98b90bb01d5bfd16ae6ebb7bab5aecac5bd4a867898c362e82e57c2aaf938e07a
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DSTRING_VIEW_LITE_OPT_BUILD_TESTS=OFF
+ -DSTRING_VIEW_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/strtk/CONTROL b/ports/strtk/CONTROL index 861e148a7..0effa1bb0 100644 --- a/ports/strtk/CONTROL +++ b/ports/strtk/CONTROL @@ -1,4 +1,5 @@ Source: strtk Version: 2019-01-09 +Homepage: https://github.com/ArashPartow/strtk Description: robust, optimized and portable string processing algorithms for the C++ language Build-Depends: boost diff --git a/ports/suitesparse/CONTROL b/ports/suitesparse/CONTROL index 67b72bb49..82ee5e5e0 100644 --- a/ports/suitesparse/CONTROL +++ b/ports/suitesparse/CONTROL @@ -1,6 +1,7 @@ Source: suitesparse -Version: 5.1.2-1 +Version: 5.4.0-3 Build-Depends: clapack (!osx) +Homepage: http://faculty.cse.tamu.edu/davis/SuiteSparse Description: algebra library Feature: metis diff --git a/ports/suitesparse/fix-install-suitesparse.patch b/ports/suitesparse/fix-install-suitesparse.patch deleted file mode 100644 index a5b5400fa..000000000 --- a/ports/suitesparse/fix-install-suitesparse.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8227298..c0eb354 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -222,7 +222,7 @@ ELSE() - ENDIF() - ENDIF() - --IF(BUILD_METIS) -+IF(BUILD_METIS OR USE_VCPKG_METIS) - set(SuiteSparse_LINKER_METIS_LIBS "metis") - else() - set(SuiteSparse_LINKER_METIS_LIBS "") -diff --git a/SuiteSparse/CMakeLists.txt b/SuiteSparse/CMakeLists.txt -index 7361363..8a48cf3 100644 ---- a/SuiteSparse/CMakeLists.txt -+++ b/SuiteSparse/CMakeLists.txt -@@ -10,7 +10,11 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") - IF (BUILD_METIS) - INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") - ELSE (BUILD_METIS) -+ IF(USE_VCPKG_METIS) -+ INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") -+ ELSE (USE_VCPKG_METIS) - ADD_DEFINITIONS(-DNPARTITION) -+ ENDIF(USE_VCPKG_METIS) - ENDIF ( BUILD_METIS) - - # Disable COMPLEX numbers: disable it by default, since it causes problems in some platforms. diff --git a/ports/suitesparse/portfile.cmake b/ports/suitesparse/portfile.cmake index c823d0d93..8fb2c26b2 100644 --- a/ports/suitesparse/portfile.cmake +++ b/ports/suitesparse/portfile.cmake @@ -2,83 +2,67 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(SUITESPARSE_VER SuiteSparse-5.1.2) #if you change the version, becarefull of changing the SHA512 checksum accordingly +set(SUITESPARSE_VER 5.4.0) set(SUITESPARSEWIN_VER 1.4.0) -set(SUITESPARSEWIN_PATH ${CURRENT_BUILDTREES_DIR}/src/suitesparse-metis-for-windows-${SUITESPARSEWIN_VER}) -set(SUITESPARSE_PATH ${SUITESPARSEWIN_PATH}/Suitesparse) -#download suitesparse libary vcpkg_download_distfile(SUITESPARSE - URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/${SUITESPARSE_VER}.tar.gz" - FILENAME "${SUITESPARSE_VER}.tar.gz" - SHA512 38c7f9847cf161390f73de39ed3d9fd07f7bcec2d6d4e6f141af6a015826215843db9f2e16ca255eeb233c593ffc19ffa04816aa5b6ba200b55b9472ac33ba85 + URLS "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${SUITESPARSE_VER}.tar.gz" + FILENAME "SuiteSparse-${SUITESPARSE_VER}.tar.gz" + SHA512 8328bcc2ef5eb03febf91b9c71159f091ff405c1ba7522e53714120fcf857ceab2d2ecf8bf9a2e1fc45e1a934665a341e3a47f954f87b59934f4fce6164775d6 ) -#download suitesparse-metis-for-windows scripts, suitesparse does not have CMake build system, jlblancoc has made one for it -vcpkg_download_distfile(SUITESPARSEWIN - URLS "https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/v${SUITESPARSEWIN_VER}.zip" - FILENAME "suitesparse-metis-for-windows-${SUITESPARSEWIN_VER}.zip" - SHA512 2859d534200ab9b76fca1530eae5de2f9328aa867c727dbc83a96c6f16e1f87e70123fb2decbb84531d75dac58b6f0ce7323e48c57aeede324fd9a1f77ba74c6 +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${SUITESPARSE} ) -#extract suitesparse-metis-for-windows first and merge with suitesparse library -vcpkg_extract_source_archive(${SUITESPARSEWIN}) -vcpkg_extract_source_archive(${SUITESPARSE} ${SUITESPARSEWIN_PATH}) - -vcpkg_apply_patches( - SOURCE_PATH ${SUITESPARSEWIN_PATH} +vcpkg_from_github( + OUT_SOURCE_PATH SUITESPARSEWIN_SOURCE_PATH + REPO jlblancoc/suitesparse-metis-for-windows + REF v${SUITESPARSEWIN_VER} + SHA512 35a2563d6e33ebe8157f8d023167abd8d2512e2a627b8dbea798c59afefc56b8f01c7d10553529b03a7b4759e200ca82bb26ebce5cefce6983ffb057a8622162 + HEAD_REF master PATCHES - remove-debug-postfix.patch + suitesparse.patch ) +# Copy suitesparse sources. +message(STATUS "Copying SuiteSparse source files...") +# Should probably remove everything but CMakeLists.txt files? +file(GLOB SUITESPARSE_SOURCE_FILES ${SOURCE_PATH}/*) +foreach(SOURCE_FILE ${SUITESPARSE_SOURCE_FILES}) + file(COPY ${SOURCE_FILE} DESTINATION "${SUITESPARSEWIN_SOURCE_PATH}/SuiteSparse") +endforeach() +message(STATUS "Copying SuiteSparse source files... done") +message(STATUS "Removing integrated lapack and metis libs...") +file(REMOVE_RECURSE ${SUITESPARSEWIN_SOURCE_PATH}/lapack_windows) +file(REMOVE_RECURSE ${SUITESPARSEWIN_SOURCE_PATH}/metis) +message(STATUS "Removing integrated lapack and metis libs... done") + set(USE_VCPKG_METIS OFF) if("metis" IN_LIST FEATURES) set(USE_VCPKG_METIS ON) + set(ADDITIONAL_BUILD_OPTIONS "-DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR}") endif() -if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(LIB_EXT a) - set(LIB_PREFIX lib) -else() - set(LIB_EXT lib) - set(LIB_PREFIX) -endif() - -if(WIN32) - set(ENABLE_CUSTOM_BLAS_LAPACK_PATHS "-DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON") - set(SUITESPARSE_CUSTOM_BLAS_PATH "-DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/openblas.lib") - set(SUITESPARSE_CUSTOM_LAPACK_PATH "-DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/lapack.lib") -endif() - -message(STATUS "Use CMakeLists.txt in ${SUITESPARSEWIN_PATH}") vcpkg_configure_cmake( - SOURCE_PATH ${SUITESPARSEWIN_PATH} + SOURCE_PATH ${SUITESPARSEWIN_SOURCE_PATH} PREFER_NINJA OPTIONS -DBUILD_METIS=OFF -DUSE_VCPKG_METIS=${USE_VCPKG_METIS} - -DMETIS_SOURCE_DIR=${CURRENT_INSTALLED_DIR} - -DSUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS=ON + ${ADDITIONAL_BUILD_OPTIONS} OPTIONS_DEBUG - -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug - -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/${LIB_PREFIX}openblas_d.${LIB_EXT} - -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/${LIB_PREFIX}lapack.${LIB_EXT} + -DSUITESPARSE_INSTALL_PREFIX="${CURRENT_PACKAGES_DIR}/debug" OPTIONS_RELEASE - -DSUITESPARSE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} - -DSUITESPARSE_CUSTOM_BLAS_LIB=${CURRENT_INSTALLED_DIR}/lib/${LIB_PREFIX}openblas.${LIB_EXT} - -DSUITESPARSE_CUSTOM_LAPACK_LIB=${CURRENT_INSTALLED_DIR}/lib/${LIB_PREFIX}lapack.${LIB_EXT} + -DSUITESPARSE_INSTALL_PREFIX="${CURRENT_PACKAGES_DIR}" ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/suitesparse-${SUITESPARSE_VER}) -#clean folders file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright of suitesparse and suitesparse-metis-for-windows -file(COPY ${SUITESPARSE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright) - -file(COPY ${SUITESPARSEWIN_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/suitesparse/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/suitesparse/copyright_suitesparse-metis-for-windows) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse RENAME copyright) +file(INSTALL ${SUITESPARSEWIN_SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/suitesparse RENAME copyright_suitesparse-metis-for-windows) diff --git a/ports/suitesparse/remove-debug-postfix.patch b/ports/suitesparse/remove-debug-postfix.patch deleted file mode 100644 index 1b41139da..000000000 --- a/ports/suitesparse/remove-debug-postfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt Mon Feb 22 22:18:25 2016 -+++ CMakeLists.txt Wed Jul 05 14:14:21 2017 -@@ -35,7 +35,7 @@ - - # We want libraries to be named "libXXX" and "libXXXd" in all compilers: - # ------------------------------------------------------------------------ --set(CMAKE_DEBUG_POSTFIX "d") -+#set(CMAKE_DEBUG_POSTFIX "d") - IF(MSVC) - set(SP_LIB_PREFIX "lib") # Libs are: "libXXX" - ENDIF(MSVC) diff --git a/ports/suitesparse/suitesparse.patch b/ports/suitesparse/suitesparse.patch new file mode 100644 index 000000000..e26a5b8cb --- /dev/null +++ b/ports/suitesparse/suitesparse.patch @@ -0,0 +1,150 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3486f05..b8c2e63 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,68 +191,14 @@ if(WITH_CUDA) + ENDIF(${CUDA_FOUND}) + endif() + +-find_package(BLAS) +-find_package(LAPACK) +-if (LAPACK_FOUND AND BLAS_FOUND) ++find_package(BLAS REQUIRED) ++find_package(LAPACK REQUIRED) ++if(LAPACK_FOUND AND BLAS_FOUND) + message(STATUS "found lapack and blas config file. Linking targets lapack and blas") + set(SuiteSparse_LINKER_LAPACK_BLAS_LIBS ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) +-else () # LAPACK is not found +- +-## Need to use SuiteSparse_LINKER_LAPACK_BLAS_LIBS in our subproject in case of SHARED flag is set to ON +-SET(SUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS OFF CACHE BOOL "Check if you have custom LAPACK/BLAS libraries (AMD,...)") +-IF (SUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS) +- SET(SUITESPARSE_CUSTOM_BLAS_LIB "" CACHE FILE "Path to custom library file for BLAS") +- SET(SUITESPARSE_CUSTOM_LAPACK_LIB "" CACHE FILE "Path to custom library file for LAPACK") +- IF (NOT EXISTS "${SUITESPARSE_CUSTOM_BLAS_LIB}" OR NOT EXISTS "${SUITESPARSE_CUSTOM_LAPACK_LIB}") +- MESSAGE("*Error*: Correctly set SUITESPARSE_CUSTOM_BLAS_LIB and SUITESPARSE_CUSTOM_LAPACK_LIB or uncheck SUITESPARSE_USE_CUSTOM_BLAS_LAPACK_LIBS") +- ELSE() +- SET(SuiteSparse_LINKER_LAPACK_BLAS_LIBS ${SUITESPARSE_CUSTOM_BLAS_LIB} ${SUITESPARSE_CUSTOM_LAPACK_LIB}) +- ENDIF() +-ELSE() +- IF (UNIX) +- SET(SuiteSparse_LINKER_LAPACK_BLAS_LIBS lapack blas rt) +- ELSE() +- IF(CMAKE_SIZEOF_VOID_P EQUAL 8) # Size in bytes! +- set(PATH_WORD_SIZE "x64") +- ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8) # Size in bytes! +- set(PATH_WORD_SIZE "x32") +- ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8) +- +- add_library(blas SHARED IMPORTED) +- set_property(TARGET blas PROPERTY IMPORTED_LOCATION ${SuiteSparseProject_SOURCE_DIR}/lapack_windows/${PATH_WORD_SIZE}/libblas.dll) +- set_property(TARGET blas PROPERTY IMPORTED_IMPLIB ${SuiteSparseProject_SOURCE_DIR}/lapack_windows/${PATH_WORD_SIZE}/libblas.lib) +- +- add_library(lapack SHARED IMPORTED) +- set_property(TARGET lapack PROPERTY IMPORTED_LOCATION ${SuiteSparseProject_SOURCE_DIR}/lapack_windows/${PATH_WORD_SIZE}/liblapack.dll) +- set_property(TARGET lapack PROPERTY IMPORTED_IMPLIB ${SuiteSparseProject_SOURCE_DIR}/lapack_windows/${PATH_WORD_SIZE}/liblapack.lib) +- +- SET(SuiteSparse_LINKER_LAPACK_BLAS_LIBS blas lapack) +- +- ## install lapack and blas dependencies +- file(GLOB lapack_blas_windows_libs "${CMAKE_SOURCE_DIR}/lapack_windows/${PATH_WORD_SIZE}/*.lib") +- file(GLOB lapack_blas_windows_dll "${CMAKE_SOURCE_DIR}/lapack_windows/${PATH_WORD_SIZE}/*.dll") +- if(lapack_blas_windows_dll AND lapack_blas_windows_libs) +- set(SuiteSparse_LAPACK_BLAS_LIB_DIR "lib${LIB_POSTFIX}/lapack_blas_windows") +- install(FILES ${lapack_blas_windows_libs} +- ${lapack_blas_windows_dll} +- DESTINATION ${SuiteSparse_LAPACK_BLAS_LIB_DIR} +- ) +- endif() +- ENDIF() +-ENDIF() +-ENDIF() # LAPACK found +- +-if(SuiteSparse_LAPACK_BLAS_LIB_DIR) # "Export" the imported targets in config.cmake manually +- set(ExternConfig "add_library(blas SHARED IMPORTED) +- set_property(TARGET blas PROPERTY IMPORTED_LOCATION \${_SuiteSparse_PREFIX}/${SuiteSparse_LAPACK_BLAS_LIB_DIR}/libblas.dll) +- set_property(TARGET blas PROPERTY IMPORTED_IMPLIB \${_SuiteSparse_PREFIX}/${SuiteSparse_LAPACK_BLAS_LIB_DIR}/libblas.lib) +- +- add_library(lapack SHARED IMPORTED) +- set_property(TARGET lapack PROPERTY IMPORTED_LOCATION \${_SuiteSparse_PREFIX}/${SuiteSparse_LAPACK_BLAS_LIB_DIR}/liblapack.dll) +- set_property(TARGET lapack PROPERTY IMPORTED_IMPLIB \${_SuiteSparse_PREFIX}/${SuiteSparse_LAPACK_BLAS_LIB_DIR}/liblapack.lib)") +-endif() ++endif() # LAPACK is not found + +-IF(BUILD_METIS) ++IF(BUILD_METIS OR USE_VCPKG_METIS) + set(SuiteSparse_LINKER_METIS_LIBS "metis") + ## namespaced library target for config + set(SuiteSparse_EXPORTED_METIS_LIBS "SuiteSparse::metis") +@@ -311,7 +257,7 @@ configure_file(cmake/SuiteSparse-config-install.cmake.in + ## do the EXPORT for allowing other project to easily use suitesparse with cmake + install(EXPORT SuiteSparseTargets + FILE +- SuiteSparse-targets.cmake ++ suitesparse-targets.cmake + NAMESPACE + SuiteSparse:: + DESTINATION +diff --git a/SuiteSparse/CHOLMOD/Include/cholmod_blas.h b/SuiteSparse/CHOLMOD/Include/cholmod_blas.h +index aef3e63..907512b 100644 +--- a/SuiteSparse/CHOLMOD/Include/cholmod_blas.h ++++ b/SuiteSparse/CHOLMOD/Include/cholmod_blas.h +@@ -27,6 +27,7 @@ + #elif defined (__linux) || defined (MGLNX86) || defined (ARCH_GLNX86) + #define CHOLMOD_LINUX + #define CHOLMOD_ARCHITECTURE "Linux" ++#define BLAS_NO_UNDERSCORE + + #elif defined (__APPLE__) + #define CHOLMOD_MAC +diff --git a/SuiteSparse/CMakeLists.txt b/SuiteSparse/CMakeLists.txt +index c6e2834..5ef08a6 100644 +--- a/SuiteSparse/CMakeLists.txt ++++ b/SuiteSparse/CMakeLists.txt +@@ -12,11 +12,11 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") + ENDIF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_BUILD_TYPE MATCHES "Debug") + + # Global flags: +-IF (BUILD_METIS) ++IF (BUILD_METIS OR USE_VCPKG_METIS) + INCLUDE_DIRECTORIES("${METIS_SOURCE_DIR}/include") +-ELSE (BUILD_METIS) ++ELSE () + ADD_DEFINITIONS(-DNPARTITION) +-ENDIF ( BUILD_METIS) ++ENDIF () + + # Disable COMPLEX numbers: disable it by default, since it causes problems in some platforms. + SET(HAVE_COMPLEX OFF CACHE BOOL "Enables building SuiteSparse with complex numbers (disabled by default to avoid problems in some platforms)") +diff --git a/cmake/SuiteSparse-config-install.cmake.in b/cmake/SuiteSparse-config-install.cmake.in +index cb1f51f..49387b8 100644 +--- a/cmake/SuiteSparse-config-install.cmake.in ++++ b/cmake/SuiteSparse-config-install.cmake.in +@@ -4,13 +4,10 @@ get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_SELF_DIR}" PATH) + get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) + get_filename_component(_SuiteSparse_PREFIX "${_SuiteSparse_PREFIX}" PATH) + +-find_package(LAPACK CONFIG) +-if (NOT LAPACK_FOUND) # Load the LAPACK package with which we were built. +- @ExternConfig@ +-endif () ++find_package(LAPACK REQUIRED) + + # Load targets from the install tree. +-include(${_SuiteSparse_SELF_DIR}/SuiteSparse-targets.cmake) ++include(${_SuiteSparse_SELF_DIR}/suitesparse-targets.cmake) + + # Report SuiteSparse header search locations. + set(SuiteSparse_INCLUDE_DIRS ${_SuiteSparse_PREFIX}/include) +@@ -31,6 +28,11 @@ set(SuiteSparse_LIBRARIES + SuiteSparse::spqr + @SuiteSparse_EXPORTED_METIS_LIBS@ + ) ++set(SUITESPARSE_LIBRARIES ${SuiteSparse_LIBRARIES}) + + unset(_SuiteSparse_PREFIX) + unset(_SuiteSparse_SELF_DIR) ++ ++set(SUITESPARSE_FOUND TRUE) ++set(SuiteSparse_FOUND TRUE) ++ diff --git a/ports/sundials/CONTROL b/ports/sundials/CONTROL index 7651993bf..dc6955d40 100644 --- a/ports/sundials/CONTROL +++ b/ports/sundials/CONTROL @@ -1,3 +1,4 @@ Source: sundials Version: 3.1.1 +Homepage: https://computation.llnl.gov/projects/sundials Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers) diff --git a/ports/systemc/CONTROL b/ports/systemc/CONTROL index 488a06338..4f1bd67d9 100644 --- a/ports/systemc/CONTROL +++ b/ports/systemc/CONTROL @@ -1,3 +1,3 @@ Source: systemc
-Version: 2.3.3-2
+Version: 2.3.3-3
Description: A set of C++ classes and macros which provide an event-driven simulation kernel in C++
diff --git a/ports/systemc/install.patch b/ports/systemc/install.patch index d335a8b18..ef133a14f 100644 --- a/ports/systemc/install.patch +++ b/ports/systemc/install.patch @@ -1,23 +1,31 @@ ---- CMakeLists.txt Sat Oct 13 00:19:07 2018
-+++ CMakeLists.txt.fixed Mon Jan 28 15:51:38 2019
-@@ -555,7 +555,7 @@
- endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-
- # Set the installation paths for headers, libraries, and documentation.
--set (CMAKE_INSTALL_DOCDIR "share/doc/systemc" CACHE PATH
-+set (CMAKE_INSTALL_DOCDIR "share/systemc" CACHE PATH
- "Documentation installation directory") # otherwise mixed-case
- if (INSTALL_TO_LIB_BUILD_TYPE_DIR)
- # Install libraries to lib-${CMAKE_BUILD_TYPE} so that different build variants
-@@ -589,9 +589,9 @@
- set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH
- "CMake package configuration installation directory" FORCE)
- else (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)
-- set (SystemCLanguage_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCLanguage CACHE PATH
-+ set (SystemCLanguage_INSTALL_CMAKEDIR share/SystemCLanguage CACHE PATH
- "CMake package configuration installation directory for the SystemCLanguage package.")
-- set (SystemCTLM_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCTLM CACHE PATH
-+ set (SystemCTLM_INSTALL_CMAKEDIR share/SystemCTLM CACHE PATH
- "CMake package configuration installation directory for the SystemCTLM package.")
- endif (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)
- mark_as_advanced(SystemCLanguage_INSTALL_CMAKEDIR SystemCTLM_INSTALL_CMAKEDIR)
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7815ae..86d79d1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -555,7 +555,7 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + + # Set the installation paths for headers, libraries, and documentation. +-set (CMAKE_INSTALL_DOCDIR "share/doc/systemc" CACHE PATH ++set (CMAKE_INSTALL_DOCDIR "share/systemc/doc" CACHE PATH + "Documentation installation directory") # otherwise mixed-case + if (INSTALL_TO_LIB_BUILD_TYPE_DIR) + # Install libraries to lib-${CMAKE_BUILD_TYPE} so that different build variants +@@ -584,14 +584,14 @@ if (INSTALL_LIB_TARGET_ARCH_SYMLINK AND CMAKE_HOST_UNIX) + endif (INSTALL_LIB_TARGET_ARCH_SYMLINK AND CMAKE_HOST_UNIX) + + if (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) +- set (SystemCLanguage_INSTALL_CMAKEDIR share/cmake/SystemCLanguage CACHE PATH ++ set (SystemCLanguage_INSTALL_CMAKEDIR lib/cmake/SystemCLanguage CACHE PATH + "CMake package configuration installation directory" FORCE) + set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH + "CMake package configuration installation directory" FORCE) + else (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) +- set (SystemCLanguage_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCLanguage CACHE PATH ++ set (SystemCLanguage_INSTALL_CMAKEDIR lib/cmake/SystemCLanguage CACHE PATH + "CMake package configuration installation directory for the SystemCLanguage package.") +- set (SystemCTLM_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCTLM CACHE PATH ++ set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH + "CMake package configuration installation directory for the SystemCTLM package.") + endif (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR) + mark_as_advanced(SystemCLanguage_INSTALL_CMAKEDIR SystemCTLM_INSTALL_CMAKEDIR) diff --git a/ports/systemc/portfile.cmake b/ports/systemc/portfile.cmake index 0165b8270..8ecb7e8fb 100644 --- a/ports/systemc/portfile.cmake +++ b/ports/systemc/portfile.cmake @@ -26,16 +26,11 @@ vcpkg_configure_cmake( )
vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SystemCLanguage TARGET_PATH share/systemclanguage)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/SystemCTLM TARGET_PATH share/systemctlm)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCLanguage TARGET_PATH share/SystemCLanguage)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCTLM TARGET_PATH share/SystemCTLM)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/sysc/packages/qt/time)
-# Post-build test for cmake libraries (disabled for now due to issues with vcpkg_test_cmake)
-#vcpkg_test_cmake(PACKAGE_NAME SystemCLanguage)
-#vcpkg_test_cmake(PACKAGE_NAME SystemCTLM)
+file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright)
diff --git a/ports/szip/CONTROL b/ports/szip/CONTROL index 79a99911d..ac60f1a9d 100644 --- a/ports/szip/CONTROL +++ b/ports/szip/CONTROL @@ -1,3 +1,4 @@ Source: szip -Version: 2.1.1-3 +Version: 2.1.1-4 +Homepage: https://support.hdfgroup.org/ftp/lib-external/szip Description: Szip compression software, providing lossless compression of scientific data diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index fa10d58a2..047abf392 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -24,8 +24,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/szip) +vcpkg_fixup_cmake_targets() file(RENAME ${CURRENT_PACKAGES_DIR}/share/szip/data/COPYING ${CURRENT_PACKAGES_DIR}/share/szip/copyright) diff --git a/ports/tacopie/CONTROL b/ports/tacopie/CONTROL index 47493a022..a800a26be 100644 --- a/ports/tacopie/CONTROL +++ b/ports/tacopie/CONTROL @@ -1,3 +1,4 @@ Source: tacopie
Version: 3.2.0-1
+Homepage: https://github.com/Cylix/tacopie
Description: Tacopie is a TCP Client & Server C++11 library
diff --git a/ports/taglib/CONTROL b/ports/taglib/CONTROL index cc5fdb0f7..9756e8e8c 100644 --- a/ports/taglib/CONTROL +++ b/ports/taglib/CONTROL @@ -1,4 +1,5 @@ Source: taglib -Version: 1.11.1-4 +Version: 1.11.1-20190531 Description: TagLib Audio Meta-Data Library +Homepage: https://github.com/taglib/taglib Build-Depends: zlib diff --git a/ports/taglib/portfile.cmake b/ports/taglib/portfile.cmake index c90d16ca8..4ccb6a9fe 100644 --- a/ports/taglib/portfile.cmake +++ b/ports/taglib/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taglib/taglib - REF 662f340f933077a926de443c9882f483973570e3 - SHA512 34087f77bb099f1f8ec82926a212a562bf589fc13f54eac50a56730c4411af2f4dbf1b7d09877087899048c3070325aea02297c6a94d0ad43fbf6742363dd2b6 + REF ba7adc2bc261ed634c2a964185bcffb9365ad2f4 + SHA512 faf516f40f12031a37414ce9246ec409e64e570faebe2d604afdefbb7d665e0a0c9c68bec0e6dcb1c5ceb8fa8e1c3477f5ac75029f17beedd679fa3ea735ce6d HEAD_REF master ) diff --git a/ports/taocpp-json/CONTROL b/ports/taocpp-json/CONTROL index a2fe6d08e..e3f90f461 100644 --- a/ports/taocpp-json/CONTROL +++ b/ports/taocpp-json/CONTROL @@ -1,3 +1,3 @@ Source: taocpp-json
-Version: 2019-04-29-1
+Version: 2019-05-08 Description: C++ header-only JSON library
diff --git a/ports/taocpp-json/portfile.cmake b/ports/taocpp-json/portfile.cmake index 165bbff31..3e6c19f1e 100644 --- a/ports/taocpp-json/portfile.cmake +++ b/ports/taocpp-json/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO taocpp/json
- REF 8520fca2a054be775e406eaec66f33f02a7076e3
- SHA512 44bfd0252ed42d2619ca65e92d0f483895fd735b98a81e7f844526f78893a8624133ba356ad41f8c691571bf9f56823f62bfc0f294394e6e0f780b44a0b085fd
+ REF 6adce3b8e55c16e25b22ec0e33348eefa6aa4533 + SHA512 078af33eed0bae7671f31a010ba19088d07ac4f78b834bc7565562ee75199e90338dfd450a1d592c4f4ae58eddb3a26018b571381099d22dfc7d3c4143911390
HEAD_REF master
)
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index 4c47458bc..e3ae78936 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,3 +1,4 @@ Source: tbb -Version: 2019_U5-1 +Version: 2019_U7 +Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 201b6f53d..119916757 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -6,9 +6,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO 01org/tbb - REF 2019_U5 - SHA512 227b12e3864fbb922ddbc99700bf94d7d8897d62e2056bf3beb608efacf3ca785dd416b94ad65b421b6c9fc11caff688147b5fbe400c51e98678cee5dc04f274 + REPO intel/tbb + REF 4233fef583b4f8cbf9f781311717600feaaa0694 + SHA512 6eb239f16e0ecacb825264869aafad7fb39aa1b1f8a3c03c92344c4255d1c1a34ca0a47a366c471fd2da808f3be14262c7e2305294677f2f490c1a48f6f76ec3 HEAD_REF tbb_2019 ) diff --git a/ports/tclap/CONTROL b/ports/tclap/CONTROL index e4276ca03..652593d40 100644 --- a/ports/tclap/CONTROL +++ b/ports/tclap/CONTROL @@ -1,3 +1,4 @@ Source: tclap Version: 1.2.2 +Homepage: https://sourceforge.net/projects/tclap/ Description: Templatized command-line argument parser for C++ diff --git a/ports/telnetpp/CONTROL b/ports/telnetpp/CONTROL index 27ebdb31b..563a12f56 100644 --- a/ports/telnetpp/CONTROL +++ b/ports/telnetpp/CONTROL @@ -1,4 +1,5 @@ Source: telnetpp
Version: 1.2.4-1
+Homepage: https://github.com/KazDragon/telnetpp
Description: Telnet++ is an implementation of the Telnet Session Layer protocol using C++14
Build-Depends: boost, gtest, zlib
diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index 7bb758e6e..df6e60fec 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,4 +1,5 @@ Source: tesseract
-Version: 4.0.0-1
+Version: 4.0.0-3
+Homepage: https://github.com/tesseract-ocr/tesseract
Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
Build-Depends: leptonica, icu
diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 0c783d78e..18b63cab6 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -8,14 +8,10 @@ vcpkg_from_github( REF 4.0.0 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/use-vcpkg-icu.patch - ${CMAKE_CURRENT_LIST_DIR}/ws2-32.patch - ${CMAKE_CURRENT_LIST_DIR}/leptonica.patch + use-vcpkg-icu.patch + ws2-32.patch + leptonica.patch ) # The built-in cmake FindICU is better @@ -31,7 +27,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake") +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) # Install tool file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/tesseract) diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake index e87bfaaa9..dd326c9ae 100644 --- a/ports/tgui/portfile.cmake +++ b/ports/tgui/portfile.cmake @@ -36,15 +36,15 @@ vcpkg_copy_pdbs() if(BUILD_GUI_BUILDER)
set(EXECUTABLE_SUFFIX "")
- if (WIN32)
+ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(EXECUTABLE_SUFFIX ".exe")
endif()
message(STATUS "Check for: ${TGUI_SHARE_PATH}/gui-builder/gui-builder${EXECUTABLE_SUFFIX}")
if(EXISTS "${TGUI_SHARE_PATH}/gui-builder/gui-builder${EXECUTABLE_SUFFIX}")
file(MAKE_DIRECTORY "${TGUI_TOOLS_PATH}")
- file(RENAME
- "${TGUI_SHARE_PATH}/gui-builder/gui-builder${EXECUTABLE_SUFFIX}"
+ file(RENAME
+ "${TGUI_SHARE_PATH}/gui-builder/gui-builder${EXECUTABLE_SUFFIX}"
"${TGUI_TOOLS_PATH}/gui-builder${EXECUTABLE_SUFFIX}")
# Need to copy `resources` and `themes` directories
file(COPY "${TGUI_SHARE_PATH}/gui-builder/resources" DESTINATION "${TGUI_TOOLS_PATH}")
diff --git a/ports/theia/CONTROL b/ports/theia/CONTROL index 7cfd81e60..2d527adcd 100644 --- a/ports/theia/CONTROL +++ b/ports/theia/CONTROL @@ -1,4 +1,5 @@ -Source: theia
-Version: 0.7-d15154a-4
-Build-Depends: flann, cereal, ceres[suitesparse] (!x86&!uwp&!arm&!linux&!osx), openimageio, glew, freeglut
-Description: An open source library for multiview geometry and structure from motion
+Source: theia +Version: 0.8-2 +Build-Depends: flann, cereal, ceres[suitesparse], openimageio, glew, freeglut (!osx) +Homepage: https://github.com/sweeneychris/TheiaSfM +Description: An open source library for multiview geometry and structure from motion diff --git a/ports/theia/fix-cmakelists.patch b/ports/theia/fix-cmakelists.patch deleted file mode 100644 index 674543c68..000000000 --- a/ports/theia/fix-cmakelists.patch +++ /dev/null @@ -1,310 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c1b150..367fbbc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -218,24 +218,71 @@ include_directories( - # as system headers. - include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS}) - -+ -+set(THEIA_USE_EXTERNAL_CEREAL OFF CACHE BOOL "Use a system Cereal library") -+set(THEIA_USE_EXTERNAL_FLANN OFF CACHE BOOL "Use a system Flann library") -+ - # build Third party libraries included in distro. --add_subdirectory(libraries) --include_directories( -- libraries -- libraries/spectra -- ${akaze_SOURCE_DIR} -- ${akaze_INCLUDE_DIR} -- ${cereal_SOURCE_DIR} -- ${cereal_SOURCE_DIR}/include -- ${flann_SOURCE_DIR} -- ${flann_SOURCE_DIR}/src/cpp -- ${gtest_SOURCE_DIR}/include -- ${gtest_SOURCE_DIR} -- ${optimo_SOURCE_DIR} -- ${statx_SOURCE_DIR} -- ${stlplus3_SOURCE_DIR} -- ${vlfeat_SOURCE_DIR} -- ${visual_sfm_SOURCE_DIR}) -+if (BUILD_TESTING) -+ add_subdirectory(libraries/gtest) -+endif (BUILD_TESTING) -+ -+# AKAZE feature extractor. -+add_subdirectory(libraries/akaze) -+ -+include_directories(${akaze_SOURCE_DIR} ${akaze_INCLUDE_DIR}) -+ -+# Cereal for portable IO. -+if(NOT THEIA_USE_EXTERNAL_CEREAL) -+ add_subdirectory(libraries/cereal) -+ -+ include_directories(${cereal_SOURCE_DIR} ${cereal_SOURCE_DIR}/include) -+ set(THEIA_INTERNAL_CEREAL_LIB ${THEIA_INTERNAL_LIB_PREFIX}/cereal ${THEIA_INTERNAL_LIB_PREFIX}/cereal/include) -+else() -+ find_package(cereal REQUIRED) -+ -+ set(_THEIA_CEREAL_LIBRARIES cereal) -+endif() -+ -+# Flann for fast approximate nearest neighbor searches. -+if(NOT THEIA_USE_EXTERNAL_FLANN) -+ add_subdirectory(libraries/flann) -+ -+ include_directories(${flann_SOURCE_DIR} ${flann_SOURCE_DIR}/src/cpp) -+ set(_THEIA_FLANN_LIBRARIES flann_cpp) -+ set(THEIA_INTERNAL_FLANN_LIB ${THEIA_INTERNAL_LIB_PREFIX}/flann) -+else() -+ find_package(Flann REQUIRED) -+ -+ include_directories(${FLANN_INCLUDE_DIR}) -+ set(_THEIA_FLANN_LIBRARIES ${FLANN_LIBRARY}) -+endif() -+ -+# Add Optimo. -+add_subdirectory(libraries/optimo) -+include_directories(${optimo_SOURCE_DIR}) -+ -+# Add Spectra. -+include_directories(libraries/spectra) -+ -+# Add Statx. -+add_subdirectory(libraries/statx) -+include_directories(${statx_SOURCE_DIR}) -+ -+# STLPlus for filepath tools. -+add_subdirectory(libraries/stlplus3) -+include_directories(${stlplus3_SOURCE_DIR}) -+ -+# Add VLFeat. -+add_subdirectory(libraries/vlfeat) -+include_directories(${vlfeat_SOURCE_DIR}) -+ -+# Add VisualSfM files. -+add_subdirectory(libraries/visual_sfm) -+include_directories(${visual_sfm_SOURCE_DIR}) -+ -+include_directories(libraries) -+ - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") - include(OptimizeTheiaCompilerFlags) -@@ -260,7 +307,19 @@ install(FILES ${THEIA_HDRS} DESTINATION include/theia) - file(GLOB_RECURSE THEIA_INTERNAL_HDRS ${CMAKE_SOURCE_DIR}/src/theia/*.h) - install(DIRECTORY src/theia/ DESTINATION include/theia FILES_MATCHING PATTERN "*.h") - --install(DIRECTORY libraries/ DESTINATION include/theia/libraries FILES_MATCHING PATTERN "*.h*") -+install(DIRECTORY libraries/akaze/ DESTINATION include/theia/libraries/akaze FILES_MATCHING PATTERN "*.h*") -+if(NOT THEIA_USE_EXTERNAL_CEREAL) -+ install(DIRECTORY libraries/cereal/ DESTINATION include/theia/libraries/cereal FILES_MATCHING PATTERN "*.h*") -+endif() -+if(NOT THEIA_USE_EXTERNAL_FLANN) -+ install(DIRECTORY libraries/flann/ DESTINATION include/theia/libraries/flann FILES_MATCHING PATTERN "*.h*") -+endif() -+install(DIRECTORY libraries/optimo/ DESTINATION include/theia/libraries/optimo FILES_MATCHING PATTERN "*.h*") -+install(DIRECTORY libraries/spectra/ DESTINATION include/theia/libraries/spectra FILES_MATCHING PATTERN "*.h*") -+install(DIRECTORY libraries/statx/ DESTINATION include/theia/libraries/statx FILES_MATCHING PATTERN "*.h*") -+install(DIRECTORY libraries/stlplus3/ DESTINATION include/theia/libraries/stlplus3 FILES_MATCHING PATTERN "*.h*") -+install(DIRECTORY libraries/visual_sfm/ DESTINATION include/theia/libraries/visual_sfm FILES_MATCHING PATTERN "*.h*") -+install(DIRECTORY libraries/vlfeat/ DESTINATION include/theia/libraries/vlfeat FILES_MATCHING PATTERN "*.h*") - - # Add an uninstall target to remove all installed files. - configure_file("${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" -@@ -320,8 +379,9 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfigVersion.cmake" - "${CMAKE_SOURCE_DIR}/cmake/FindEigen.cmake" -- "${CMAKE_SOURCE_DIR}/cmake/FindGlog.cmake" -+ "${CMAKE_SOURCE_DIR}/cmake/FindFlann.cmake" - "${CMAKE_SOURCE_DIR}/cmake/FindGflags.cmake" -- "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" -+ "${CMAKE_SOURCE_DIR}/cmake/FindGlog.cmake" -+ "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" - "${CMAKE_SOURCE_DIR}/cmake/FindSuiteSparse.cmake" - DESTINATION ${CMAKECONFIG_INSTALL_DIR}) -diff --git a/cmake/FindFlann.cmake b/cmake/FindFlann.cmake -new file mode 100644 -index 0000000..5d19ef7 ---- /dev/null -+++ b/cmake/FindFlann.cmake -@@ -0,0 +1,63 @@ -+############################################################################### -+# Find FLANN -+# -+# This sets the following variables: -+# FLANN_FOUND - True if FLANN was found. -+# FLANN_INCLUDE_DIRS - Directories containing the FLANN include files. -+# FLANN_LIBRARIES - Libraries needed to use FLANN. -+# FLANN_DEFINITIONS - Compiler flags for FLANN. -+# If FLANN_USE_STATIC is specified and then look for static libraries ONLY else -+# look for shared ones -+ -+if(FLANN_USE_STATIC) -+ set(FLANN_RELEASE_NAME flann_cpp_s flann_cpp) -+ set(FLANN_DEBUG_NAME flann_cpp_s-gd flann_cpp-gd) -+else(FLANN_USE_STATIC) -+ set(FLANN_RELEASE_NAME flann_cpp) -+ set(FLANN_DEBUG_NAME flann_cpp-gd) -+endif(FLANN_USE_STATIC) -+ -+find_package(PkgConfig QUIET) -+if (FLANN_FIND_VERSION) -+ pkg_check_modules(PC_FLANN flann>=${FLANN_FIND_VERSION}) -+else(FLANN_FIND_VERSION) -+ pkg_check_modules(PC_FLANN flann) -+endif(FLANN_FIND_VERSION) -+ -+set(FLANN_DEFINITIONS ${PC_FLANN_CFLAGS_OTHER}) -+ -+find_path(FLANN_INCLUDE_DIR flann/flann.hpp -+ HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -+ PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" -+ PATH_SUFFIXES include) -+ -+find_library(FLANN_LIBRARY -+ NAMES ${FLANN_RELEASE_NAME} -+ HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -+ PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" -+ PATH_SUFFIXES lib) -+ -+find_library(FLANN_LIBRARY_DEBUG -+ NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME} -+ HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -+ PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" -+ PATH_SUFFIXES lib) -+ -+if(NOT FLANN_LIBRARY_DEBUG) -+ set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY}) -+endif(NOT FLANN_LIBRARY_DEBUG) -+ -+set(FLANN_INCLUDE_DIRS ${FLANN_INCLUDE_DIR}) -+set(FLANN_LIBRARIES optimized ${FLANN_LIBRARY} debug ${FLANN_LIBRARY_DEBUG}) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(FLANN DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIR) -+ -+mark_as_advanced(FLANN_LIBRARY FLANN_LIBRARY_DEBUG FLANN_INCLUDE_DIR) -+ -+if(FLANN_FOUND) -+ message(STATUS "Flann found (include: ${FLANN_INCLUDE_DIRS}, lib: ${FLANN_LIBRARIES})") -+ if(FLANN_USE_STATIC) -+ add_definitions(-DFLANN_STATIC) -+ endif(FLANN_USE_STATIC) -+endif(FLANN_FOUND) -diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in -index a3ea187..9195da1 100644 ---- a/cmake/TheiaConfig.cmake.in -+++ b/cmake/TheiaConfig.cmake.in -@@ -207,22 +207,47 @@ endif (NOT TARGET theia AND NOT Theia_BINARY_DIR) - # Set the expected XX_LIBRARIES variable for FindPackage(). - set(THEIA_LIBRARIES theia) - -+set(THEIA_USE_EXTERNAL_CEREAL @THEIA_USE_EXTERNAL_CEREAL@) -+set(THEIA_USE_EXTERNAL_FLANN @THEIA_USE_EXTERNAL_FLANN@) -+ -+# Cereal. -+if (THEIA_USE_EXTERNAL_CEREAL) -+ find_package(cereal QUIET) -+ if (TARGET cereal) -+ message(STATUS "Found required Theia dependency: Cereal") -+ else (TARGET cereal) -+ theia_report_not_found("Missing required Theia dependency: Cereal.") -+ endif (TARGET cereal) -+ list(APPEND THEIA_LIBRARIES cereal) -+endif (THEIA_USE_EXTERNAL_CEREAL) -+ -+# Flann. -+if (THEIA_USE_EXTERNAL_FLANN) -+ find_package(Flann QUIET) -+ if (FLANN_FOUND) -+ message(STATUS "Found required Theia dependency: Flann") -+ else (FLANN_FOUND) -+ theia_report_not_found("Missing required Theia dependency: Flann.") -+ endif (FLANN_FOUND) -+ list(APPEND THEIA_INCLUDE_DIRS ${FLANN_INCLUDE_DIR}) -+ list(APPEND THEIA_LIBRARIES ${FLANN_LIBRARY}) -+endif (THEIA_USE_EXTERNAL_FLANN) -+ - # Add the libraries included with the distribution. - set(THEIA_INTERNAL_LIB_PREFIX ${THEIA_INCLUDE_DIR}/theia/libraries) - set(THEIA_INTERNAL_LIBS_INCLUDES - ${THEIA_INTERNAL_LIB_PREFIX} - ${THEIA_INTERNAL_LIB_PREFIX}/akaze -- ${THEIA_INTERNAL_LIB_PREFIX}/cereal -- ${THEIA_INTERNAL_LIB_PREFIX}/cereal/include -- ${THEIA_INTERNAL_LIB_PREFIX}/flann -+ @THEIA_INTERNAL_CEREAL_LIB@ -+ @THEIA_INTERNAL_FLANN_LIB@ - ${THEIA_INTERNAL_LIB_PREFIX}/gtest - ${THEIA_INTERNAL_LIB_PREFIX}/gtest/include - ${THEIA_INTERNAL_LIB_PREFIX}/optimo - ${THEIA_INTERNAL_LIB_PREFIX}/spectra - ${THEIA_INTERNAL_LIB_PREFIX}/statx - ${THEIA_INTERNAL_LIB_PREFIX}/stlplus3 -- ${THEIA_INTERNAL_LIB_PREFIX}/vlfeat -- ${THEIA_INTERNAL_LIB_PREFIX}/visual_sfm) -+ ${THEIA_INTERNAL_LIB_PREFIX}/visual_sfm -+ ${THEIA_INTERNAL_LIB_PREFIX}/vlfeat) - - list(APPEND THEIA_INCLUDE_DIRS ${THEIA_INTERNAL_LIBS_INCLUDES}) - -diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt -deleted file mode 100644 -index 84f3829..0000000 ---- a/libraries/CMakeLists.txt -+++ /dev/null -@@ -1,27 +0,0 @@ --if (${BUILD_TESTING}) -- add_subdirectory(gtest) --endif (${BUILD_TESTING}) -- --# AKAZE feature extractor. --add_subdirectory(akaze) -- --# Cereal for portable IO. --add_subdirectory(cereal) -- --# Flann for fast approximate nearest neighbor searches. --add_subdirectory(flann) -- --# Add Optimo. --add_subdirectory(optimo) -- --# Add Statx. --add_subdirectory(statx) -- --# STLPlus for filepath tools. --add_subdirectory(stlplus3) -- --# Add VLFeat. --add_subdirectory(vlfeat) -- --# Add VisualSfM files. --add_subdirectory(visual_sfm) -\ No newline at end of file -diff --git a/src/theia/CMakeLists.txt b/src/theia/CMakeLists.txt -index 65787eb..07c54a4 100644 ---- a/src/theia/CMakeLists.txt -+++ b/src/theia/CMakeLists.txt -@@ -174,14 +174,15 @@ set(THEIA_LIBRARY_DEPENDENCIES - ${CERES_LIBRARIES} - ${GFLAGS_LIBRARIES} - ${GLOG_LIBRARIES} -- ${SUITESPARSE_LIBRARIES} - ${OPENIMAGEIO_LIBRARIES} -+ ${SUITESPARSE_LIBRARIES} -+ ${_THEIA_CEREAL_LIBRARIES} -+ ${_THEIA_FLANN_LIBRARIES} - akaze -- flann_cpp - statx - stlplus3 -- vlfeat -- visual_sfm) -+ visual_sfm -+ vlfeat) - - set(THEIA_LIBRARY_SOURCE - ${THEIA_SRC} diff --git a/ports/theia/fix-external-dependencies.patch b/ports/theia/fix-external-dependencies.patch new file mode 100644 index 000000000..7a4b00961 --- /dev/null +++ b/ports/theia/fix-external-dependencies.patch @@ -0,0 +1,405 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c1b150..5810156 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,70 +129,27 @@ endif () + + # GFlags. The namespace patch is borrow from Ceres Solver (see license in + # FindGflags.cmake) ++message("-- Check for Google Flags") + find_package(Gflags REQUIRED) +-if (GFLAGS_FOUND) +- message("-- Found Google Flags: ${GFLAGS_INCLUDE_DIRS} in namespace: ${GFLAGS_NAMESPACE}") +- add_definitions(-DTHEIA_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +-else (GFLAGS_FOUND) +- message(FATAL_ERROR "Can't find Google FLAGS.") +-endif (GFLAGS_FOUND) + + # Google Logging + message("-- Check for Google Log") + find_package(Glog REQUIRED) +-if (GLOG_FOUND) +- message("-- Found Google Logging: ${GLOG_INCLUDE_DIRS}") +-else (GLOG_FOUND) +- message(FATAL_ERROR "Can't find Google Logging. Please set GLOG_INCLUDE_DIR & " +- "GLOG_LIBRARY") +-endif (GLOG_FOUND) ++ ++# Flann ++message("-- Check for Flann") ++find_package(Flann REQUIRED) + + # Ceres + message("-- Check for Ceres") + find_package(Ceres REQUIRED SuiteSparse) +-if (CERES_FOUND) +- message("-- Found Ceres: ${CERES_INCLUDE_DIRS}") +-else (CERES_FOUND) +- message(FATAL_ERROR "Can't find Ceres. Please set CERES_INCLUDE_DIR & " +- "CERES_LIBRARY") +-endif (CERES_FOUND) + + # OpenImageIO + message("-- Check for OpenImageIO") + find_package(OpenImageIO REQUIRED) +-if (OPENIMAGEIO_FOUND) +- message("-- Found OpenImageIO: ${OPENIMAGEIO_INCLUDE_DIRS}") +-else (OPENIMAGEIO_FOUND) +- message(FATAL_ERROR "Can't find OpenImageIO. Please set OPENIMAGEIO_INCLUDE_DIR & " +- "OPENIMAGEIO_LIBRARY") +-endif (OPENIMAGEIO_FOUND) + + # Suitesparse + find_package(SuiteSparse REQUIRED) +-if (SUITESPARSE_FOUND) +- # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least +- # Ubuntu 13.10 cannot be used to link shared libraries. +- if (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- message(FATAL_ERROR "You are attempting to build Theia as a shared " +- "library on Ubuntu using a system package install of SuiteSparse " +- "3.4.0. This package is broken and does not support the " +- "construction of shared libraries (you can still build Theia as " +- "a static library). If you wish to build a shared version of Theia " +- "you should uninstall the system install of SuiteSparse " +- "(libsuitesparse-dev) and perform a source install of SuiteSparse " +- "(we recommend that you use the latest version), " +- "see http://theia-solver.org/building.html for more information.") +- endif (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- message("-- Found SuiteSparse ${SUITESPARSE_VERSION}") +- add_definitions(-DTHEIA_SUITESPARSE_VERSION="${SUITESPARSE_VERSION}") +-else (SUITESPARSE_FOUND) +- # Disable use of SuiteSparse if it cannot be found and continue. +- message(FATAL ERROR "Can't find SuiteSparse. This library is required " +- "for bundle adjustment and for solving convex optimization problems. " +- "Please set SUITESPARSE_INCLUDE_DIR & SUITESPARSE_LIBRARY") +-endif (SUITESPARSE_FOUND) + + include_directories( + include +@@ -225,24 +182,19 @@ include_directories( + libraries/spectra + ${akaze_SOURCE_DIR} + ${akaze_INCLUDE_DIR} +- ${cereal_SOURCE_DIR} +- ${cereal_SOURCE_DIR}/include +- ${flann_SOURCE_DIR} +- ${flann_SOURCE_DIR}/src/cpp +- ${gtest_SOURCE_DIR}/include +- ${gtest_SOURCE_DIR} + ${optimo_SOURCE_DIR} + ${statx_SOURCE_DIR} + ${stlplus3_SOURCE_DIR} + ${vlfeat_SOURCE_DIR} +- ${visual_sfm_SOURCE_DIR}) ++ ${visual_sfm_SOURCE_DIR} ++) + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + include(OptimizeTheiaCompilerFlags) + optimizetheiacompilerflags() + + add_subdirectory(src/theia) +-add_subdirectory(applications) ++#add_subdirectory(applications) + + if (BUILD_DOCUMENTATION) + message("-- Documentation building is enabled") +@@ -260,7 +212,13 @@ install(FILES ${THEIA_HDRS} DESTINATION include/theia) + file(GLOB_RECURSE THEIA_INTERNAL_HDRS ${CMAKE_SOURCE_DIR}/src/theia/*.h) + install(DIRECTORY src/theia/ DESTINATION include/theia FILES_MATCHING PATTERN "*.h") + +-install(DIRECTORY libraries/ DESTINATION include/theia/libraries FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/akaze/ DESTINATION include/theia/libraries/akaze FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/optimo/ DESTINATION include/theia/libraries/optimo FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/spectra/ DESTINATION include/theia/libraries/spectra FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/statx/ DESTINATION include/theia/libraries/statx FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/stlplus3/ DESTINATION include/theia/libraries/stlplus3 FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/visual_sfm/ DESTINATION include/theia/libraries/visual_sfm FILES_MATCHING PATTERN "*.h*") ++install(DIRECTORY libraries/vlfeat/ DESTINATION include/theia/libraries/vlfeat FILES_MATCHING PATTERN "*.h*") + + # Add an uninstall target to remove all installed files. + configure_file("${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" +@@ -272,17 +230,10 @@ add_custom_target(uninstall + + # Set up install directories. INCLUDE_INSTALL_DIR, LIB_INSTALL_DIR and + # CMAKECONFIG_INSTALL_DIR must not be absolute paths. +-if (WIN32) +- set(INCLUDE_INSTALL_DIR Include) +- set(LIB_INSTALL_DIR Lib) +- set(CMAKECONFIG_INSTALL_DIR CMake) +- set(RELATIVE_CMAKECONFIG_INSTALL_DIR CMake) +-else () +- set(INCLUDE_INSTALL_DIR include) +- set(LIB_INSTALL_DIR lib) +- set(CMAKECONFIG_INSTALL_DIR share/Theia) +- set(RELATIVE_CMAKECONFIG_INSTALL_DIR share/Theia) +-endif () ++set(INCLUDE_INSTALL_DIR include) ++set(LIB_INSTALL_DIR lib) ++set(CMAKECONFIG_INSTALL_DIR share/theia) ++set(RELATIVE_CMAKECONFIG_INSTALL_DIR share/theia) + + # This "exports" all targets which have been put into the export set + # "TheiaExport". This means that CMake generates a file with the given +@@ -319,9 +270,5 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" + # in the public API of Theia and should thus be present in THEIA_INCLUDE_DIRS. + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfigVersion.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindEigen.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindGlog.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindGflags.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" +- "${CMAKE_SOURCE_DIR}/cmake/FindSuiteSparse.cmake" ++ "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" + DESTINATION ${CMAKECONFIG_INSTALL_DIR}) +diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in +index a3ea187..7e9d912 100644 +--- a/cmake/TheiaConfig.cmake.in ++++ b/cmake/TheiaConfig.cmake.in +@@ -124,14 +124,7 @@ list(APPEND CERES_INCLUDE_DIR_HINTS @CERES_INCLUDE_DIR@) + get_filename_component(THEIA_BUILD_CERES_LIBRARY_DIR @CERES_LIBRARIES@ PATH) + list(APPEND CERES_LIBRARY_DIR_HINTS ${THEIA_BUILD_CERES_LIBRARY_DIR}) + # Search quietly s/t we control the timing of the error message if not found. +-find_package(Ceres QUIET) +-if (CERES_FOUND) +- message(STATUS "Found required Theia dependency: " +- "Ceres in ${CERES_INCLUDE_DIRS}") +-else (CERES_FOUND) +- theia_report_not_found("Missing required Theia " +- "dependency: Ceres, please set CERES_INCLUDE_DIR.") +-endif (CERES_FOUND) ++find_package(Ceres REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${CERES_INCLUDE_DIRS}) + + # Glog. +@@ -140,64 +133,19 @@ list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@) + get_filename_component(THEIA_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH) + list(APPEND GLOG_LIBRARY_DIR_HINTS ${THEIA_BUILD_GLOG_LIBRARY_DIR}) + # Search quietly s/t we control the timing of the error message if not found. +-find_package(Glog QUIET) +-if (GLOG_FOUND) +- message(STATUS "Found required Theia dependency: " +- "Glog in ${GLOG_INCLUDE_DIRS}") +-else (GLOG_FOUND) +- theia_report_not_found("Missing required Theia " +- "dependency: Glog, please set GLOG_INCLUDE_DIR.") +-endif (GLOG_FOUND) ++find_package(Glog REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS}) + + # GFlags. The namespace patch is borrow from Ceres Solver (see license in + # FindGflags.cmake) +-find_package(Gflags QUIET) +-if (GFLAGS_FOUND) +- message(STATUS "Found required Theia dependency: Google Flags in " +- "${GFLAGS_INCLUDE_DIRS} in namespace: ${GFLAGS_NAMESPACE}") +- add_definitions(-DTHEIA_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +-else (GFLAGS_FOUND) +- theia_report_not_found("Missing required Theia dependency: Google Flags, please set " +- "GFLAGS_INCLUDE_DIR.") +-endif (GFLAGS_FOUND) ++find_package(Gflags REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIRS}) + + # OpenImageIO +-find_package(OpenImageIO QUIET) +-if (OPENIMAGEIO_FOUND) +- message(STATUS "Found Theia dependency: OpenImageIO in ${OPENIMAGEIO_INCLUDE_DIRS}") +-else (OPENIMAGEIO_FOUND) +- theia_report_not_found("Missing required Theia dependency: OpenImageIO. Please set " +- "OPENIMAGEIO_INCLUDE_DIR & OPENIMAGEIO_LIBRARY") +-endif (OPENIMAGEIO_FOUND) ++find_package(OpenImageIO REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIRS}) + +-find_package(SuiteSparse QUIET) +-if (SUITESPARSE_FOUND) +- # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least +- # Ubuntu 13.10 cannot be used to link shared libraries. +- if (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- theia_report_not_found("You are attempting to build Theia as a shared " +- "library on Ubuntu using a system package install of SuiteSparse " +- "3.4.0. This package is broken and does not support the " +- "construction of shared libraries (you can still build Theia as " +- "a static library). If you wish to build a shared version of Theia " +- "you should uninstall the system install of SuiteSparse " +- "(libsuitesparse-dev) and perform a source install of SuiteSparse " +- "(we recommend that you use the latest version), " +- "see http://theia-solver.org/building.html for more information.") +- endif (BUILD_SHARED_LIBS AND +- SUITESPARSE_IS_BROKEN_SHARED_LINKING_UBUNTU_SYSTEM_VERSION) +- message("-- Found SuiteSparse ${SUITESPARSE_VERSION}") +- add_definitions(-DTHEIA_SUITESPARSE_VERSION="${SUITESPARSE_VERSION}") +-else (SUITESPARSE_FOUND) +- # Disable use of SuiteSparse if it cannot be found and continue. +- theia_report_not_found("Can't find SuiteSparse. This library is required " +- "for bundle adjustment and for solving convex optimization problems. " +- "Please set SUITESPARSE_INCLUDE_DIR & SUITESPARSE_LIBRARY") +-endif (SUITESPARSE_FOUND) ++find_package(SuiteSparse REQUIRED) + list(APPEND THEIA_INCLUDE_DIRS ${SUITESPARSE_INCLUDE_DIRS}) + + # Import exported Theia targets. +@@ -207,22 +155,24 @@ endif (NOT TARGET theia AND NOT Theia_BINARY_DIR) + # Set the expected XX_LIBRARIES variable for FindPackage(). + set(THEIA_LIBRARIES theia) + ++find_package(cereal REQUIRED) ++list(APPEND THEIA_LIBRARIES cereal) ++ ++find_package(Flann REQUIRED) ++list(APPEND THEIA_INCLUDE_DIRS ${FLANN_INCLUDE_DIR}) ++list(APPEND THEIA_LIBRARIES ${FLANN_LIBRARY}) ++ + # Add the libraries included with the distribution. + set(THEIA_INTERNAL_LIB_PREFIX ${THEIA_INCLUDE_DIR}/theia/libraries) + set(THEIA_INTERNAL_LIBS_INCLUDES + ${THEIA_INTERNAL_LIB_PREFIX} + ${THEIA_INTERNAL_LIB_PREFIX}/akaze +- ${THEIA_INTERNAL_LIB_PREFIX}/cereal +- ${THEIA_INTERNAL_LIB_PREFIX}/cereal/include +- ${THEIA_INTERNAL_LIB_PREFIX}/flann +- ${THEIA_INTERNAL_LIB_PREFIX}/gtest +- ${THEIA_INTERNAL_LIB_PREFIX}/gtest/include + ${THEIA_INTERNAL_LIB_PREFIX}/optimo + ${THEIA_INTERNAL_LIB_PREFIX}/spectra + ${THEIA_INTERNAL_LIB_PREFIX}/statx + ${THEIA_INTERNAL_LIB_PREFIX}/stlplus3 +- ${THEIA_INTERNAL_LIB_PREFIX}/vlfeat +- ${THEIA_INTERNAL_LIB_PREFIX}/visual_sfm) ++ ${THEIA_INTERNAL_LIB_PREFIX}/visual_sfm ++ ${THEIA_INTERNAL_LIB_PREFIX}/vlfeat) + + list(APPEND THEIA_INCLUDE_DIRS ${THEIA_INTERNAL_LIBS_INCLUDES}) + +diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt +index 84f3829..f88d75a 100644 +--- a/libraries/CMakeLists.txt ++++ b/libraries/CMakeLists.txt +@@ -5,12 +5,6 @@ endif (${BUILD_TESTING}) + # AKAZE feature extractor. + add_subdirectory(akaze) + +-# Cereal for portable IO. +-add_subdirectory(cereal) +- +-# Flann for fast approximate nearest neighbor searches. +-add_subdirectory(flann) +- + # Add Optimo. + add_subdirectory(optimo) + +@@ -24,4 +18,4 @@ add_subdirectory(stlplus3) + add_subdirectory(vlfeat) + + # Add VisualSfM files. +-add_subdirectory(visual_sfm) +\ No newline at end of file ++add_subdirectory(visual_sfm) +diff --git a/libraries/statx/CMakeLists.txt b/libraries/statx/CMakeLists.txt +index 23b9e49..af236a3 100644 +--- a/libraries/statx/CMakeLists.txt ++++ b/libraries/statx/CMakeLists.txt +@@ -103,7 +103,11 @@ if(STATX_WITH_CERES) + endif(CERES_FOUND) + + # BLAS +- find_package(BLAS REQUIRED) ++ if(UNIX AND NOT APPLE) ++ find_package(OpenBLAS REQUIRED) ++ else() ++ find_package(BLAS REQUIRED) ++ endif() + + # LAPACK + find_package(LAPACK REQUIRED) +@@ -129,7 +133,6 @@ set(XGAMMA_FILES ${XGAMMA_FUNCS}/asa121.cpp ${XGAMMA_FUNCS}/asa103.cpp) + + # Setting CXX FLAGS appropriately. The code below was inspired from + # Google CERES and modified for this library. +-set (CMAKE_BUILD_TYPE Release) + set (STATX_CXX_FLAGS) + + if (CMAKE_BUILD_TYPE STREQUAL "Release") +diff --git a/libraries/vlfeat/CMakeLists.txt b/libraries/vlfeat/CMakeLists.txt +index 7f4ffc7..15bca12 100644 +--- a/libraries/vlfeat/CMakeLists.txt ++++ b/libraries/vlfeat/CMakeLists.txt +@@ -18,14 +18,19 @@ set(vl_sources + vl/random.c + vl/sift.c + vl/vlad.c) ++ + set_source_files_properties(${vl_sources} PROPERTIES LANGUAGE C) + ++add_library(vlfeat ${vl_sources}) ++ + if (MSVC) +- add_definitions(-DVL_BUILD_DLL) +- add_definitions(-DVL_DISABLE_SSE2) ++ if(BUILD_SHARED_LIBS) ++ target_compile_definitions(vlfeat PRIVATE VL_BUILD_DLL) ++ target_compile_definitions(vlfeat INTERFACE BUILD_DLL) ++ endif() ++ target_compile_definitions(vlfeat PUBLIC VL_DISABLE_SSE2) + endif (MSVC) + +-add_library(vlfeat SHARED ${vl_sources}) + install(TARGETS vlfeat + EXPORT TheiaExport + RUNTIME DESTINATION bin +diff --git a/libraries/vlfeat/vl/host.h b/libraries/vlfeat/vl/host.h +index 293fe1f..0ea3d42 100644 +--- a/libraries/vlfeat/vl/host.h ++++ b/libraries/vlfeat/vl/host.h +@@ -312,27 +312,31 @@ defined(__DOXYGEN__) + #if defined(VL_COMPILER_MSC) & ! defined(__DOXYGEN__) + # define VL_UNUSED + # define VL_INLINE static __inline +-# define snprintf _snprintf + # define isnan _isnan +-# ifdef VL_BUILD_DLL ++# if defined(VL_BUILD_DLL) + # ifdef __cplusplus + # define VL_EXPORT extern "C" __declspec(dllexport) + # else + # define VL_EXPORT extern __declspec(dllexport) + # endif +-# else ++# elif defined(VL_DLL) + # ifdef __cplusplus + # define VL_EXPORT extern "C" __declspec(dllimport) + # else + # define VL_EXPORT extern __declspec(dllimport) + # endif ++# else ++# ifdef __cplusplus ++# define VL_EXPORT extern "C" ++# else ++# define VL_EXPORT extern ++# endif + # endif + #endif + + #if defined(VL_COMPILER_LCC) & ! defined(__DOXYGEN__) + # define VL_UNUSED + # define VL_INLINE static __inline +-# define snprintf _snprintf + # define isnan _isnan + VL_INLINE float fabsf(float x) { return (float) fabs((double) x) ; } + # ifdef VL_BUILD_DLL +diff --git a/src/theia/CMakeLists.txt b/src/theia/CMakeLists.txt +index 6830f71..768586d 100644 +--- a/src/theia/CMakeLists.txt ++++ b/src/theia/CMakeLists.txt +@@ -209,7 +209,6 @@ set(THEIA_LIBRARY_DEPENDENCIES + ${SUITESPARSE_LIBRARIES} + ${OPENIMAGEIO_LIBRARIES} + akaze +- flann_cpp + statx + stlplus3 + vlfeat diff --git a/ports/theia/fix-find-suitesparse.patch b/ports/theia/fix-find-suitesparse.patch deleted file mode 100644 index f7de44aa0..000000000 --- a/ports/theia/fix-find-suitesparse.patch +++ /dev/null @@ -1,227 +0,0 @@ ---- a/cmake/FindSuiteSparse.cmake Mon Feb 06 18:05:05 2017 -+++ b/cmake/FindSuiteSparse.cmake Fri Jul 07 02:13:31 2017 -@@ -152,6 +152,12 @@ - # the first. - endmacro(SUITESPARSE_REPORT_NOT_FOUND) - -+# Protect against any alternative find_package scripts for this library having -+# been called previously (in a client project) which set SUITESPARSE_FOUND, but -+# not the other variables we require / set here which could cause the search -+# logic here to fail. -+unset(SUITESPARSE_FOUND) -+ - # Handle possible presence of lib prefix for libraries on MSVC, see - # also SUITESPARSE_RESET_FIND_LIBRARY_PREFIX(). - if (MSVC) -@@ -173,8 +179,6 @@ - /opt/local/include/ufsparse # Mac OS X - /usr/local/homebrew/include # Mac OS X - /usr/local/include -- /usr/local/include/suitesparse -- /usr/include/suitesparse # Ubuntu - /usr/include) - list(APPEND SUITESPARSE_CHECK_LIBRARY_DIRS - ${SUITESPARSE_LIBRARY_DIR_HINTS} -@@ -182,9 +186,10 @@ - /opt/local/lib/ufsparse # Mac OS X - /usr/local/homebrew/lib # Mac OS X - /usr/local/lib -- /usr/local/lib/suitesparse -- /usr/lib/suitesparse # Ubuntu - /usr/lib) -+# Additional suffixes to try appending to each search path. -+list(APPEND SUITESPARSE_CHECK_PATH_SUFFIXES -+ suitesparse) # Windows/Ubuntu - - # Given the number of components of SuiteSparse, and to ensure that the - # automatic failure message generated by FindPackageHandleStandardArgs() -@@ -212,7 +217,8 @@ - set(AMD_FOUND TRUE) - list(APPEND SUITESPARSE_FOUND_REQUIRED_VARS AMD_FOUND) - find_library(AMD_LIBRARY NAMES amd -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${AMD_LIBRARY}) - message(STATUS "Found AMD library: ${AMD_LIBRARY}") - else (EXISTS ${AMD_LIBRARY}) -@@ -223,7 +229,8 @@ - mark_as_advanced(AMD_LIBRARY) - - find_path(AMD_INCLUDE_DIR NAMES amd.h -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${AMD_INCLUDE_DIR}) - message(STATUS "Found AMD header in: ${AMD_INCLUDE_DIR}") - else (EXISTS ${AMD_INCLUDE_DIR}) -@@ -237,7 +244,8 @@ - set(CAMD_FOUND TRUE) - list(APPEND SUITESPARSE_FOUND_REQUIRED_VARS CAMD_FOUND) - find_library(CAMD_LIBRARY NAMES camd -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${CAMD_LIBRARY}) - message(STATUS "Found CAMD library: ${CAMD_LIBRARY}") - else (EXISTS ${CAMD_LIBRARY}) -@@ -248,7 +256,8 @@ - mark_as_advanced(CAMD_LIBRARY) - - find_path(CAMD_INCLUDE_DIR NAMES camd.h -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${CAMD_INCLUDE_DIR}) - message(STATUS "Found CAMD header in: ${CAMD_INCLUDE_DIR}") - else (EXISTS ${CAMD_INCLUDE_DIR}) -@@ -262,7 +271,8 @@ - set(COLAMD_FOUND TRUE) - list(APPEND SUITESPARSE_FOUND_REQUIRED_VARS COLAMD_FOUND) - find_library(COLAMD_LIBRARY NAMES colamd -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${COLAMD_LIBRARY}) - message(STATUS "Found COLAMD library: ${COLAMD_LIBRARY}") - else (EXISTS ${COLAMD_LIBRARY}) -@@ -273,7 +283,8 @@ - mark_as_advanced(COLAMD_LIBRARY) - - find_path(COLAMD_INCLUDE_DIR NAMES colamd.h -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${COLAMD_INCLUDE_DIR}) - message(STATUS "Found COLAMD header in: ${COLAMD_INCLUDE_DIR}") - else (EXISTS ${COLAMD_INCLUDE_DIR}) -@@ -287,7 +298,8 @@ - set(CCOLAMD_FOUND TRUE) - list(APPEND SUITESPARSE_FOUND_REQUIRED_VARS CCOLAMD_FOUND) - find_library(CCOLAMD_LIBRARY NAMES ccolamd -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${CCOLAMD_LIBRARY}) - message(STATUS "Found CCOLAMD library: ${CCOLAMD_LIBRARY}") - else (EXISTS ${CCOLAMD_LIBRARY}) -@@ -298,7 +310,8 @@ - mark_as_advanced(CCOLAMD_LIBRARY) - - find_path(CCOLAMD_INCLUDE_DIR NAMES ccolamd.h -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${CCOLAMD_INCLUDE_DIR}) - message(STATUS "Found CCOLAMD header in: ${CCOLAMD_INCLUDE_DIR}") - else (EXISTS ${CCOLAMD_INCLUDE_DIR}) -@@ -312,7 +325,8 @@ - set(CHOLMOD_FOUND TRUE) - list(APPEND SUITESPARSE_FOUND_REQUIRED_VARS CHOLMOD_FOUND) - find_library(CHOLMOD_LIBRARY NAMES cholmod -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${CHOLMOD_LIBRARY}) - message(STATUS "Found CHOLMOD library: ${CHOLMOD_LIBRARY}") - else (EXISTS ${CHOLMOD_LIBRARY}) -@@ -323,7 +337,8 @@ - mark_as_advanced(CHOLMOD_LIBRARY) - - find_path(CHOLMOD_INCLUDE_DIR NAMES cholmod.h -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${CHOLMOD_INCLUDE_DIR}) - message(STATUS "Found CHOLMOD header in: ${CHOLMOD_INCLUDE_DIR}") - else (EXISTS ${CHOLMOD_INCLUDE_DIR}) -@@ -337,7 +352,8 @@ - set(SUITESPARSEQR_FOUND TRUE) - list(APPEND SUITESPARSE_FOUND_REQUIRED_VARS SUITESPARSEQR_FOUND) - find_library(SUITESPARSEQR_LIBRARY NAMES spqr -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${SUITESPARSEQR_LIBRARY}) - message(STATUS "Found SuiteSparseQR library: ${SUITESPARSEQR_LIBRARY}") - else (EXISTS ${SUITESPARSEQR_LIBRARY}) -@@ -348,7 +364,8 @@ - mark_as_advanced(SUITESPARSEQR_LIBRARY) - - find_path(SUITESPARSEQR_INCLUDE_DIR NAMES SuiteSparseQR.hpp -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${SUITESPARSEQR_INCLUDE_DIR}) - message(STATUS "Found SuiteSparseQR header in: ${SUITESPARSEQR_INCLUDE_DIR}") - else (EXISTS ${SUITESPARSEQR_INCLUDE_DIR}) -@@ -364,7 +381,8 @@ - # support for it, this will do no harm if it wasn't. - set(TBB_FOUND TRUE) - find_library(TBB_LIBRARIES NAMES tbb -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${TBB_LIBRARIES}) - message(STATUS "Found Intel Thread Building Blocks (TBB) library: " - "${TBB_LIBRARIES}, assuming SuiteSparseQR was compiled with TBB.") -@@ -377,7 +395,8 @@ - - if (TBB_FOUND) - find_library(TBB_MALLOC_LIB NAMES tbbmalloc -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${TBB_MALLOC_LIB}) - message(STATUS "Found Intel Thread Building Blocks (TBB) Malloc library: " - "${TBB_MALLOC_LIB}") -@@ -407,7 +426,8 @@ - # If SuiteSparse version is >= 4 then SuiteSparse_config is required. - # For SuiteSparse 3, UFconfig.h is required. - find_library(SUITESPARSE_CONFIG_LIBRARY NAMES suitesparseconfig -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${SUITESPARSE_CONFIG_LIBRARY}) - message(STATUS "Found SuiteSparse_config library: " - "${SUITESPARSE_CONFIG_LIBRARY}") -@@ -415,7 +435,8 @@ - mark_as_advanced(SUITESPARSE_CONFIG_LIBRARY) - - find_path(SUITESPARSE_CONFIG_INCLUDE_DIR NAMES SuiteSparse_config.h -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${SUITESPARSE_CONFIG_INCLUDE_DIR}) - message(STATUS "Found SuiteSparse_config header in: " - "${SUITESPARSE_CONFIG_INCLUDE_DIR}") -@@ -433,7 +454,8 @@ - # does not have librt). - if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR UNIX AND NOT APPLE) - find_library(LIBRT_LIBRARY NAMES rt -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (LIBRT_LIBRARY) - message(STATUS "Adding librt: ${LIBRT_LIBRARY} to " - "SuiteSparse_config libraries (required on Linux & Unix [not OSX] if " -@@ -452,7 +474,8 @@ - # UFconfig header which should be present in < v4 installs. - set(SUITESPARSE_CONFIG_FOUND FALSE) - find_path(UFCONFIG_INCLUDE_DIR NAMES UFconfig.h -- PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_INCLUDE_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${UFCONFIG_INCLUDE_DIR}) - message(STATUS "Found UFconfig header in: ${UFCONFIG_INCLUDE_DIR}") - set(UFCONFIG_FOUND TRUE) -@@ -543,7 +566,8 @@ - - # METIS (Optional dependency). - find_library(METIS_LIBRARY NAMES metis -- PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS}) -+ PATHS ${SUITESPARSE_CHECK_LIBRARY_DIRS} -+ PATH_SUFFIXES ${SUITESPARSE_CHECK_PATH_SUFFIXES}) - if (EXISTS ${METIS_LIBRARY}) - message(STATUS "Found METIS library: ${METIS_LIBRARY}.") - set(METIS_FOUND TRUE) diff --git a/ports/theia/fix-glog-error.patch b/ports/theia/fix-glog-error.patch deleted file mode 100644 index 1e72c9f35..000000000 --- a/ports/theia/fix-glog-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c1b150..6518e6a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -146,6 +146,7 @@ else (GLOG_FOUND) - message(FATAL_ERROR "Can't find Google Logging. Please set GLOG_INCLUDE_DIR & " - "GLOG_LIBRARY") - endif (GLOG_FOUND) -+add_definitions(-DGLOG_NO_ABBREVIATED_SEVERITIES) - - # Ceres - message("-- Check for Ceres") diff --git a/ports/theia/fix-oiio.patch b/ports/theia/fix-oiio.patch deleted file mode 100644 index 7cba45db7..000000000 --- a/ports/theia/fix-oiio.patch +++ /dev/null @@ -1,391 +0,0 @@ -diff --git a/src/theia/image/image.cc b/src/theia/image/image.cc -index df6aba4..5e2b8dc 100644 ---- a/src/theia/image/image.cc -+++ b/src/theia/image/image.cc -@@ -60,18 +60,18 @@ FloatImage::FloatImage(const FloatImage& image_to_copy) { - } - - FloatImage::FloatImage(const int width, const int height, const int channels) { -- OpenImageIO::ImageSpec image_spec(width, height, channels, -- OpenImageIO::TypeDesc::FLOAT); -+ OIIO_NAMESPACE::ImageSpec image_spec(width, height, channels, -+ OIIO_NAMESPACE::TypeDesc::FLOAT); - image_.reset(image_spec); - } - - FloatImage::FloatImage(const int width, const int height, const int channels, - float* buffer) -- : image_(OpenImageIO::ImageSpec(width, height, channels, -- OpenImageIO::TypeDesc::FLOAT), -+ : image_(OIIO_NAMESPACE::ImageSpec(width, height, channels, -+ OIIO_NAMESPACE::TypeDesc::FLOAT), - reinterpret_cast<void*>(buffer)) {} - --FloatImage::FloatImage(const OpenImageIO::ImageBuf& image) { -+FloatImage::FloatImage(const OIIO_NAMESPACE::ImageBuf& image) { - image_.copy(image); - } - -@@ -80,11 +80,11 @@ FloatImage& FloatImage::operator=(const FloatImage& image2) { - return *this; - } - --OpenImageIO::ImageBuf& FloatImage::GetOpenImageIOImageBuf() { -+OIIO_NAMESPACE::ImageBuf& FloatImage::GetOpenImageIOImageBuf() { - return image_; - } - --const OpenImageIO::ImageBuf& FloatImage::GetOpenImageIOImageBuf() const { -+const OIIO_NAMESPACE::ImageBuf& FloatImage::GetOpenImageIOImageBuf() const { - return image_; - } - -@@ -110,7 +110,7 @@ void FloatImage::SetXY(const int x, - DCHECK_LT(c, Channels()); - - // Set the ROI to be the precise pixel location in the correct channel. -- OpenImageIO::ImageBuf::Iterator<float> it(image_, x, y, 0); -+ OIIO_NAMESPACE::ImageBuf::Iterator<float> it(image_, x, y, 0); - it[c] = value; - } - -@@ -195,9 +195,9 @@ void FloatImage::ConvertToGrayscaleImage() { - // Compute luminance via a weighted sum of R,G,B (assuming Rec709 primaries - // and a linear scale) - const float luma_weights[3] = {.2126, .7152, .0722}; -- OpenImageIO::ImageBuf source = image_; -+ OIIO_NAMESPACE::ImageBuf source = image_; - image_.clear(); -- OpenImageIO::ImageBufAlgo::channel_sum(image_, source, luma_weights); -+ OIIO_NAMESPACE::ImageBufAlgo::channel_sum(image_, source, luma_weights); - } - - void FloatImage::ConvertToRGBImage() { -@@ -207,13 +207,13 @@ void FloatImage::ConvertToRGBImage() { - } - - // Copy the single grayscale channel into r, g, and b. -- const OpenImageIO::ImageBuf source(image_); -- OpenImageIO::ImageSpec image_spec(Width(), Height(), 3, -- OpenImageIO::TypeDesc::FLOAT); -+ const OIIO_NAMESPACE::ImageBuf source(image_); -+ OIIO_NAMESPACE::ImageSpec image_spec(Width(), Height(), 3, -+ OIIO_NAMESPACE::TypeDesc::FLOAT); - image_.reset(image_spec); -- OpenImageIO::ImageBufAlgo::paste(image_, 0, 0, 0, 0, source); -- OpenImageIO::ImageBufAlgo::paste(image_, 0, 0, 0, 1, source); -- OpenImageIO::ImageBufAlgo::paste(image_, 0, 0, 0, 2, source); -+ OIIO_NAMESPACE::ImageBufAlgo::paste(image_, 0, 0, 0, 0, source); -+ OIIO_NAMESPACE::ImageBufAlgo::paste(image_, 0, 0, 0, 1, source); -+ OIIO_NAMESPACE::ImageBufAlgo::paste(image_, 0, 0, 0, 2, source); - } - - FloatImage FloatImage::AsGrayscaleImage() const { -@@ -238,12 +238,12 @@ FloatImage FloatImage::AsRGBImage() const { - } - - void FloatImage::ScalePixels(float scale) { -- OpenImageIO::ImageBufAlgo::mul(image_, image_, scale); -+ OIIO_NAMESPACE::ImageBufAlgo::mul(image_, image_, scale); - } - - void FloatImage::Read(const std::string& filename) { - image_.reset(filename); -- image_.read(0, 0, true, OpenImageIO::TypeDesc::FLOAT); -+ image_.read(0, 0, true, OIIO_NAMESPACE::TypeDesc::FLOAT); - } - - void FloatImage::Write(const std::string& filename) const { -@@ -259,19 +259,19 @@ const float* FloatImage::Data() const { - - FloatImage FloatImage::ComputeGradientX() const { - float sobel_filter_x[9] = {-.125, 0, .125, -.25, 0, .25, -.125, 0, .125}; -- OpenImageIO::ImageSpec spec(3, 3, 1, OpenImageIO::TypeDesc::FLOAT); -- OpenImageIO::ImageBuf kernel_x(spec, sobel_filter_x); -- OpenImageIO::ImageBuf gradient_x; -- OpenImageIO::ImageBufAlgo::convolve(gradient_x, image_, kernel_x, false); -+ OIIO_NAMESPACE::ImageSpec spec(3, 3, 1, OIIO_NAMESPACE::TypeDesc::FLOAT); -+ OIIO_NAMESPACE::ImageBuf kernel_x(spec, sobel_filter_x); -+ OIIO_NAMESPACE::ImageBuf gradient_x; -+ OIIO_NAMESPACE::ImageBufAlgo::convolve(gradient_x, image_, kernel_x, false); - return FloatImage(gradient_x); - } - - FloatImage FloatImage::ComputeGradientY() const { - float sobel_filter_y[9] = {-.125, -.25, -.125, 0, 0, 0, .125, .25, .125}; -- OpenImageIO::ImageSpec spec(3, 3, 1, OpenImageIO::TypeDesc::FLOAT); -- OpenImageIO::ImageBuf kernel_y(spec, sobel_filter_y); -- OpenImageIO::ImageBuf gradient_y; -- OpenImageIO::ImageBufAlgo::convolve(gradient_y, image_, kernel_y, false); -+ OIIO_NAMESPACE::ImageSpec spec(3, 3, 1, OIIO_NAMESPACE::TypeDesc::FLOAT); -+ OIIO_NAMESPACE::ImageBuf kernel_y(spec, sobel_filter_y); -+ OIIO_NAMESPACE::ImageBuf gradient_y; -+ OIIO_NAMESPACE::ImageBufAlgo::convolve(gradient_y, image_, kernel_y, false); - return FloatImage(gradient_y); - } - -@@ -280,28 +280,28 @@ FloatImage FloatImage::ComputeGradient() const { - float sobel_filter_x[9] = {-.125, 0, .125, -.25, 0, .25, -.125, 0, .125}; - float sobel_filter_y[9] = {-.125, -.25, -.125, 0, 0, 0, .125, .25, .125}; - -- OpenImageIO::ImageSpec spec(3, 3, 1, OpenImageIO::TypeDesc::FLOAT); -- OpenImageIO::ImageBuf kernel_x(spec, sobel_filter_x); -- OpenImageIO::ImageBuf kernel_y(spec, sobel_filter_y); -+ OIIO_NAMESPACE::ImageSpec spec(3, 3, 1, OIIO_NAMESPACE::TypeDesc::FLOAT); -+ OIIO_NAMESPACE::ImageBuf kernel_x(spec, sobel_filter_x); -+ OIIO_NAMESPACE::ImageBuf kernel_y(spec, sobel_filter_y); - -- OpenImageIO::ImageBuf gradient, gradient_x, gradient_y; -- OpenImageIO::ImageBufAlgo::convolve(gradient_x, image_, kernel_x, false); -- OpenImageIO::ImageBufAlgo::abs(gradient_x, gradient_x); -- OpenImageIO::ImageBufAlgo::convolve(gradient_y, image_, kernel_y, false); -- OpenImageIO::ImageBufAlgo::abs(gradient_y, gradient_y); -- OpenImageIO::ImageBufAlgo::add(gradient, gradient_x, gradient_y); -+ OIIO_NAMESPACE::ImageBuf gradient, gradient_x, gradient_y; -+ OIIO_NAMESPACE::ImageBufAlgo::convolve(gradient_x, image_, kernel_x, false); -+ OIIO_NAMESPACE::ImageBufAlgo::abs(gradient_x, gradient_x); -+ OIIO_NAMESPACE::ImageBufAlgo::convolve(gradient_y, image_, kernel_y, false); -+ OIIO_NAMESPACE::ImageBufAlgo::abs(gradient_y, gradient_y); -+ OIIO_NAMESPACE::ImageBufAlgo::add(gradient, gradient_x, gradient_y); - - return FloatImage(gradient); - } - - void FloatImage::ApproximateGaussianBlur(const double sigma) { -- OpenImageIO::ImageBuf kernel; -- OpenImageIO::ImageBufAlgo::make_kernel(kernel, "gaussian", 5.0f, 5.0f); -- OpenImageIO::ImageBufAlgo::convolve(image_, image_, kernel); -+ OIIO_NAMESPACE::ImageBuf kernel; -+ OIIO_NAMESPACE::ImageBufAlgo::make_kernel(kernel, "gaussian", 5.0f, 5.0f); -+ OIIO_NAMESPACE::ImageBufAlgo::convolve(image_, image_, kernel); - } - - void FloatImage::MedianFilter(const int patch_width) { -- CHECK(OpenImageIO::ImageBufAlgo::median_filter(image_, image_, patch_width)); -+ CHECK(OIIO_NAMESPACE::ImageBufAlgo::median_filter(image_, image_, patch_width)); - } - - void FloatImage::Integrate(FloatImage* integral) const { -@@ -327,14 +327,14 @@ void FloatImage::Resize(int new_width, int new_height) { - // If the image has not been initialized then initialize it with the image - // spec. Otherwise resize the image and interpolate pixels accordingly. - if (!image_.initialized()) { -- OpenImageIO::ImageSpec image_spec(new_width, new_height, Channels(), -- OpenImageIO::TypeDesc::FLOAT); -+ OIIO_NAMESPACE::ImageSpec image_spec(new_width, new_height, Channels(), -+ OIIO_NAMESPACE::TypeDesc::FLOAT); - image_.reset(image_spec); - } else { -- OpenImageIO::ROI roi(0, new_width, 0, new_height, 0, 1, 0, Channels()); -- OpenImageIO::ImageBuf dst; -- CHECK(OpenImageIO::ImageBufAlgo::resize(dst, image_, nullptr, roi)) -- << OpenImageIO::geterror(); -+ OIIO_NAMESPACE::ROI roi(0, new_width, 0, new_height, 0, 1, 0, Channels()); -+ OIIO_NAMESPACE::ImageBuf dst; -+ CHECK(OIIO_NAMESPACE::ImageBufAlgo::resize(dst, image_, nullptr, roi)) -+ << OIIO_NAMESPACE::geterror(); - image_.copy(dst); - } - } -diff --git a/src/theia/image/image.h b/src/theia/image/image.h -index e4f22cc..29122d2 100644 ---- a/src/theia/image/image.h -+++ b/src/theia/image/image.h -@@ -64,7 +64,7 @@ class FloatImage { - - // Copy function. This is a deep copy of the image. - FloatImage(const FloatImage& image_to_copy); -- explicit FloatImage(const OpenImageIO::ImageBuf& image); -+ explicit FloatImage(const OIIO_NAMESPACE::ImageBuf& image); - FloatImage& operator=(const FloatImage& image2); - ~FloatImage() {} - -@@ -74,8 +74,8 @@ class FloatImage { - // wrapper for all algorithms. Getting a reference to the ImageBuf provides - // efficient access to the image data so that the image processing algorithms - // or other manipulations may be executed on the pixels. -- OpenImageIO::ImageBuf& GetOpenImageIOImageBuf(); -- const OpenImageIO::ImageBuf& GetOpenImageIOImageBuf() const; -+ OIIO_NAMESPACE::ImageBuf& GetOpenImageIOImageBuf(); -+ const OIIO_NAMESPACE::ImageBuf& GetOpenImageIOImageBuf() const; - - // Image information - int Rows() const; -@@ -171,7 +171,7 @@ class FloatImage { - void Resize(double scale); - - protected: -- OpenImageIO::ImageBuf image_; -+ OIIO_NAMESPACE::ImageBuf image_; - }; - } // namespace theia - -diff --git a/src/theia/image/image_test.cc b/src/theia/image/image_test.cc -index 894dc30..340488d 100644 ---- a/src/theia/image/image_test.cc -+++ b/src/theia/image/image_test.cc -@@ -53,11 +53,11 @@ RandomNumberGenerator rng(51); - std::string img_filename = THEIA_DATA_DIR + std::string("/") + FLAGS_test_img; - - #define ASSERT_IMG_EQ(oiio_img, theia_img, rows, cols) \ -- oiio_img.read(0, 0, true, OpenImageIO::TypeDesc::FLOAT); \ -+ oiio_img.read(0, 0, true, OIIO_NAMESPACE::TypeDesc::FLOAT); \ - ASSERT_EQ(oiio_img.oriented_width(), theia_img.Cols()); \ - ASSERT_EQ(oiio_img.oriented_height(), theia_img.Rows()); \ - ASSERT_EQ(oiio_img.nchannels(), theia_img.Channels()); \ -- OpenImageIO::ImageBuf::ConstIterator<float> it(oiio_img); \ -+ OIIO_NAMESPACE::ImageBuf::ConstIterator<float> it(oiio_img); \ - for (; !it.done(); ++it) { \ - for (int c = 0; c < oiio_img.nchannels(); c++) { \ - ASSERT_EQ(it[c], theia_img.GetXY(it.x(), it.y(), c)); \ -@@ -89,7 +89,7 @@ float Interpolate(const FloatImage& image, - - // Test that inputting the old fashioned way is the same as through our class. - TEST(Image, RGBInput) { -- OpenImageIO::ImageBuf oiio_img(img_filename.c_str()); -+ OIIO_NAMESPACE::ImageBuf oiio_img(img_filename.c_str()); - oiio_img.read(); - FloatImage theia_img(img_filename); - -@@ -102,7 +102,7 @@ TEST(Image, RGBInput) { - - // Test that width and height methods work. - TEST(Image, RGBColsRows) { -- OpenImageIO::ImageBuf oiio_img(img_filename.c_str()); -+ OIIO_NAMESPACE::ImageBuf oiio_img(img_filename.c_str()); - FloatImage theia_img(img_filename); - - int true_height = oiio_img.oriented_height(); -@@ -114,10 +114,10 @@ TEST(Image, RGBColsRows) { - - // Test that inputting the old fashioned way is the same as through our class. - TEST(Image, ConvertToGrayscaleImage) { -- OpenImageIO::ImageBuf oiio_img(img_filename.c_str()); -- OpenImageIO::ImageBuf gray_img; -+ OIIO_NAMESPACE::ImageBuf oiio_img(img_filename.c_str()); -+ OIIO_NAMESPACE::ImageBuf gray_img; - const float luma_weights[3] = {.2126, .7152, .0722}; -- OpenImageIO::ImageBufAlgo::channel_sum(gray_img, oiio_img, luma_weights); -+ OIIO_NAMESPACE::ImageBufAlgo::channel_sum(gray_img, oiio_img, luma_weights); - - FloatImage theia_img(img_filename); - theia_img.ConvertToGrayscaleImage(); -@@ -131,10 +131,10 @@ TEST(Image, ConvertToGrayscaleImage) { - } - - TEST(Image, ConvertToRGBImage) { -- OpenImageIO::ImageBuf oiio_img(img_filename.c_str()); -- OpenImageIO::ImageBuf gray_img; -+ OIIO_NAMESPACE::ImageBuf oiio_img(img_filename.c_str()); -+ OIIO_NAMESPACE::ImageBuf gray_img; - const float luma_weights[3] = {.2126, .7152, .0722}; -- OpenImageIO::ImageBufAlgo::channel_sum(gray_img, oiio_img, luma_weights); -+ OIIO_NAMESPACE::ImageBufAlgo::channel_sum(gray_img, oiio_img, luma_weights); - - // This should result in an image with the grayscale image copied in each - // channel. -@@ -148,7 +148,7 @@ TEST(Image, ConvertToRGBImage) { - - // Check that all channels have equal value and that the value is equal to the - // grayscale image. -- for (OpenImageIO::ImageBuf::ConstIterator<float> it(gray_img); -+ for (OIIO_NAMESPACE::ImageBuf::ConstIterator<float> it(gray_img); - !it.done(); - ++it) { - ASSERT_EQ(it[0], rgb_img.GetXY(it.x(), it.y(), 0)); -diff --git a/src/theia/sfm/exif_reader.cc b/src/theia/sfm/exif_reader.cc -index 48c049a..fea884d 100644 ---- a/src/theia/sfm/exif_reader.cc -+++ b/src/theia/sfm/exif_reader.cc -@@ -127,8 +127,8 @@ bool ExifReader::ExtractEXIFMetadata( - CameraIntrinsicsPrior* camera_intrinsics_prior) const { - CHECK_NOTNULL(camera_intrinsics_prior); - -- OpenImageIO::ImageBuf image(image_file); -- OpenImageIO::ImageSpec image_spec = image.spec(); -+ OIIO_NAMESPACE::ImageBuf image(image_file); -+ OIIO_NAMESPACE::ImageSpec image_spec = image.spec(); - - // Set the image dimensions. - camera_intrinsics_prior->image_width = image_spec.width; -@@ -154,7 +154,7 @@ bool ExifReader::ExtractEXIFMetadata( - camera_intrinsics_prior->focal_length.is_set = true; - - // Set GPS latitude. -- const OpenImageIO::ImageIOParameter* latitude = -+ const OIIO_NAMESPACE::ImageIOParameter* latitude = - image_spec.find_attribute("GPS:Latitude"); - if (latitude != nullptr) { - camera_intrinsics_prior->latitude.is_set = true; -@@ -173,7 +173,7 @@ bool ExifReader::ExtractEXIFMetadata( - } - - // Set GPS longitude. -- const OpenImageIO::ImageIOParameter* longitude = -+ const OIIO_NAMESPACE::ImageIOParameter* longitude = - image_spec.find_attribute("GPS:Longitude"); - if (longitude != nullptr) { - camera_intrinsics_prior->longitude.is_set = true; -@@ -193,7 +193,7 @@ bool ExifReader::ExtractEXIFMetadata( - - - // Set GSP altitude. -- const OpenImageIO::ImageIOParameter* altitude = -+ const OIIO_NAMESPACE::ImageIOParameter* altitude = - image_spec.find_attribute("GPS:Altitude"); - if (altitude != nullptr) { - camera_intrinsics_prior->altitude.is_set = true; -@@ -205,7 +205,7 @@ bool ExifReader::ExtractEXIFMetadata( - } - - bool ExifReader::SetFocalLengthFromExif( -- const OpenImageIO::ImageSpec& image_spec, -+ const OIIO_NAMESPACE::ImageSpec& image_spec, - CameraIntrinsicsPrior* camera_intrinsics_prior) const { - static const float kMinFocalLength = 1e-2; - -@@ -268,7 +268,7 @@ bool ExifReader::SetFocalLengthFromExif( - } - - bool ExifReader::SetFocalLengthFromSensorDatabase( -- const OpenImageIO::ImageSpec& image_spec, -+ const OIIO_NAMESPACE::ImageSpec& image_spec, - CameraIntrinsicsPrior* camera_intrinsics_prior) const { - const int max_image_dimension = std::max(image_spec.width, image_spec.height); - const float exif_focal_length = -diff --git a/src/theia/sfm/exif_reader.h b/src/theia/sfm/exif_reader.h -index 3049cf4..d9d3108 100644 ---- a/src/theia/sfm/exif_reader.h -+++ b/src/theia/sfm/exif_reader.h -@@ -74,13 +74,13 @@ class ExifReader { - // Sets the focal length from the focal plane resolution. Returns true if a - // valid focal length is found and false otherwise. - bool SetFocalLengthFromExif( -- const OpenImageIO::ImageSpec& image_spec, -+ const OIIO_NAMESPACE::ImageSpec& image_spec, - CameraIntrinsicsPrior* camera_intrinsics_prior) const; - - // Sets the focal length from a look up in the sensor width database. Returns - // true if a valid focal length is found and false otherwise. - bool SetFocalLengthFromSensorDatabase( -- const OpenImageIO::ImageSpec& image_spec, -+ const OIIO_NAMESPACE::ImageSpec& image_spec, - CameraIntrinsicsPrior* camera_intrinsics_prior) const; - - std::unordered_map<std::string, double> sensor_width_database_; -diff --git a/src/theia/sfm/undistort_image.cc b/src/theia/sfm/undistort_image.cc -index 95a061d..ae0690e 100644 ---- a/src/theia/sfm/undistort_image.cc -+++ b/src/theia/sfm/undistort_image.cc -@@ -160,9 +160,9 @@ void RemoveImageLensDistortion(const Camera& distorted_camera, - // For each pixel in the undistorted image, find the coordinate in the - // distorted image and set the pixel color accordingly. - const int num_channels = distorted_image.Channels(); -- OpenImageIO::ImageBuf& undistorted_img = -+ OIIO_NAMESPACE::ImageBuf& undistorted_img = - undistorted_image->GetOpenImageIOImageBuf(); -- OpenImageIO::ImageBuf::Iterator<float> undistorted_it(undistorted_img); -+ OIIO_NAMESPACE::ImageBuf::Iterator<float> undistorted_it(undistorted_img); - for (; !undistorted_it.done(); ++undistorted_it) { - Eigen::Vector2d image_point(undistorted_it.x() + 0.5, - undistorted_it.y() + 0.5); diff --git a/ports/theia/fix-vlfeat-static.patch b/ports/theia/fix-vlfeat-static.patch deleted file mode 100644 index cbade039f..000000000 --- a/ports/theia/fix-vlfeat-static.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/libraries/vlfeat/CMakeLists.txt b/libraries/vlfeat/CMakeLists.txt -index d248bcf..24469c9 100644 ---- a/libraries/vlfeat/CMakeLists.txt -+++ b/libraries/vlfeat/CMakeLists.txt -@@ -16,11 +16,11 @@ set(vl_sources - set_source_files_properties(${vl_sources} PROPERTIES LANGUAGE C) - - if (MSVC) -- add_definitions(-DVL_BUILD_DLL) -+ #add_definitions(-DVL_BUILD_DLL) - add_definitions(-DVL_DISABLE_SSE2) - endif (MSVC) - --add_library(vlfeat SHARED ${vl_sources}) -+add_library(vlfeat ${vl_sources}) - install(TARGETS vlfeat - EXPORT TheiaExport - RUNTIME DESTINATION bin -diff --git a/libraries/vlfeat/vl/host.h b/libraries/vlfeat/vl/host.h -index 4fdb86c..01c1134 100644 ---- a/libraries/vlfeat/vl/host.h -+++ b/libraries/vlfeat/vl/host.h -@@ -316,18 +316,24 @@ defined(__DOXYGEN__) - # define snprintf _snprintf - # define isnan _isnan - #endif --# ifdef VL_BUILD_DLL -+# if defined(VL_BUILD_DLL) - # ifdef __cplusplus - # define VL_EXPORT extern "C" __declspec(dllexport) - # else - # define VL_EXPORT extern __declspec(dllexport) - # endif --# else -+# elif defined(VL_DLL) - # ifdef __cplusplus - # define VL_EXPORT extern "C" __declspec(dllimport) - # else - # define VL_EXPORT extern __declspec(dllimport) - # endif -+# else -+# ifdef __cplusplus -+# define VL_EXPORT extern "C" -+# else -+# define VL_EXPORT extern -+# endif - # endif - #endif - diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake index 18f8490b1..c131ac095 100644 --- a/ports/theia/portfile.cmake +++ b/ports/theia/portfile.cmake @@ -2,31 +2,23 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if(VCPKG_TARGET_ARCHIECTURE STREQUAL "x86") - message(FATAL_ERROR "theia requires ceres[suitesparse] which depends on suitesparse which depends on openblas which is unavailable on x86.") -endif() - - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sweeneychris/TheiaSfM - REF d15154a6c30ea48e7d135be126e2936802e476ad - SHA512 aaf6e9737d04499f0ffd453952380f2e1aa3aab2a75487d6806bfab60aa972719d7349730eab3d1b37088e99cf6c9076ae1cdea276f48532698226c69ac48977 + REF v0.8 + SHA512 2f620389c415badec36f4b44be0378fc62761dd6b2ee4cd7033b13573c372f098e248553575fb2cceb757b1ca00e86a11c67e03b6077e0a4b0f8797065746312 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-cmakelists.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-vlfeat-static.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-glog-error.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-find-suitesparse.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-oiio.patch + fix-external-dependencies.patch ) +file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF -DTHEIA_USE_EXTERNAL_CEREAL=ON @@ -34,28 +26,19 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake") - -# Changes target search path -file(READ ${CURRENT_PACKAGES_DIR}/share/theia/TheiaConfig.cmake THEIA_TARGETS) -string(REPLACE "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${THEIA_CURRENT_CONFIG_INSTALL_DIR}/../ ABSOLUTE)" - "get_filename_component(CURRENT_ROOT_INSTALL_DIR\n \${THEIA_CURRENT_CONFIG_INSTALL_DIR}/../../ ABSOLUTE)" THEIA_TARGETS "${THEIA_TARGETS}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/theia/TheiaConfig.cmake "${THEIA_TARGETS}") - +vcpkg_fixup_cmake_targets() vcpkg_copy_pdbs() # Clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/optimo) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/optimo) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cimg/cmake-modules) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/akaze/datasets) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/theia/libraries/spectra/doxygen) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/optimo) # Handle copyright -file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/theia) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/theia/license.txt ${CURRENT_PACKAGES_DIR}/share/theia/copyright) +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/theia RENAME copyright) file(COPY ${SOURCE_PATH}/data/camera_sensor_database_license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/theia) diff --git a/ports/think-cell-range/CONTROL b/ports/think-cell-range/CONTROL index 120f2c884..985f07175 100644 --- a/ports/think-cell-range/CONTROL +++ b/ports/think-cell-range/CONTROL @@ -1,5 +1,6 @@ Source: think-cell-range
Maintainer: jfrederich@gmail.com
Version: 498839d-1
-Description: think-cell's range library <https://think-cell.com>, <https://github.com/think-cell/range>, <https://www.think-cell.com/en/career/talks/ranges/#1>
+Description: think-cell's range library
+Homepage: https://github.com/think-cell/range
Build-Depends: boost
diff --git a/ports/thor/CONTROL b/ports/thor/CONTROL index 4ff531d14..5391f5d62 100644 --- a/ports/thor/CONTROL +++ b/ports/thor/CONTROL @@ -1,4 +1,4 @@ Source: thor -Version: 2.0-2 +Version: 2.0-3 Description: Extends the multimedia library SFML with higher-level features Build-Depends: sfml, aurora diff --git a/ports/thor/portfile.cmake b/ports/thor/portfile.cmake index 572853064..19f65f806 100644 --- a/ports/thor/portfile.cmake +++ b/ports/thor/portfile.cmake @@ -49,6 +49,9 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/Aurora) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +endif() file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/thor RENAME copyright) diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL index f0ac0b5fd..c3f2f83c9 100644 --- a/ports/thrift/CONTROL +++ b/ports/thrift/CONTROL @@ -1,4 +1,5 @@ Source: thrift -Version: 2019-04-19-1 +Version: 2019-05-07-1 Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit -Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010. +Homepage: https://github.com/apache/thrift +Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 7ed3946a7..c19b38c31 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift - REF 2ff952b0af4035bcb71d8d73d9eb75df31983544 - SHA512 58d08a6258b3c64f6fe1f2e4200b6cac61b19ac66113782e4eacf058d15c451de741bff137b32261fc816074ef111627f27cc50ad366eb73395dcc631c2ca66f + REF acdd4226c210336e9e15eb812e5932a645fcd5ce + SHA512 53986b1cde7b2bd19974f32b8c31736566061a228dda368d3d850355c566d910499c16519bbff078a6cdab19931cd9833a7d684ac63fb1ec40b2a123ff263aaa HEAD_REF master ) @@ -17,7 +17,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_SHARED_LIBS=OFF -DWITH_STDTHREADS=ON -DBUILD_TESTING=off -DBUILD_JAVA=off @@ -27,6 +26,7 @@ vcpkg_configure_cmake( -DBUILD_HASKELL=off -DBUILD_TUTORIALS=off -DFLEX_EXECUTABLE=${FLEX} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE -DBISON_EXECUTABLE=${BISON} ) @@ -35,7 +35,7 @@ vcpkg_install_cmake() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/thrift RENAME copyright) # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/thrift") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/thrift) file(GLOB COMPILER "${CURRENT_PACKAGES_DIR}/bin/thrift*") if(COMPILER) diff --git a/ports/tidy-html5/CONTROL b/ports/tidy-html5/CONTROL index 2716bdf1f..0f608ea2d 100644 --- a/ports/tidy-html5/CONTROL +++ b/ports/tidy-html5/CONTROL @@ -1,3 +1,4 @@ Source: tidy-html5 -Version: 5.4.0-2 +Version: 5.6.0 +Homepage: https://github.com/htacg/tidy-html5 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. diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake index dab76286d..7cb7ca65f 100644 --- a/ports/tidy-html5/portfile.cmake +++ b/ports/tidy-html5/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO htacg/tidy-html5 - REF 5.4.0 - SHA512 d92c89f2ef371499f9c3de6f9389783d2449433b4da1f5a29e2eb81b7a7db8dd9f68e220cdde092d446e9bd779bcbc30f84bda79013526540f29d00f438cb402 + REF 5.6.0 + SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1 HEAD_REF master PATCHES remove_execution_character_set.patch diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 97d25bcdb..9c88261a6 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,5 @@ Source: tiff -Version: 4.0.10-4 -Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) +Version: 4.0.10-6 +Build-Depends: zlib, libjpeg-turbo, liblzma +Homepage: https://download.osgeo.org/libtiff Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/add-component-options.patch b/ports/tiff/add-component-options.patch deleted file mode 100644 index 513d37ad6..000000000 --- a/ports/tiff/add-component-options.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ee6fd4..439e26a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -122,6 +122,11 @@ set(EXTRA_DIST - nmake.opt - libtiff-4.pc.in) - -+option(BUILD_TOOLS "Build tool executables" ON) -+option(BUILD_DOCS "Build docs" ON) -+option(BUILD_CONTRIB "Build contributed executables" ON) -+option(BUILD_TESTS "Build tests" ON) -+ - # These are annoyingly verbose, produce false positives or don't work - # nicely with all supported compiler versions, so are disabled unless - # explicitly enabled. -@@ -719,12 +724,20 @@ endif() - # Process subdirectories - add_subdirectory(port) - add_subdirectory(libtiff) --add_subdirectory(tools) --add_subdirectory(test) --add_subdirectory(contrib) --add_subdirectory(build) --add_subdirectory(man) --add_subdirectory(html) -+if(BUILD_TOOLS) -+ add_subdirectory(tools) -+endif() -+if(BUILD_TESTS) -+ add_subdirectory(test) -+endif() -+if(BUILD_CONTRIB) -+ add_subdirectory(contrib) -+endif() -+if(BUILD_DOCS) -+ add_subdirectory(build) -+ add_subdirectory(man) -+ add_subdirectory(html) -+endif() - - #message(STATUS "EXTRA_DIST: ${EXTRA_DIST}") - diff --git a/ports/tiff/cmakelists.patch b/ports/tiff/cmakelists.patch new file mode 100644 index 000000000..597c980c5 --- /dev/null +++ b/ports/tiff/cmakelists.patch @@ -0,0 +1,99 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 845ddf0..9ccb9b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -181,9 +181,7 @@ foreach(flag ${test_flags}) + endif (${test_c_flag}) + endforeach(flag ${test_flags}) + +-if(MSVC) +- set(CMAKE_DEBUG_POSTFIX "d") +-endif() ++set(CMAKE_DEBUG_POSTFIX "d") + + option(ld-version-script "Enable linker version script" ON) + # Check if LD supports linker scripts. +@@ -601,12 +599,15 @@ check_include_file(OpenGL/gl.h HAVE_OPENGL_GL_H) + check_include_file(OpenGL/glu.h HAVE_OPENGL_GLU_H) + + # Win32 IO +-set(win32_io FALSE) +-if(WIN32) +- set(win32_io TRUE) ++set(USE_WIN32_FILEIO FALSE CACHE BOOL "") ++if(MSVC) ++ if (NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") #on UWP we use the unix I/O api ++ set(USE_WIN32_FILEIO TRUE CACHE BOOL "" FORCE) ++ add_definitions(-DUSE_WIN32_FILEIO) ++ endif() ++ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS /wd4996) + endif() + +-set(USE_WIN32_FILEIO ${win32_io}) + + # Orthogonal features + +@@ -708,16 +709,28 @@ endif() + + #report_values(TIFF_INCLUDES TIFF_LIBRARY_DEPS) + ++option(BUILD_TOOLS "Build tool executables" ON) ++option(BUILD_DOCS "Build docs" ON) ++option(BUILD_CONTRIB "Build contributed executables" ON) ++option(BUILD_TESTS "Build tests" ON) ++ + # Process subdirectories + add_subdirectory(port) + add_subdirectory(libtiff) +-add_subdirectory(tools) +-add_subdirectory(test) +-add_subdirectory(contrib) +-add_subdirectory(build) +-add_subdirectory(man) +-add_subdirectory(html) +- ++if(BUILD_TOOLS) ++ add_subdirectory(tools) ++endif() ++if(BUILD_TESTS) ++ add_subdirectory(test) ++endif() ++if(BUILD_CONTRIB) ++ add_subdirectory(contrib) ++endif() ++if(BUILD_DOCS) ++ add_subdirectory(build) ++ add_subdirectory(man) ++ add_subdirectory(html) ++endif() + #message(STATUS "EXTRA_DIST: ${EXTRA_DIST}") + + message(STATUS "") +diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +index 1cf1b75..4ee29f6 100644 +--- a/libtiff/CMakeLists.txt ++++ b/libtiff/CMakeLists.txt +@@ -104,11 +104,11 @@ set(tiffxx_HEADERS + set(tiffxx_SOURCES + tif_stream.cxx) + +-if(WIN32_IO) +- extra_dist(tif_unix.c) ++if(USE_WIN32_FILEIO) ++ extra_dist(tif_win32.c) + list(APPEND tiff_SOURCES tif_win32.c) + else() +- extra_dist(tif_win32.c) ++ extra_dist(tif_unix.c) + list(APPEND tiff_SOURCES tif_unix.c) + endif() + +@@ -143,7 +143,7 @@ install(FILES ${tiff_HEADERS} ${nodist_tiff_HEADERS} + DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + + if(CXX_SUPPORT) +- add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS}) ++ add_library(tiffxx STATIC ${tiffxx_SOURCES} ${tiffxx_HEADERS}) + target_link_libraries(tiffxx tiff) + set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION}) + if(NOT CYGWIN) diff --git a/ports/tiff/crt-secure-no-deprecate.patch b/ports/tiff/crt-secure-no-deprecate.patch deleted file mode 100644 index 476a931a9..000000000 --- a/ports/tiff/crt-secure-no-deprecate.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 439e26a..05416d8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -187,6 +187,7 @@ endforeach(flag ${test_flags}) - - if(MSVC) - set(CMAKE_DEBUG_POSTFIX "d") -+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS /wd4996) - endif() - - option(ld-version-script "Enable linker version script" ON) diff --git a/ports/tiff/fix-cxx-shared-libs.patch b/ports/tiff/fix-cxx-shared-libs.patch deleted file mode 100644 index 37389ca81..000000000 --- a/ports/tiff/fix-cxx-shared-libs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4370dea04189fb9d9a94e1f4ee96ef2d24937fc9 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Thu, 23 Mar 2017 17:55:14 +0300 -Subject: [PATCH] fix shared libs building - ---- - libtiff/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index 087dfa9..20fa8b4 100644 ---- a/libtiff/CMakeLists.txt -+++ b/libtiff/CMakeLists.txt -@@ -142,6 +142,7 @@ if(cxx) - add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS}) - target_link_libraries(tiffxx tiff) - set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION}) -+ set_target_properties(tiffxx PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - if(NOT CYGWIN) - # This property causes shared libraries on Linux to have the full version - # encoded into their final filename. We disable this on Cygwin because --- -2.11.0.windows.1 diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 3a0ee0b8a..d36dce238 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -2,22 +2,19 @@ include(vcpkg_common_functions) set(LIBTIFF_VERSION 4.0.10) -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz" FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz" SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8 ) + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${LIBTIFF_VERSION} PATCHES - add-component-options.patch - fix-cxx-shared-libs.patch - crt-secure-no-deprecate.patch fix-stddef.patch + cmakelists.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") @@ -46,19 +43,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share ) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/tiff) -configure_file( - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - ${CURRENT_PACKAGES_DIR}/share/tiff - @ONLY -) -file(INSTALL - ${SOURCE_PATH}/COPYRIGHT - DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff - RENAME copyright -) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff) -vcpkg_copy_pdbs() -vcpkg_test_cmake(PACKAGE_NAME TIFF MODULE) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff) +file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiff RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/tiff/usage b/ports/tiff/usage deleted file mode 100644 index 6b2f0f89e..000000000 --- a/ports/tiff/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package tiff is compatible with built-in CMake targets: - - find_package(TIFF REQUIRED) - target_link_libraries(main PRIVATE TIFF::TIFF) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake b/ports/tiff/vcpkg-cmake-wrapper.cmake index c950b512b..a35deceee 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake @@ -1,17 +1,23 @@ _find_package(${ARGS}) -find_package(LibLZMA) +find_package(LibLZMA CONFIG) find_package(JPEG) find_package(ZLIB) if(TARGET TIFF::TIFF) - set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB) + set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA JPEG::JPEG ZLIB::ZLIB) if(UNIX) set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m) endif() endif() if(TIFF_LIBRARIES) - list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES}) + list(APPEND TIFF_LIBRARIES ${LZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES}) if(UNIX) list(APPEND TIFF_LIBRARIES m) endif() endif() +if(TIFF_LIBRARY) + list(APPEND TIFF_LIBRARY ${LZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES}) + if(UNIX) + list(APPEND TIFF_LIBRARY m) + endif() +endif() diff --git a/ports/tiny-dnn/CONTROL b/ports/tiny-dnn/CONTROL index 9198ef7fd..2a31c833a 100644 --- a/ports/tiny-dnn/CONTROL +++ b/ports/tiny-dnn/CONTROL @@ -1,3 +1,4 @@ Source: tiny-dnn Version: 2018-10-25 +Homepage: https://github.com/tiny-dnn/tiny-dnn Description: A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource. diff --git a/ports/tinydir/CONTROL b/ports/tinydir/CONTROL index 5f4f52d9a..04a6b7b60 100644 --- a/ports/tinydir/CONTROL +++ b/ports/tinydir/CONTROL @@ -1,3 +1,4 @@ Source: tinydir -Version: 1.2.3 +Version: 1.2.4 +Homepage: https://github.com/cxong/tinydir Description: Lightweight, portable and easy to integrate C directory and file reader diff --git a/ports/tinydir/portfile.cmake b/ports/tinydir/portfile.cmake index 19e9a7f48..223b7d763 100644 --- a/ports/tinydir/portfile.cmake +++ b/ports/tinydir/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cxong/tinydir - REF 1.2.3 - SHA512 fa366525558b0932994f93bab7a9edafdc7fe297fc65c2ce8af5b4b05c33c4af4b1fdf72292a7a89dcea4276cf419e3569e41ff1122e0048ad467ed6e33836a2 + REF 1.2.4 + SHA512 476b81a089d378152c2ab644b88fe860f4a6dba9594ef5c2ae138487cb54b8f6da5538c114463619043f694b992e2de5fec925bd746f8e7fd341ebcdcaac98c0 HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/tinydir.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL index 8302333d5..24350d8be 100644 --- a/ports/tinyexif/CONTROL +++ b/ports/tinyexif/CONTROL @@ -1,4 +1,5 @@ Source: tinyexif -Version: 1.0.2-4 +Version: 1.0.2-5 Build-Depends: tinyxml2 +Homepage: https://github.com/cdcseacave/TinyEXIF Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake index 5a10d422f..b6e489384 100644 --- a/ports/tinyexif/portfile.cmake +++ b/ports/tinyexif/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/tinyexif") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tinyexif) vcpkg_copy_pdbs() diff --git a/ports/tinyexr/CONTROL b/ports/tinyexr/CONTROL index 3dbc26101..076322a0f 100644 --- a/ports/tinyexr/CONTROL +++ b/ports/tinyexr/CONTROL @@ -1,3 +1,4 @@ Source: tinyexr
Version: 0.9.5-d16ea6-1
+Homepage: https://github.com/syoyo/tinyexr
Description: Library to load and save OpenEXR(.exr) images
diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL index 8ec7ef7a7..4dc5eebb2 100644 --- a/ports/tinyobjloader/CONTROL +++ b/ports/tinyobjloader/CONTROL @@ -1,3 +1,3 @@ Source: tinyobjloader
-Version: 1.4.1-1
+Version: 1.0.7-1
Description: Tiny but powerful single file wavefront obj loader
diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake index ee6d64dc7..7b8741d34 100644 --- a/ports/tinyobjloader/portfile.cmake +++ b/ports/tinyobjloader/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinyobjloader - REF v1.4.1 - SHA512 5b18fed89435a95fb3fc89829ea6904b4cc4508b0907642b39194e3e3c55678ddc1c07687e4b7ea171f270f7188ca593ed53b828c022667e54a889c36c60373e + REF v1.0.7 + SHA512 e88554ead20354da443489e1b6576b328e92b2e6665071df9b6473b38c34c036dbffb6655330e970c01ccf7f99bbd4f9f5418ce48a14239576ec5e0513256637 HEAD_REF master ) @@ -19,7 +19,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/tinyobjloader/cmake") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/tinyobjloader/cmake) file( REMOVE_RECURSE diff --git a/ports/tinythread/CONTROL b/ports/tinythread/CONTROL index 6b5de12e1..c837708ce 100644 --- a/ports/tinythread/CONTROL +++ b/ports/tinythread/CONTROL @@ -1,3 +1,4 @@ Source: tinythread
Version: 1.1-2
+Homepage: https://tinythreadpp.bitsnbites.eu/
Description: Implements a fairly compatible subset of the C++11 thread management classes
diff --git a/ports/tinytoml/CONTROL b/ports/tinytoml/CONTROL index b656fccc4..ba262920f 100644 --- a/ports/tinytoml/CONTROL +++ b/ports/tinytoml/CONTROL @@ -1,3 +1,4 @@ Source: tinytoml Version: 20180219-1 +Homepage: https://github.com/mayah/tinytoml Description: A header only C++11 library for parsing TOML. diff --git a/ports/tinyutf8/CONTROL b/ports/tinyutf8/CONTROL index cf9709e01..107d4bd66 100644 --- a/ports/tinyutf8/CONTROL +++ b/ports/tinyutf8/CONTROL @@ -1,3 +1,3 @@ Source: tinyutf8
-Version: 2.2
+Version: 3 Description: TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project.
diff --git a/ports/tinyutf8/portfile.cmake b/ports/tinyutf8/portfile.cmake index 8ee8ae436..5444310ce 100644 --- a/ports/tinyutf8/portfile.cmake +++ b/ports/tinyutf8/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DuffsDevice/tinyutf8 - REF v2.2 - SHA512 5b524696f2d2b0d09d31498ca03444609f31984007f2c56e4f50cc2eadaa2583de2af07644cf471e08ad88bc1a7881bc34803dbfac18d22e2089792c05ee4b13 + REF v3 + SHA512 a11e7e7728afec7b2d9b6ed58ca20f29ca71823854a42b99b622e42b42389290f49ce7dd3bb6c5596e15fa369266a47364887bb253643440882d31f7689affec HEAD_REF master PATCHES fixbuild.patch ) diff --git a/ports/tinyxml/CONTROL b/ports/tinyxml/CONTROL index 4eacee3b2..749dc2e7e 100644 --- a/ports/tinyxml/CONTROL +++ b/ports/tinyxml/CONTROL @@ -1,3 +1,4 @@ Source: tinyxml
Version: 2.6.2-4
+Homepage: https://sourceforge.net/projects/tinyxml
Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.
diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL index 5c4fb87a2..5a33ae078 100644 --- a/ports/tinyxml2/CONTROL +++ b/ports/tinyxml2/CONTROL @@ -1,3 +1,5 @@ Source: tinyxml2 -Version: 7.0.1 +Version: 7.0.1-1 +Homepage: https://github.com/leethomason/tinyxml2 Description: A simple, small, efficient, C++ XML parser + diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index d1e7d4ce6..7d4ceaff1 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/tinyxml2") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tinyxml2) vcpkg_copy_pdbs() diff --git a/ports/tmx/CONTROL b/ports/tmx/CONTROL index 9079cb85e..6f55421cc 100644 --- a/ports/tmx/CONTROL +++ b/ports/tmx/CONTROL @@ -1,4 +1,4 @@ Source: tmx
-Version: 1.0.0
+Version: 1.0.0-1
Description: A portable C library to load tiled maps in your games.
Build-Depends: zlib, libxml2
diff --git a/ports/tmx/portfile.cmake b/ports/tmx/portfile.cmake index b3f70f4d1..4faec9b9d 100644 --- a/ports/tmx/portfile.cmake +++ b/ports/tmx/portfile.cmake @@ -17,7 +17,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs()
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxExports.cmake ${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxTargets.cmake)
-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/tmx")
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tmx)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/tmx/tmxTargets.cmake ${CURRENT_PACKAGES_DIR}/share/tmx/tmxExports.cmake)
file(REMOVE_RECURSE
diff --git a/ports/torch-th/CONTROL b/ports/torch-th/CONTROL index edaaef3d4..1ffe36b0a 100644 --- a/ports/torch-th/CONTROL +++ b/ports/torch-th/CONTROL @@ -1,3 +1,4 @@ Source: torch-th Version: 2019-04-19-1 +Homepage: https://github.com/torch/torch7 Description: Torch's TH library diff --git a/ports/tre/CONTROL b/ports/tre/CONTROL index a5df8cd11..70a5ce003 100644 --- a/ports/tre/CONTROL +++ b/ports/tre/CONTROL @@ -1,3 +1,4 @@ Source: tre Version: 0.8.0-1 +Homepage: https://github.com/laurikari/tre Description: TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching. diff --git a/ports/treehopper/CONTROL b/ports/treehopper/CONTROL index 4435c6cce..f50e84f1b 100644 --- a/ports/treehopper/CONTROL +++ b/ports/treehopper/CONTROL @@ -1,3 +1,5 @@ Source: treehopper
-Version: 1.11.3-2
-Description: Treehopper connects the physical world to your computer, tablet, or smartphone. For more information, visit https://treehopper.io.
+Version: 1.11.3-3
+Description: Treehopper connects the physical world to your computer, tablet, or smartphone.
+Homepage: https://treehopper.io
+Build-Depends: libusb
diff --git a/ports/treehopper/portfile.cmake b/ports/treehopper/portfile.cmake index 68cf07bb9..46ed0d85e 100644 --- a/ports/treehopper/portfile.cmake +++ b/ports/treehopper/portfile.cmake @@ -16,8 +16,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/treehopper) +vcpkg_fixup_cmake_targets() file(INSTALL ${SOURCE_PATH}/C++/API/inc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/Treehopper/) diff --git a/ports/trompeloeil/CONTROL b/ports/trompeloeil/CONTROL index ee0305d51..135a473f3 100644 --- a/ports/trompeloeil/CONTROL +++ b/ports/trompeloeil/CONTROL @@ -1,4 +1,4 @@ Source: trompeloeil -Version: 34 +Version: 34-1 Description: A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0 - For issues/pull requests/questions visit https://github.com/rollbear/trompeloeil +Homepage: https://github.com/rollbear/trompeloeil diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake index db8367d22..03385928f 100644 --- a/ports/trompeloeil/portfile.cmake +++ b/ports/trompeloeil/portfile.cmake @@ -18,7 +18,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/trompeloeil TARGET_PATH share/trompeloeil) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/trompeloeil) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/tsl-hopscotch-map/CONTROL b/ports/tsl-hopscotch-map/CONTROL index 91f048054..5fe5d726a 100644 --- a/ports/tsl-hopscotch-map/CONTROL +++ b/ports/tsl-hopscotch-map/CONTROL @@ -1,3 +1,3 @@ Source: tsl-hopscotch-map -Version: 2.2.0 +Version: 2.2.1 Description: C++ implementation of a fast hash map and hash set using hopscotch hashing diff --git a/ports/tsl-hopscotch-map/portfile.cmake b/ports/tsl-hopscotch-map/portfile.cmake index 2542360a3..c96df35c6 100644 --- a/ports/tsl-hopscotch-map/portfile.cmake +++ b/ports/tsl-hopscotch-map/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/hopscotch-map - REF v2.2.0 - SHA512 a3cd0fe47ff16de6d556c24e0bd96e420c1f06f2e44388e4f223fd8cf30a6cf0af20ade46af46f8cb5bbfd86a0fce2ca65658999cc2c14f4998d949f12afff2f + REF v2.2.1 + SHA512 389fb09b6e47d8005d4a1b6c0db0c5f03de67686e9d4b97e473bf88f0c398d3118be0dcfdc5d509c082fd53f52f5d779d04c3d9bafe65c5eba11d03c62b60ddc ) vcpkg_configure_cmake( diff --git a/ports/tsl-ordered-map/CONTROL b/ports/tsl-ordered-map/CONTROL index 7595c53fc..bb2b75a9d 100644 --- a/ports/tsl-ordered-map/CONTROL +++ b/ports/tsl-ordered-map/CONTROL @@ -1,3 +1,3 @@ Source: tsl-ordered-map -Version: 0.8.0 +Version: 0.8.1 Description: C++ hash map and hash set which preserve the order of insertion diff --git a/ports/tsl-ordered-map/portfile.cmake b/ports/tsl-ordered-map/portfile.cmake index bfa4f0625..19940d270 100644 --- a/ports/tsl-ordered-map/portfile.cmake +++ b/ports/tsl-ordered-map/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/ordered-map - REF v0.8.0 - SHA512 9e0cc8ea4d5731e89cb6d58a54394b4ab0378cb2488d9e462ad80facd8aa06e21aaa0f9b969fbd7ac22c99bae09ab7c6e7980857784aa0b1a3a2b0c216ffa79a + REF v0.8.1 + SHA512 c776fc82c971ec507f12fa071c5831bbbf94a0351f7ae936f60b73b91be2a264737b606a6be7bae0cc6b971f01c619a78dad3072ac603b26a2a13836184a8f3a ) vcpkg_configure_cmake( diff --git a/ports/tsl-sparse-map/CONTROL b/ports/tsl-sparse-map/CONTROL index 31e08231c..627d5bea1 100644 --- a/ports/tsl-sparse-map/CONTROL +++ b/ports/tsl-sparse-map/CONTROL @@ -1,3 +1,3 @@ Source: tsl-sparse-map -Version: 0.6.0 +Version: 0.6.1 Description: C++ implementation of a memory efficient hash map and hash set diff --git a/ports/tsl-sparse-map/portfile.cmake b/ports/tsl-sparse-map/portfile.cmake index 6895d7c67..07d1f3048 100644 --- a/ports/tsl-sparse-map/portfile.cmake +++ b/ports/tsl-sparse-map/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/sparse-map - REF v0.6.0 - SHA512 6a21ebbd3505a0b4bf199f24ae9262395392964457eb26edb39fd7aa82aec7fc74468f7615977c74a2f36332850a68e1d6a6e86d487c3dff7efa2b081fa2c8c5 + REF v0.6.1 + SHA512 c77e7625a0ff13a538f1a8c96d3f70a178e9bedfb22592d6ca848e6d1e6b1566c9a216b2df68592c27308156b776677d52e0d75cf09254acb62f60a00a4bc054 ) vcpkg_configure_cmake( diff --git a/ports/umock-c/CONTROL b/ports/umock-c/CONTROL new file mode 100644 index 000000000..108a1dfd1 --- /dev/null +++ b/ports/umock-c/CONTROL @@ -0,0 +1,5 @@ +Source: umock-c +Version: 2019-05-16.1 +Description: A pure C mocking library +Build-Depends: azure-macro-utils-c + diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake new file mode 100644 index 000000000..0b30e8942 --- /dev/null +++ b/ports/umock-c/portfile.cmake @@ -0,0 +1,32 @@ +include(vcpkg_common_functions) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/umock-c + REF 92772d9d8317a37dd0b656e95877ffb03bc67e92 + SHA512 4dd738c7b2c7e1237ad874a7ad90bf81b864aa242af335dcc82d0cfea51bc33fe84de4eebedb6e00944c70d01d1ade4827716dbcf95754165b35981bde4147e7 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -Drun_unittests=OFF + -Drun_int_tests=OFF + -Duse_installed_dependencies=ON +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umock_c) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/umock-c/copyright COPYONLY) + +vcpkg_copy_pdbs() + + diff --git a/ports/unicorn-lib/CMakeLists.txt b/ports/unicorn-lib/CMakeLists.txt index b34e04f23..9a9c5825e 100644 --- a/ports/unicorn-lib/CMakeLists.txt +++ b/ports/unicorn-lib/CMakeLists.txt @@ -6,6 +6,10 @@ option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." find_path(RS_CORE_LIB_INCLUDE_DIR rs-core/common.hpp) #find_library(RW_UTILITIES_LIBRARY NAMES rw_utilities) +find_package(ZLIB REQUIRED) +find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d HINTS ${INSTALLED_LIB_PATH}) +find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 HINTS ${INSTALLED_LIB_PATH}) +select_library_configurations(PCRE2) file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp) foreach(ITR ${UNICORN_LIB_SOURCES}) @@ -24,7 +28,14 @@ target_compile_definitions( 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") endif() -install(TARGETS unicorn-lib DESTINATION lib)
\ No newline at end of file +install(TARGETS unicorn-lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + )
\ No newline at end of file diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL index a233474de..9da8c56e9 100644 --- a/ports/unicorn-lib/CONTROL +++ b/ports/unicorn-lib/CONTROL @@ -1,4 +1,5 @@ Source: unicorn-lib -Version: 2019-04-19 +Version: 2019-05-07-1 +Homepage: https://github.com/CaptainCrowbar/unicorn-lib Description: Unicode library for C++ by Ross Smith Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/portfile.cmake b/ports/unicorn-lib/portfile.cmake index fb301af4c..305d659ac 100644 --- a/ports/unicorn-lib/portfile.cmake +++ b/ports/unicorn-lib/portfile.cmake @@ -1,10 +1,15 @@ include(vcpkg_common_functions) +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + message("unicorn-lib is a static library, now build with static.") + set(VCPKG_LIBRARY_LINKAGE static) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CaptainCrowbar/unicorn-lib - REF c87e6b4394e543cf7fb45b0f8cdb289982bc180a - SHA512 3df368439b8c09c69fde78999d6b1b98675bc8488a78d7fea3f68e7ad61f6afb3cfca47cdc3b96ffd4b2e6f2cda11ca03a745c2129a5f9a5d58d9c46b0292c4a + REF 3e4e014bbf6fe24721a14c63f2a4f7ebfa401e7c + SHA512 f73f288fb50f9f727edfc84810a15f1fdde76df9030c4b0d5292351e84ec8cd6c8a7e670b2a62301a77521bf60ebcf1bf7c8c9d97ddb77385ed945b55075c927 HEAD_REF master ) @@ -20,5 +25,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/unicorn-lib RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/unicorn-lib RENAME copyright)
\ No newline at end of file diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL index 0753670c2..71a3bd18c 100644 --- a/ports/unicorn/CONTROL +++ b/ports/unicorn/CONTROL @@ -1,3 +1,4 @@ Source: unicorn Version: 2019-04-19 +Homepage: https://github.com/unicorn-engine/unicorn Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework diff --git a/ports/units/CONTROL b/ports/units/CONTROL index b66a3b828..21c7f44b1 100644 --- a/ports/units/CONTROL +++ b/ports/units/CONTROL @@ -1,3 +1,4 @@ Source: units Version: 2.3.0 +Homepage: https://github.com/nholthaus/units Description: A compile-time, header-only, dimensional analysis and unit conversion library built on c++14 with no dependencies. diff --git a/ports/unittest-cpp/CONTROL b/ports/unittest-cpp/CONTROL index 9279cd127..195b41fe4 100644 --- a/ports/unittest-cpp/CONTROL +++ b/ports/unittest-cpp/CONTROL @@ -1,3 +1,4 @@ Source: unittest-cpp
Version: 2.0.0-1
+Homepage: https://github.com/unittest-cpp/unittest-cpp
Description: A lightweight unit testing framework for C++
diff --git a/ports/unrar/CONTROL b/ports/unrar/CONTROL index 5e54ed37f..f105d84bc 100644 --- a/ports/unrar/CONTROL +++ b/ports/unrar/CONTROL @@ -1,3 +1,4 @@ Source: unrar
Version: 5.5.8-2
+Homepage: https://www.rarlab.com
Description: rarlab's unrar libary
diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL index 9e53e9b2f..d2399647f 100644 --- a/ports/urdfdom-headers/CONTROL +++ b/ports/urdfdom-headers/CONTROL @@ -1,3 +1,4 @@ Source: urdfdom-headers -Version: 1.0.2 +Version: 1.0.4-1 +Homepage: https://github.com/ros/urdfdom_headers Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF. diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake index 4a9d3d8c1..5f7430f76 100644 --- a/ports/urdfdom-headers/portfile.cmake +++ b/ports/urdfdom-headers/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom_headers - REF 1.0.2 - SHA512 902cf18b3ccc62dd5d732707e9ca2b8698f3307b8005d3858fcdd0e9585d580bbe5d2ec77c8c8bfa7b8776b870844368a8ec93b0f8a8d71420cf5015a99b8867 + REF 00c1c9c231e46b2300d04073ad696521758fa45c + SHA512 8622cfad074454ae34be3e77c37b201adeb0e348df251e1c2fd57f35ae24817bbd2880a9c465056976eb8815fda041ba2fbd70ccb7cac6efc5ed3d7a082e80ef HEAD_REF master ) @@ -16,9 +16,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake" TARGET_PATH share/urdfdom_headers) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/urdfdom_headers) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/urdfdom_headers/cmake" TARGET_PATH share/urdfdom_headers) + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/urdfdom_headers/cmake TARGET_PATH share/urdfdom_headers) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers) endif() diff --git a/ports/urdfdom/CONTROL b/ports/urdfdom/CONTROL index e4b627fa0..7420aaca6 100644 --- a/ports/urdfdom/CONTROL +++ b/ports/urdfdom/CONTROL @@ -1,4 +1,5 @@ Source: urdfdom
-Version: 1.0.0-3
+Version: 1.0.3-1
+Homepage: https://github.com/ros/urdfdom
Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.
Build-Depends: console-bridge, tinyxml, urdfdom-headers
diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index 73aead641..cf5b3220b 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom - REF 1.0.0 - SHA512 50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f + REF 1.0.3 + SHA512 240181d9c61dd7544f16a79a400d9a2c4dc0a682bef165b46529efcb4b31e2a34e27896933b60b9ddbaa5c4a8d575ebda42752599ff3b0a98d1eeef8f9b0b7a7 HEAD_REF master ) @@ -26,9 +26,9 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH "CMake" TARGET_PATH share/urdfdom) + vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/urdfdom/cmake" TARGET_PATH share/urdfdom) + 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) endif() diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL index b6a8cc5fe..af57f871a 100644 --- a/ports/uriparser/CONTROL +++ b/ports/uriparser/CONTROL @@ -1,3 +1,7 @@ Source: uriparser -Version: 0.9.2-1 +Version: 0.9.3-4 +Homepage: https://github.com/uriparser/uriparser Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C89 ("ANSI C"). uriparser is cross-platform, fast, supports Unicode, and is licensed under the New BSD license. + +Feature: tool +Description: Builds tools (e.g. CLI "uriparse") diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index b18492ff9..aafd0ae6a 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -3,25 +3,73 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uriparser/uriparser - REF uriparser-0.9.2 - SHA512 58c1c473b33a2a5ffa2b3eb02f527de0efea228d84e2189b764515c3b884b73f36bb8baf143b719cd43006ef23f116cd7b2368bf828fe3e5b839c674daf5ea3f + REF uriparser-0.9.3 + SHA512 5740e2405566c17c4467a677d83596d86398b64778ad2b5234e9390d8ab817d1b5231988d120b1d19b099788e38814825a438beed991e49b242b8a5de8c51d03 + HEAD_REF master ) +if("tool" IN_LIST FEATURES) + set(URIPARSER_BUILD_TOOLS ON) +else() + set(URIPARSER_BUILD_TOOLS OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DURIPARSER_BUILD_DOCS=OFF - -DURIPARSER_BUILD_TESTS=OFF - -DURIPARSER_BUILD_TOOLS=OFF + OPTIONS + -DURIPARSER_BUILD_DOCS=OFF + -DURIPARSER_BUILD_TESTS=OFF + OPTIONS_DEBUG + -DURIPARSER_BUILD_TOOLS=OFF + OPTIONS_RELEASE + -DURIPARSER_BUILD_TOOLS=${URIPARSER_BUILD_TOOLS} ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/uriparser-0.9.2") + vcpkg_copy_pdbs() +if(URIPARSER_BUILD_TOOLS) + if(CMAKE_HOST_WIN32) + set(EXECUTABLE_SUFFIX ".exe") + else() + set(EXECUTABLE_SUFFIX "") + endif() + + file(COPY ${CURRENT_PACKAGES_DIR}/bin/uriparse${EXECUTABLE_SUFFIX} + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/uriparse${EXECUTABLE_SUFFIX}) + endif() +endif() + +set(_package_version_re "#define[ ]+PACKAGE_VERSION[ ]+\"([0-9]+.[0-9]+.[0-9]+)\"") +file(STRINGS + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h" + _package_version_define REGEX "${_package_version_re}" +) +string(REGEX REPLACE "${_package_version_re}" "\\1" _package_version ${_package_version_define}) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}-${_package_version}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_replace_string( + ${CURRENT_PACKAGES_DIR}/include/uriparser/UriBase.h + "defined(URI_STATIC_BUILD)" + "1 // defined(URI_STATIC_BUILD)" + ) +endif() + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/uriparser RENAME copyright) # Remove duplicate info file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +# CMake integration test +vcpkg_test_cmake(PACKAGE_NAME ${PORT}) diff --git a/ports/usbmuxd/CONTROL b/ports/usbmuxd/CONTROL index 38e2b4b5b..a583aad3c 100644 --- a/ports/usbmuxd/CONTROL +++ b/ports/usbmuxd/CONTROL @@ -1,4 +1,4 @@ Source: usbmuxd
-Version: 1.1.1.133-2
+Version: 1.2.76 Description: A socket daemon to multiplex connections from and to iOS devices
-Build-Depends: libimobiledevice, libusb, libusb-win32, pthreads
\ No newline at end of file +Build-Depends: libimobiledevice, libusb, libusb-win32, pthreads
diff --git a/ports/usbmuxd/fix-dependence-pthreads.patch b/ports/usbmuxd/fix-dependence-pthreads.patch index 9a6187148..5ff4d8472 100644 --- a/ports/usbmuxd/fix-dependence-pthreads.patch +++ b/ports/usbmuxd/fix-dependence-pthreads.patch @@ -7,7 +7,7 @@ index d1d8a4d..086e8a4 100644 <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -16,7 +16,7 @@ index d1d8a4d..086e8a4 100644 <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3d.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -25,7 +25,7 @@ index d1d8a4d..086e8a4 100644 <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -34,7 +34,7 @@ index d1d8a4d..086e8a4 100644 <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadsVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC2.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>ws2_32.lib;libusb-1.0.lib;libusb0.lib;pthreadVC3.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/ports/usbmuxd/portfile.cmake b/ports/usbmuxd/portfile.cmake index 2ea2d568f..6f952633a 100644 --- a/ports/usbmuxd/portfile.cmake +++ b/ports/usbmuxd/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libimobiledevice-win32/usbmuxd
- REF 1.1.1.133
- SHA512 1a5f9abc239deeb15e2aab419ba9e88ef41ffa80396546fb65bc06b0f419cbabc80cdf95995caf71d5628d1537fb0329a73d923202e91ea43fcc7c32b840d047
+ REF v1.2.76 + SHA512 b1bb479bf4ba0a71d7b70f55db4d01b68e024fe559265947e096d85cd736e4cc23c9ddbe07360641b63a5e1276c243e7fe2aa557323d1f5d22058c9a45de4f1a
HEAD_REF master-msvc
PATCHES
fix-dependence-pthreads.patch
diff --git a/ports/usd/CONTROL b/ports/usd/CONTROL new file mode 100644 index 000000000..e04784de4 --- /dev/null +++ b/ports/usd/CONTROL @@ -0,0 +1,4 @@ +Source: usd +Version: 0.8.4-1 +Build-Depends: boost-assign, boost-crc, boost-date-time, boost-filesystem, boost-format, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-vmd, tbb, zlib +Description: Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications. diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake new file mode 100644 index 000000000..cada7b4e1 --- /dev/null +++ b/ports/usd/portfile.cmake @@ -0,0 +1,56 @@ +# Don't file if the bin folder exists. We need exe and custom files. +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PixarAnimationStudios/USD + REF v19.05 + SHA512 4d708835f6efd539d5fff5cbaf0ec4d68c6d0c4d813ee531c4b9589ee585b720c34e993ef0a7ad0104a921ebd7ab8dec46d0c9284ec7f11993057fe81d3729e0 + HEAD_REF master +) + +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) +vcpkg_add_to_path("${PYTHON2_DIR}") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPXR_BUILD_ALEMBIC_PLUGIN:BOOL=OFF + -DPXR_BUILD_EMBREE_PLUGIN:BOOL=OFF + -DPXR_BUILD_IMAGING:BOOL=OFF + -DPXR_BUILD_MAYA_PLUGIN:BOOL=OFF + -DPXR_BUILD_MONOLITHIC:BOOL=OFF + -DPXR_BUILD_TESTS:BOOL=OFF + -DPXR_BUILD_USD_IMAGING:BOOL=OFF + -DPXR_ENABLE_PYTHON_SUPPORT:BOOL=OFF +) + +vcpkg_install_cmake() + +file( + RENAME + "${CURRENT_PACKAGES_DIR}/pxrConfig.cmake" + "${CURRENT_PACKAGES_DIR}/cmake/pxrConfig.cmake") + +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +vcpkg_copy_pdbs() + +# Remove duplicates in debug folder +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +file( + COPY ${SOURCE_PATH}/LICENSE.txt + DESTINATION ${CURRENT_PACKAGES_DIR}/share/usd/copyright) + +# Move all dlls to bin +file(GLOB RELEASE_DLL ${CURRENT_PACKAGES_DIR}/lib/*.dll) +file(GLOB DEBUG_DLL ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) +foreach(CURRENT_FROM ${RELEASE_DLL} ${DEBUG_DLL}) + string(REPLACE "/lib/" "/bin/" CURRENT_TO ${CURRENT_FROM}) + file(RENAME ${CURRENT_FROM} ${CURRENT_TO}) +endforeach() diff --git a/ports/utf8proc/CONTROL b/ports/utf8proc/CONTROL index 84acd8986..4afe2da7c 100644 --- a/ports/utf8proc/CONTROL +++ b/ports/utf8proc/CONTROL @@ -1,3 +1,4 @@ Source: utf8proc -Version: 2.1.0-1 +Version: 2.4.0 +Homepage: https://github.com/JuliaLang/utf8proc Description: Clean C library for processing UTF-8 Unicode data. diff --git a/ports/utf8proc/portfile.cmake b/ports/utf8proc/portfile.cmake index 64244ec03..113f4d6d8 100644 --- a/ports/utf8proc/portfile.cmake +++ b/ports/utf8proc/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JuliaLang/utf8proc - REF v2.1.0 - SHA512 72b7f377fa6a62018d3eeab8723a27e25db3d1f794ae0bf21fff62ec1a7439bec52e7c93d2a00c218de6ff518097fb4a7a87c56e61ba8c98e689aa8f7171c812) + REF v2.4.0 + SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a) vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-buildsystem.patch) diff --git a/ports/utfcpp/CONTROL b/ports/utfcpp/CONTROL index 9af6bb441..fd1872241 100644 --- a/ports/utfcpp/CONTROL +++ b/ports/utfcpp/CONTROL @@ -1,3 +1,4 @@ Source: utfcpp
-Version: 2.3.5-1
+Version: 3.1
+Homepage: https://github.com/nemtrif/utfcpp
Description: UTF-8 with C++ in a Portable Way
diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index e4b57cff0..bbbfe663f 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemtrif/utfcpp - REF v2.3.5 - SHA512 d5e672de952b78a78a8af0c81664f15667b30558fd406a9abc72c14dc444e0869e7c02cb66fa017ec0e760c0fb23c3e923a4b171c2acb3ed7b71612783e789ee + REF v3.1 + SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5 HEAD_REF master ) diff --git a/ports/utfz/CONTROL b/ports/utfz/CONTROL index fd1854467..1212c4d6d 100644 --- a/ports/utfz/CONTROL +++ b/ports/utfz/CONTROL @@ -1,3 +1,4 @@ Source: utfz Version: 1.2-1 +Homepage: https://github.com/IMQS/utfz Description: A tiny C++ library for parsing and encoding utf-8 diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL index 605f15071..972c6741b 100644 --- a/ports/uvatlas/CONTROL +++ b/ports/uvatlas/CONTROL @@ -1,3 +1,4 @@ Source: uvatlas
-Version: sept2016-1
+Version: apr2019
+Homepage: https://github.com/Microsoft/UVAtlas
Description: UVAtlas isochart texture atlas
\ No newline at end of file diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index e1a1a189f..df0d322b3 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF sept2016 - SHA512 326af26c151620cd5082daf3913cf3fbe7bca7d1aaf5cc44cacff54319ffe79b728c24519187c3f9393a846430d0fb9493ffe9473f87d220f5c9ae7dab73f69f + REF 8309d95904d3a8f3559d73e07f3a0472f161c28b + SHA512 e0031812824f179dffdec487b2e70fc80748a722c4bccf67a7e0bd865700b6e61e1f14160557a1a797a84a9e7cc559f5e66bd8cabd5da4728ee479e4247d9aa2 HEAD_REF master ) @@ -48,5 +48,5 @@ file(INSTALL DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) # Handle copyright -file(COPY ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/MIT.txt ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright) +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvatlas) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/uvatlas/LICENSE ${CURRENT_PACKAGES_DIR}/share/uvatlas/copyright) diff --git a/ports/uvw/CONTROL b/ports/uvw/CONTROL index 59926f1a9..a3507632b 100644 --- a/ports/uvw/CONTROL +++ b/ports/uvw/CONTROL @@ -1,4 +1,5 @@ Source: uvw -Version: 1.15.0 -Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++. <https://github.com/skypjack/uvw> +Version: 1.17.0_libuv-v1.29-1 +Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++. +Homepage: https://github.com/skypjack/uvw Build-Depends: libuv diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake index 0fca53590..ba640b597 100644 --- a/ports/uvw/portfile.cmake +++ b/ports/uvw/portfile.cmake @@ -4,8 +4,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/uvw - REF v1.15.0_libuv-v1.27 - SHA512 acf1f1bdbc34ec5d040514ca08c99ee05b5bbb112828a4acf5f4c50e1910d2c74864a0793d4087b7a4a0704dd2ba1a973f65cee032fffea9247009be9cd0243c + REF v1.17.0_libuv-v1.29 + SHA512 2e3ee6e55950185e1889c99b07d63d811d89ad20705253ad699a828073f5ea7860616e0ae980232c7819d3fd21a4cb7a2e9d084fd8c4f40b19951106f08b9ad0 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -13,13 +13,11 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA ) + vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw/) -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/uvw") -file(INSTALL - ${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw/ -) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright/readme/package files diff --git a/ports/uwebsockets/CONTROL b/ports/uwebsockets/CONTROL index daf53b28b..663538f96 100644 --- a/ports/uwebsockets/CONTROL +++ b/ports/uwebsockets/CONTROL @@ -1,4 +1,5 @@ Source: uwebsockets Version: 0.15.6 Build-Depends: zlib, usockets +Homepage: https://github.com/uWebSockets/uWebSockets Description: Simple, secure & standards compliant web I/O for the most demanding of applications diff --git a/ports/valijson/CONTROL b/ports/valijson/CONTROL new file mode 100644 index 000000000..4ea2b5d1e --- /dev/null +++ b/ports/valijson/CONTROL @@ -0,0 +1,3 @@ +Source: valijson +Version: 2018-11-17 +Description: Header-only C++ library for JSON Schema validation
\ No newline at end of file diff --git a/ports/valijson/fix-nlohmann-json.patch b/ports/valijson/fix-nlohmann-json.patch new file mode 100644 index 000000000..7465837d5 --- /dev/null +++ b/ports/valijson/fix-nlohmann-json.patch @@ -0,0 +1,26 @@ +diff --git a/include/valijson/adapters/nlohmann_json_adapter.hpp b/include/valijson/adapters/nlohmann_json_adapter.hpp +index f77a2bf..3f6fb5f 100644 +--- a/include/valijson/adapters/nlohmann_json_adapter.hpp ++++ b/include/valijson/adapters/nlohmann_json_adapter.hpp +@@ -28,7 +28,7 @@ + #define __VALIJSON_ADAPTERS_NLOHMANN_JSON_ADAPTER_HPP + + #include <string> +-#include <json.hpp> ++#include <nlohmann/json.hpp> + + #include <valijson/adapters/adapter.hpp> + #include <valijson/adapters/basic_adapter.hpp> +diff --git a/include/valijson/utils/nlohmann_json_utils.hpp b/include/valijson/utils/nlohmann_json_utils.hpp +index 01838d8..4a5b5e4 100644 +--- a/include/valijson/utils/nlohmann_json_utils.hpp ++++ b/include/valijson/utils/nlohmann_json_utils.hpp +@@ -4,7 +4,7 @@ + + #include <iostream> + +-#include <json.hpp> ++#include <nlohmann/json.hpp> + #include <valijson/utils/file_utils.hpp> + + namespace valijson { diff --git a/ports/valijson/fix-optional.patch b/ports/valijson/fix-optional.patch new file mode 100644 index 000000000..5ce75843c --- /dev/null +++ b/ports/valijson/fix-optional.patch @@ -0,0 +1,13 @@ +diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp +index 8ff285c..84e9fd6 100644 +--- a/include/valijson/internal/optional.hpp ++++ b/include/valijson/internal/optional.hpp +@@ -11,7 +11,7 @@ namespace opt = std; + # endif + # endif + #else +-# include <compat/optional.hpp> ++# include <valijson/compat/optional.hpp> + namespace opt = std::experimental; + #endif + diff --git a/ports/valijson/fix-picojson.patch b/ports/valijson/fix-picojson.patch new file mode 100644 index 000000000..bb1b4d51b --- /dev/null +++ b/ports/valijson/fix-picojson.patch @@ -0,0 +1,26 @@ +diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp +index b6d17c9..6d04c52 100644 +--- a/include/valijson/adapters/picojson_adapter.hpp ++++ b/include/valijson/adapters/picojson_adapter.hpp +@@ -29,7 +29,7 @@ + + #include <string> + +-#include <picojson.h> ++#include <picojson/picojson.h> + + #include <valijson/adapters/adapter.hpp> + #include <valijson/adapters/basic_adapter.hpp> +diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp +index 2ca4d46..b983648 100644 +--- a/include/valijson/utils/picojson_utils.hpp ++++ b/include/valijson/utils/picojson_utils.hpp +@@ -4,7 +4,7 @@ + + #include <iostream> + +-#include <picojson.h> ++#include <picojson/picojson.h> + + #include <valijson/utils/file_utils.hpp> + diff --git a/ports/valijson/portfile.cmake b/ports/valijson/portfile.cmake new file mode 100644 index 000000000..6c0b84530 --- /dev/null +++ b/ports/valijson/portfile.cmake @@ -0,0 +1,28 @@ +#header-only library +include(vcpkg_common_functions) + +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/valijson) + +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO tristanpenman/valijson + REF dd084d747448bb56ddfeab5946b4f2f4617b99c4 + SHA512 ee241eefc816360608f86792a4c25abadea79cbffc94d7e31a2dbd0a483ed4d7a303b6d2410b99ab7694e58a3d299f0df0baa52fa16f89e9233d90b190a4d799 + HEAD_REF master + PATCHES fix-nlohmann-json.patch + fix-picojson.patch + fix-optional.patch +) + +# Copy the header files +file(GLOB HEADER_FILES ${SOURCE_PATH}/include/valijson/*) +file(COPY ${HEADER_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson + REGEX "\.(gitattributes|gitignore)$" EXCLUDE) + +file(COPY ${SOURCE_PATH}/include/compat/optional.hpp + DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/valijson) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/valijson/LICENSE ${CURRENT_PACKAGES_DIR}/share/valijson/copyright)
\ No newline at end of file diff --git a/ports/variant-lite/CONTROL b/ports/variant-lite/CONTROL new file mode 100644 index 000000000..8654b8a34 --- /dev/null +++ b/ports/variant-lite/CONTROL @@ -0,0 +1,3 @@ +Source: variant-lite
+Version: 1.2.2
+Description: A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library
diff --git a/ports/variant-lite/portfile.cmake b/ports/variant-lite/portfile.cmake new file mode 100644 index 000000000..764fd74ef --- /dev/null +++ b/ports/variant-lite/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO martinmoene/variant-lite
+ REF v1.2.2
+ SHA512 f0a0760b858d5fdd3cbd6be29e64fdca69222c4e3f6f4f856fa99e7352ede817648c6d698ebde25dec10bf99fc304b1b5ce232c5ffd4fab12aaf444b68c04f02
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DVARIANT_LITE_OPT_BUILD_TESTS=OFF
+ -DVARIANT_LITE_OPT_BUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(
+ CONFIG_PATH lib/cmake/${PORT}
+)
+
+file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug
+ ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(INSTALL
+ ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+)
diff --git a/ports/visit-struct/CMakeLists.txt b/ports/visit-struct/CMakeLists.txt new file mode 100644 index 000000000..df4fa2890 --- /dev/null +++ b/ports/visit-struct/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.11) +project(visit_struct) + +add_library(visit_struct INTERFACE) + +install(TARGETS visit_struct + EXPORT visit_struct-targets + INCLUDES DESTINATION include) + +install(EXPORT visit_struct-targets + FILE visit_struct-config.cmake + NAMESPACE visit_struct:: + DESTINATION share/visit_struct) + +install(DIRECTORY + include/visit_struct + DESTINATION include) diff --git a/ports/visit-struct/CONTROL b/ports/visit-struct/CONTROL new file mode 100644 index 000000000..bf895349d --- /dev/null +++ b/ports/visit-struct/CONTROL @@ -0,0 +1,3 @@ +Source: visit-struct +Version: 1.0-1 +Description: A header-only library providing structure visitors for C++11 and C++14 diff --git a/ports/visit-struct/portfile.cmake b/ports/visit-struct/portfile.cmake new file mode 100644 index 000000000..8a87471c5 --- /dev/null +++ b/ports/visit-struct/portfile.cmake @@ -0,0 +1,27 @@ +#header-only library +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cbeck88/visit_struct + REF v1.0 + SHA512 1396d0d4c4d37f48434361d1e0ab4cb02c397aff1134678b26de713a27a4fcfa1c352890845502be645ba01e20314bf67731893fc6410b93e4521c1261d63c06 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH share/visit_struct TARGET_PATH share/visit_struct) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + RENAME copyright) +file(INSTALL ${SOURCE_PATH}/README.md + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/vlpp/CMakeLists.txt b/ports/vlpp/CMakeLists.txt index d5fec60c4..f8df1b338 100644 --- a/ports/vlpp/CMakeLists.txt +++ b/ports/vlpp/CMakeLists.txt @@ -1,12 +1,13 @@ cmake_minimum_required(VERSION 3.3.0) -project(Vlpp VERSION 0.9.3.1 LANGUAGES CXX) +project(Vlpp VERSION 0.10.0.0 LANGUAGES CXX) # Sources set(SRCS Import/Vlpp.cpp - Import/VlppWorkflow.cpp - Import/VlppWorkflowCompiler.cpp) + Import/VlppWorkflowLibrary.cpp + Import/VlppWorkflowCompiler.cpp + Import/VlppWorkflowRuntime.cpp) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") @@ -33,8 +34,9 @@ if (NOT DEFINED SKIP_HEADERS) install( FILES Import/Vlpp.h - Import/VlppWorkflow.h + Import/VlppWorkflowLibrary.h Import/VlppWorkflowCompiler.h + Import/VlppWorkflowRuntime.h DESTINATION "include" ) endif() diff --git a/ports/vlpp/CONTROL b/ports/vlpp/CONTROL index 680cd2b28..bd453ffc2 100644 --- a/ports/vlpp/CONTROL +++ b/ports/vlpp/CONTROL @@ -1,3 +1,4 @@ Source: vlpp
-Version: 0.9.3.1-2
+Version: 0.10.0.0
+Homepage: https://github.com/vczh-libraries/Release
Description: Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc
diff --git a/ports/vlpp/portfile.cmake b/ports/vlpp/portfile.cmake index a54bdfe04..4b44ea53e 100644 --- a/ports/vlpp/portfile.cmake +++ b/ports/vlpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vczh-libraries/Release - REF 0.9.3.1 - SHA512 f284d3c78f8ae54102457b2cdc4fcee4b8da9a72d13bb325c7c7269261c5b0789eeb7340b0409b2b37294d68edb558503be131948aea3cb53582900339d26b54 + REF 579f51f5b30197386ccadcf0f3e0a3159ef3602f + SHA512 89cd5c86d04bc393180846c10e1122d01cd4d3ad041ca7e9199341bdc758903edf7b892a424a3b90aa2753bfede230ff3434cefd7f2fefefafa7959f5b8660d4 HEAD_REF master ) diff --git a/ports/vtk-dicom/CONTROL b/ports/vtk-dicom/CONTROL index fdd8e04d3..4d6a1df30 100644 --- a/ports/vtk-dicom/CONTROL +++ b/ports/vtk-dicom/CONTROL @@ -1,8 +1,8 @@ Source: vtk-dicom
-Version: 0.8.8-alpha-1
+Version: 0.8.9 Description: DICOM for VTK
Build-Depends: vtk, zlib
Feature: gdcm
Description: Use gdcm for decompressing DICOM files.
-Build-Depends: gdcm2
+Build-Depends: gdcm
diff --git a/ports/vtk-dicom/portfile.cmake b/ports/vtk-dicom/portfile.cmake index e7f5c65aa..dd890ec26 100644 --- a/ports/vtk-dicom/portfile.cmake +++ b/ports/vtk-dicom/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO dgobbi/vtk-dicom
- REF ca27801fad6356c98ba19e760b9b4b8e9128f60e
- SHA512 d4916fa385e6f26da0a5d7eb981497c9121ff4f67b4b03e518aa4974d2b0ef207168e939e5063e705c15f627ace56e39aca5f5891d333924cbc80c9277aa7dd2
+ REF v0.8.9 + SHA512 f75295a25896b4d571e9d9bb04fbedbd8bcf5e12637d17b6eadceda296fc105decb44c6cb09f1d69daf17093bb61cdb8909fcde347137f30eb6b8b2b298ff065
HEAD_REF master
)
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 0625a3ac1..7b07132d2 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,6 +1,7 @@ Source: vtk -Version: 8.2.0-2 +Version: 8.2.0-4 Description: Software system for 3D computer graphics, image processing, and visualization +Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c Feature: openvr diff --git a/ports/vtk/hdf5_static.patch b/ports/vtk/hdf5_static.patch new file mode 100644 index 000000000..52ade3f08 --- /dev/null +++ b/ports/vtk/hdf5_static.patch @@ -0,0 +1,22 @@ +diff --git a/CMake/FindHDF5.cmake b/CMake/FindHDF5.cmake +index 6d558e39..c301e165 100644 +--- a/CMake/FindHDF5.cmake ++++ b/CMake/FindHDF5.cmake +@@ -8,7 +8,16 @@ if(CMAKE_VERSION VERSION_LESS 3.6.1) + else() + include(${CMAKE_ROOT}/Modules/FindHDF5.cmake) + endif() +- ++#It would be better if VTK would actually use HDF5 & SZIP targets. ++#But current module load order is wrong which will lead to the target being used before it is defined! ++if("${HDF5_LIBRARIES}" MATCHES "libhdf5") ++ find_library(SZIP_LIBRARY_RELEASE NAMES sz libsz szip libszip NAMES_PER_DIR) ++ find_library(SZIP_LIBRARY_DEBUG NAMES sz_d libsz_d szip_d libszip_d NAMES_PER_DIR) ++ select_library_configurations(SZIP) ++ list(APPEND HDF5_LIBRARIES "${SZIP_LIBRARIES}") ++ find_package(ZLIB) ++ list(APPEND HDF5_LIBRARIES "${ZLIB_LIBRARIES}") ++endif() + if(HDF5_FOUND AND (HDF5_IS_PARALLEL OR HDF5_ENABLE_PARALLEL)) + include(vtkMPI) + if(MPI_C_INCLUDE_PATH) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 536a81141..69d2ddd2a 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -48,6 +48,7 @@ vcpkg_from_github( fix-find-lz4.patch fix_ogg_linkage.patch fix-pugixml-link.patch + hdf5_static.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, @@ -57,6 +58,7 @@ vcpkg_from_github( # so we provide an own one. file(REMOVE ${SOURCE_PATH}/CMake/FindGLEW.cmake) file(REMOVE ${SOURCE_PATH}/CMake/FindPythonLibs.cmake) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CMake) # ============================================================================= diff --git a/ports/vulkan-hpp/CONTROL b/ports/vulkan-hpp/CONTROL new file mode 100644 index 000000000..95b59f3f8 --- /dev/null +++ b/ports/vulkan-hpp/CONTROL @@ -0,0 +1,4 @@ +Source: vulkan-hpp +Version: 2019-05-11 +Description: Header only C++ bindings for the Vulkan C API +Build-Depends: vulkan diff --git a/ports/vulkan-hpp/portfile.cmake b/ports/vulkan-hpp/portfile.cmake new file mode 100644 index 000000000..809b8149c --- /dev/null +++ b/ports/vulkan-hpp/portfile.cmake @@ -0,0 +1,16 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/Vulkan-Hpp + REF 5ce8ae7fd0d9c0543d02f33cfa8a66e6a43e2150 + SHA512 dc58332f5075f0b4d001abd4e78664be099509b8cee525a211aa33599f2351bf5e200fef37dccc84895d8f7a056f075ae3cf404f9aac7281970ff903e4a67a96 + HEAD_REF master +) + +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) diff --git a/ports/vulkan-memory-allocator/CONTROL b/ports/vulkan-memory-allocator/CONTROL index ec6c0757a..ac18202c2 100644 --- a/ports/vulkan-memory-allocator/CONTROL +++ b/ports/vulkan-memory-allocator/CONTROL @@ -1,3 +1,3 @@ Source: vulkan-memory-allocator
-Version: 2.1.0-1
+Version: 2.2.0 Description: Easy to integrate Vulkan memory allocation library from GPUOpen
diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake index c72af8935..5bbdeda15 100644 --- a/ports/vulkan-memory-allocator/portfile.cmake +++ b/ports/vulkan-memory-allocator/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
- REF v2.1.0
- SHA512 4d7d431d52503d4d448a8b571935678a8a04d8f4a7eceb6ad49cde4f78954e7a2a0a91e48c75382699a62d81cf00601aaa0a358d979ed8e14741a9956484b51e
+ REF v2.2.0 + SHA512 85b49a1c55f469fd7340075809b045507db162b7dc663b885d963e3b3fd17759608401d353d3460f2ebf771e97f89af46e409cf9f5186325c3ce2c68d9b7e08f
HEAD_REF master
)
diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL index 84fcd2bd1..a24672f83 100644 --- a/ports/vxl/CONTROL +++ b/ports/vxl/CONTROL @@ -1,5 +1,8 @@ Source: vxl -Version: v1.18.0-3 -Build-Depends: bzip2, libgeotiff, libjpeg-turbo, libpng, tiff, zlib, expat, shapelib -# Build-Depends: bzip2, dcmtk, libgeotiff, libjpeg-turbo, openjpeg, libpng, tiff, zlib +Version: v1.18.0-4 +Build-Depends: bzip2, expat, libgeotiff, libjpeg-turbo, libpng, shapelib, tiff, zlib +# Build-Depends: bzip2, dcmtk, expat, libgeotiff, libjpeg-turbo, openjpeg, libpng, shapelib, tiff, zlib Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding. + +Feature: core_imaging +Description: core_imaging support for vxl diff --git a/ports/vxl/fix_dependency.patch b/ports/vxl/fix_dependency.patch new file mode 100644 index 000000000..1c8e2ad54 --- /dev/null +++ b/ports/vxl/fix_dependency.patch @@ -0,0 +1,13 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index b6af7c2..7ca75d3 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -100,7 +100,7 @@ endif() + + + # coordinate systems +-if(BUILD_CORE_GEOMETRY AND BUILD_CORE_NUMERICS) ++if(BUILD_CORE_GEOMETRY AND BUILD_CORE_NUMERICS AND BUILD_CORE_IMAGING) + add_subdirectory(vcsl) + add_subdirectory(vpgl) + endif() diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 9735f144b..ea61e081e 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -1,7 +1,12 @@ include(vcpkg_common_functions) -if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h") - message(FATAL_ERROR "Can't build VXL with non built-in OpenJpeg in current version. Please remove OpenJpeg, and try install VXL again.") +set(BUILD_CORE_IMAGING OFF) +if("core_imaging" IN_LIST FEATURES) + set(BUILD_CORE_IMAGING ON) + if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openjpeg.h") + set(BUILD_CORE_IMAGING OFF) + message(WARNING "Can't build VXL CORE_IMAGING features with non built-in OpenJpeg. Please remove OpenJpeg, and try install VXL again if you need them.") + endif() endif() vcpkg_from_github( @@ -10,6 +15,8 @@ vcpkg_from_github( REF v1.18.0 SHA512 6666d647b2e7010b91cb0b05016b5f49ae46d198f6bd160fe13fc09bc674eff5b937331fa11d81a8496473968b63452d950eee4fc2512152af57304a14bed63f HEAD_REF master + PATCHES + fix_dependency.patch ) set(USE_WIN_WCHAR_T OFF) @@ -23,6 +30,7 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF + -DBUILD_CORE_IMAGING=${BUILD_CORE_IMAGING} -DVXL_FORCE_V3P_BZLIB2=OFF -DVXL_USING_NATIVE_BZLIB2=TRUE # for disable build built-in bzip2 (v3p/bzlib/CMakeLists.txt#L10-L26) -DVXL_FORCE_V3P_CLIPPER=ON # TODO : need add clipper port to turn off @@ -48,4 +56,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/core/vxl_copyright.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -#
\ No newline at end of file +# diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL index 9b1b4d3e0..2597d8afd 100644 --- a/ports/wangle/CONTROL +++ b/ports/wangle/CONTROL @@ -1,4 +1,4 @@ Source: wangle
-Version: 2019.01.07.00-2
-Build-Depends: fizz, folly, openssl, gtest, glog, libevent, double-conversion
+Version: 2019.05.20.00-1
+Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context
Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.
diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch index 3a7698218..13b85b037 100644 --- a/ports/wangle/build.patch +++ b/ports/wangle/build.patch @@ -1,24 +1,8 @@ diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt -index dd348b0..4e84a15 100644 +index 15dc8b6..ed8c79b 100644 --- a/wangle/CMakeLists.txt +++ b/wangle/CMakeLists.txt -@@ -39,11 +39,12 @@ endif() - find_package(fizz CONFIG REQUIRED) - find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context) - find_package(OpenSSL REQUIRED) --find_package(Glog REQUIRED) --find_package(Gflags REQUIRED) --find_package(Libevent REQUIRED) -+find_package(Glog CONFIG REQUIRED) -+find_package(Gflags CONFIG REQUIRED) -+find_package(Libevent CONFIG REQUIRED) - find_package(DoubleConversion REQUIRED) - find_package(Threads REQUIRED) -+find_package(ZLIB REQUIRED) - if (UNIX AND NOT APPLE) - find_package(Librt) - endif() -@@ -124,6 +125,7 @@ target_include_directories( +@@ -123,6 +123,7 @@ target_include_directories( PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..> $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}> diff --git a/ports/wangle/gflags.patch b/ports/wangle/gflags.patch deleted file mode 100644 index 20921c72c..000000000 --- a/ports/wangle/gflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/wangle/cmake/FindGflags.cmake b/wangle/cmake/FindGflags.cmake
-index 0243aa3..be3780f 100644
---- a/wangle/cmake/FindGflags.cmake
-+++ b/wangle/cmake/FindGflags.cmake
-@@ -7,19 +7,11 @@
-
- include(FindPackageHandleStandardArgs)
-
--find_library(GFLAGS_LIBRARY gflags
-- PATHS ${GFLAGS_LIBRARYDIR})
-+find_package(gflags CONFIG REQUIRED)
-
--find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h
-- PATHS ${GFLAGS_INCLUDEDIR})
--
--find_package_handle_standard_args(gflags DEFAULT_MSG
-- GFLAGS_LIBRARY
-- GFLAGS_INCLUDE_DIR)
--
--mark_as_advanced(
-- GFLAGS_LIBRARY
-- GFLAGS_INCLUDE_DIR)
--
--set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY})
--set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})
-+if(TARGET gflags_static)
-+ set(GFLAGS_LIBRARIES gflags_static)
-+else()
-+ set(GFLAGS_LIBRARIES gflags_shared)
-+endif()
-+set(GFLAGS_INCLUDE_DIRS)
diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index b9761c633..2ae73025a 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -5,12 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/wangle
- REF v2019.01.07.00
- SHA512 1b4771d92b45fd5e9622985321cfd608510ea13d2f4cb03a4842c52d7253a1b460f825746a315ef0df3b2e37e56abddb5b493b80d383ba327fdbf7294bae193e
+ REF 19300a75c27759339c44cf06ecedf7ab00703e8b
+ SHA512 cc9a5a956862e9d4321df7c0394fbb877c5f0b0f8eae1da6aad88239a2cc0b4cd694bd25e0f70f3da8a24c34f4f035bcfb53919fd99634219e0816c78477cee2
HEAD_REF master
PATCHES
build.patch
- gflags.patch
fix-config-cmake.patch
)
# message(FATAL_ERROR "patch")
@@ -20,14 +19,21 @@ vcpkg_configure_cmake( 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_fixup_cmake_targets(CONFIG_PATH lib/cmake/wangle)
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake _contents)
+STRING(REPLACE "\${_IMPORT_PREFIX}/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+STRING(REPLACE "\${_IMPORT_PREFIX}/debug/lib/" "\${_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/wangle/wangle-targets.cmake "${_contents}")
+
vcpkg_copy_pdbs()
-file(REMOVE_RECURSE
+file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/include/wangle/util/test
${CURRENT_PACKAGES_DIR}/include/wangle/ssl/test/certs
diff --git a/ports/wangle/usage b/ports/wangle/usage index 768ff2d64..50903e726 100644 --- a/ports/wangle/usage +++ b/ports/wangle/usage @@ -2,4 +2,3 @@ The package wangle is compatible with built-in CMake targets: find_package(wangle REQUIRED) target_link_libraries(main PRIVATE wangle::wangle) - target_include_directories(main PRIVATE ${WANGLE_INCLUDE_DIR}) diff --git a/ports/wavpack/CONTROL b/ports/wavpack/CONTROL index 80fb66b96..7b169e060 100644 --- a/ports/wavpack/CONTROL +++ b/ports/wavpack/CONTROL @@ -1,3 +1,3 @@ Source: wavpack
-Version: 5.1.0-00d9a4a
+Version: 5.1.0-00d9a4a-1
Description: WavPack encode/decode library, command-line programs, and several plugins
diff --git a/ports/wavpack/OpenSSL.patch b/ports/wavpack/OpenSSL.patch new file mode 100644 index 000000000..6d8e956ad --- /dev/null +++ b/ports/wavpack/OpenSSL.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 70e1043f..d8cb8b10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -208,7 +208,7 @@ target_include_directories(wavpack + target_link_libraries(wavpack + PRIVATE + $<$<BOOL:${HAVE_LIBM}>:m> +- $<$<BOOL:${WAVPACK_ENABLE_LIBCRYPTO}>:${OPENSSL_CRYPTO_LIBRARY}> ++ $<$<BOOL:${WAVPACK_ENABLE_LIBCRYPTO}>:OpenSSL::Crypto> + ) + target_compile_definitions(wavpack + PRIVATE diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index 1594f7249..db2df1cde 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -19,6 +19,8 @@ vcpkg_from_github( REF 00d9a4ac58a52b52495736be614cb06ba102663c
SHA512 a0d08ac2ff46bd4cc606626c8e0da18a83392722a2e40df18f9e40710e5e147c0a24800174bfdf42ed7a12be4d9679f6302c51d8409724d31ca2a29ab4972481
HEAD_REF master
+ PATCHES
+ OpenSSL.patch
)
vcpkg_configure_cmake(
diff --git a/ports/websocketpp/CONTROL b/ports/websocketpp/CONTROL index 5c7457a2a..4a284f09e 100644 --- a/ports/websocketpp/CONTROL +++ b/ports/websocketpp/CONTROL @@ -1,4 +1,5 @@ Source: websocketpp -Version: 0.8.1 +Version: 0.8.1-1 Build-Depends: zlib, openssl, boost-asio +Homepage: https://github.com/zaphoyd/websocketpp Description: Library that implements RFC6455 The WebSocket Protocol
\ No newline at end of file diff --git a/ports/websocketpp/openssl_110.patch b/ports/websocketpp/openssl_110.patch deleted file mode 100644 index 93f4302e0..000000000 --- a/ports/websocketpp/openssl_110.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index 7b32db8..37173b7 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -355,7 +355,13 @@ protected: - template <typename ErrorCodeType> - lib::error_code translate_ec(ErrorCodeType ec) { - if (ec.category() == lib::asio::error::get_ssl_category()) { -- if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) { -+ if ( -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ -+#else -+ false -+#endif -+ ) { - return make_error_code(transport::error::tls_short_read); - } else { - // We know it is a TLS related error, but otherwise don't know diff --git a/ports/websocketpp/portfile.cmake b/ports/websocketpp/portfile.cmake index 35514259c..2da84ba26 100644 --- a/ports/websocketpp/portfile.cmake +++ b/ports/websocketpp/portfile.cmake @@ -4,11 +4,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zaphoyd/websocketpp - REF 0.8.1 - SHA512 35e0261ed0285acf77d300768819bd380197de8acdf68223e2d7598481b9bfd69cb1653b435139771b1db6c16530c8d8cf9a887a8a6bba3fea126d0da4dbc13c + REF 1c699ce46843a787482a703fdeff9271fbb7bb5d + SHA512 9de30e02e09b066dca8d840963e78673ef118e5183f9638b8a5c941116422916fe9fe02bb5271843aeb292a460f159b5957887594c0824a88600e6c4a5620dbd HEAD_REF master - PATCHES - openssl_110.patch ) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/websocketpp) diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL new file mode 100644 index 000000000..8b589c8af --- /dev/null +++ b/ports/wil/CONTROL @@ -0,0 +1,3 @@ +Source: wil
+Version: 2019-06-10
+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.
\ No newline at end of file diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake new file mode 100644 index 000000000..c54e097ca --- /dev/null +++ b/ports/wil/portfile.cmake @@ -0,0 +1,13 @@ +#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO Microsoft/wil
+ REF 607e3c44797e18ae050907114601a31883489254
+ SHA512 78d14f48a0d6629d72b6007e20ce4a14855667d0f9f8240b66a8cc135e079fca97926db6fc18852cd932f80b1b5a55c08cb48ca999fa9327f7e9c0586ea3ecc7
+ HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wil RENAME copyright)
\ No newline at end of file diff --git a/ports/wildmidi/CONTROL b/ports/wildmidi/CONTROL index 0f374d6dd..35e0bfffc 100644 --- a/ports/wildmidi/CONTROL +++ b/ports/wildmidi/CONTROL @@ -1,3 +1,4 @@ Source: wildmidi
-Version: 0.4.1-1
+Version: 0.4.3
+Homepage: https://github.com/Mindwerks/wildmidi
Description: MIDI software synthesizer library.
diff --git a/ports/wildmidi/portfile.cmake b/ports/wildmidi/portfile.cmake index 6c4868771..d3765f790 100644 --- a/ports/wildmidi/portfile.cmake +++ b/ports/wildmidi/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Mindwerks/wildmidi - REF wildmidi-0.4.1 - SHA512 ac95b901d2eca88118d70ec5f8ddb4a52ed9ffbd90ae1c8837352d22e27da0d5f56e4e79615cbac9683303b3488a9fa45b60d77e28f698277f1e4c3fc9e3d165 + REF wildmidi-0.4.3 + SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f HEAD_REF master PATCHES 0001-add-install-target.patch diff --git a/ports/winpcap/CONTROL b/ports/winpcap/CONTROL index 1454948d2..ddddcab1c 100644 --- a/ports/winpcap/CONTROL +++ b/ports/winpcap/CONTROL @@ -1,3 +1,4 @@ Source: winpcap Version: 4.1.3-2 +Homepage: https://www.winpcap.org Description: WinPcap is the industry-standard tool for link-layer network access in Windows environments. diff --git a/ports/wpilib/CONTROL b/ports/wpilib/CONTROL new file mode 100644 index 000000000..0d93d9bb5 --- /dev/null +++ b/ports/wpilib/CONTROL @@ -0,0 +1,12 @@ +Source: wpilib
+Version: 2019.4.1
+Build-Depends: libuv
+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.
+
+Feature: cameraserver
+Build-Depends: opencv
+Description: Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams
+
+Feature: allwpilib
+Build-Depends: wpilib[cameraserver] opencv
+Description: Enables the simulation HAL, and the high level wpilibc library.
diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake new file mode 100644 index 000000000..4bb8b80a5 --- /dev/null +++ b/ports/wpilib/portfile.cmake @@ -0,0 +1,67 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO wpilibsuite/allwpilib
+ REF 221011494d202770ad275c88cd7380119505e65d
+ SHA512 97ec277b2e7d0a287e1d4eef4f60b5f5b5a70a861f984d0bfb17610ca8f43c723e1ba3cc1b428d243db62b50307edcf509e496f15cccdda78f962bf91aa4568a
+)
+
+set(WITHOUT_JAVA ON)
+set(WITHOUT_CSCORE ON)
+set(WITHOUT_ALLWPILIB ON)
+
+if ("cameraserver" IN_LIST FEATURES)
+ set(WITHOUT_CSCORE OFF)
+endif()
+
+if ("allwpilib" IN_LIST FEATURES)
+ set(WITHOUT_ALLWPILIB OFF)
+endif()
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+
+ OPTIONS
+ -DWITHOUT_JAVA=${WITHOUT_JAVA}
+ -DWITHOUT_CSCORE=${WITHOUT_CSCORE}
+ -DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB}
+ -DUSE_VCPKG_LIBUV=ON
+ -DFLAT_INSTALL_WPILIB=ON
+)
+vcpkg_install_cmake()
+
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+if (NOT WITHOUT_ALLWPILIB)
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/gen/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen)
+endif()
+if (NOT WITHOUT_CSCORE)
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+endif()
+
+if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+ file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll")
+ file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll")
+
+ file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so")
+ file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so")
+
+ file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib")
+ file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib")
+endif()
+
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib")
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib")
+
+file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.a")
+file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.a")
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wpilib RENAME copyright)
diff --git a/ports/wt/0005-XML_file_path.patch b/ports/wt/0005-XML_file_path.patch new file mode 100644 index 000000000..b2be62c9d --- /dev/null +++ b/ports/wt/0005-XML_file_path.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca19b30..4765632 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -197,7 +197,11 @@ SET(CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake" CACHE STRING + + IF(WIN32) + +- SET(RUNDIR "c:/witty") # Does not apply to win32 ++ if (NOT INSTALL_CONFIG_FILE_PATH) ++ SET(RUNDIR "c:/witty") # Does not apply to win32 ++ else() ++ SET(RUNDIR ${INSTALL_CONFIG_FILE_PATH}) # Does not apply to win32 ++ endif() + + IF(NOT DEFINED CONFIGDIR) + SET(CONFIGDIR ${RUNDIR} CACHE STRING "Path for the configuration files") diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL index 5db330a5c..b712ca738 100644 --- a/ports/wt/CONTROL +++ b/ports/wt/CONTROL @@ -1,4 +1,5 @@ Source: wt -Version: 4.0.5 +Version: 4.0.5-1 +Homepage: https://github.com/emweb/wt Description: Wt is a C++ library for developing web applications Build-Depends: openssl, sqlite3, libpq, pango, glew, boost-date-time, boost-regex, boost-program-options, boost-signals, boost-system, boost-filesystem, boost-thread, boost-random, boost-multi-index, boost-signals2, boost-asio, boost-ublas, boost-conversion, boost-array, boost-smart-ptr, boost-tuple, boost-algorithm, boost-logic, boost-interprocess diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index c9fb520f6..bc39a7a64 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 0002-link-glew.patch 0003-disable-boost-autolink.patch 0004-link-ssl.patch + 0005-XML_file_path.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) @@ -18,6 +19,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt" -DSHARED_LIBS=${SHARED_LIBS} -DBOOST_DYNAMIC=ON -DDISABLE_BOOST_AUTOLINK=ON @@ -39,9 +41,9 @@ vcpkg_configure_cmake( -DCMAKE_INSTALL_DIR=share ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/wt) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() # 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) diff --git a/ports/wtl/CONTROL b/ports/wtl/CONTROL index 0eb3cf372..126b4d768 100644 --- a/ports/wtl/CONTROL +++ b/ports/wtl/CONTROL @@ -1,5 +1,6 @@ Source: wtl Maintainer: jfrederich@gmail.com Version: 10.0-2 +Homepage: https://sourceforge.net/projects/wtl/ Description: Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components. Build-Depends: diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index b922c1a24..542fdf327 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,5 @@ Source: wxwidgets Version: 3.1.2-1 +Homepage: https://github.com/wxWidgets/wxWidgets Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/x264/CONTROL b/ports/x264/CONTROL index 66fda9bee..ef3e80bcb 100644 --- a/ports/x264/CONTROL +++ b/ports/x264/CONTROL @@ -1,3 +1,4 @@ Source: x264 -Version: 157-303c484ec828ed0-1 +Version: 157-303c484ec828ed0-2 +Homepage: https://github.com/mirror/x264 Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 67d7ab087..4dfb43683 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -8,17 +8,19 @@ vcpkg_from_github( REF 303c484ec828ed0d8bfe743500e70314d026c3bd SHA512 faf210a3f9543028ed882c8348b243dd7ae6638e7b3ef43bec1326b717f23370f57c13d0ddb5e1ae94411088a2e33031a137b68ae9f64c18f8f33f601a0da54d HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/uwp-cflags.patch + PATCHES + "uwp-cflags.patch" ) # Acquire tools vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86 OR VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") +endif() + # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe". string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") set(ENV{PATH} "${NEWPATH}") @@ -27,7 +29,11 @@ set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15) #file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source) -set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --enable-strip --disable-lavf --disable-swscale --disable-asm --disable-avs --disable-ffms --disable-gpac --disable-lsmash") +set(CONFIGURE_OPTIONS "--host=i686-pc-mingw32 --enable-strip --disable-lavf --disable-swscale --disable-avs --disable-ffms --disable-gpac --disable-lsmash") + +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86 AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --disable-asm") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --enable-shared") diff --git a/ports/x264/uwp-cflags.patch b/ports/x264/uwp-cflags.patch index fd04755bc..792e99927 100644 --- a/ports/x264/uwp-cflags.patch +++ b/ports/x264/uwp-cflags.patch @@ -1,12 +1,12 @@ -diff --git a/configure b/configure
-index f7b14d9..2c92b2a 100644
---- a/configure
-+++ b/configure
-@@ -821,7 +821,6 @@ if [ $SYS = WINDOWS ]; then
- if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then
- [ $compiler = CL ] || die "WinRT requires MSVC"
- define HAVE_WINRT
-- CFLAGS="$CFLAGS -MD"
- LDFLAGS="$LDFLAGS -appcontainer"
- if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then
- die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT"
+diff --git a/configure b/configure +index f7b14d9..2c92b2a 100644 +--- a/configure ++++ b/configure +@@ -821,7 +821,6 @@ if [ $SYS = WINDOWS ]; then + if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then + [ $compiler = CL ] || die "WinRT requires MSVC" + define HAVE_WINRT +- CFLAGS="$CFLAGS -MD" + LDFLAGS="$LDFLAGS -appcontainer" + if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then + die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT" diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index ae598d613..fcfb78170 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,4 @@ Source: x265 Version: 3.0-1 +Homepage: https://bitbucket.org/multicoreware/x265 Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream. diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 6b207baf3..987e72246 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_apply_patches( ) set(ENABLE_ASSEMBLY OFF) -if (WIN32) +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") @@ -41,9 +41,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/x265) -if(UNIX) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265 ${CURRENT_PACKAGES_DIR}/tools/x265/x265) -elseif(WIN32) +elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe) endif() @@ -55,4 +55,4 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/x265) # Handle copyright file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/x265) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/x265/COPYING ${CURRENT_PACKAGES_DIR}/share/x265/copyright)
\ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/x265/COPYING ${CURRENT_PACKAGES_DIR}/share/x265/copyright) diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL index eb882eb38..06ab8967d 100644 --- a/ports/xalan-c/CONTROL +++ b/ports/xalan-c/CONTROL @@ -1,4 +1,5 @@ Source: xalan-c Version: 1.11-5 +Homepage: https://www-us.apache.org/dist/xalan/xalan-c/ Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types Build-Depends: xerces-c diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake index afd1b38bc..52e8b34fa 100644 --- a/ports/xalan-c/portfile.cmake +++ b/ports/xalan-c/portfile.cmake @@ -2,7 +2,7 @@ include(vcpkg_common_functions) string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH) if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32) - message(WARNING "Xalan-c's buildsystem uses very long paths and may fail on your system.\n" + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command." ) endif() diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index dc204b51b..3d2a4337e 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,5 +1,6 @@ Source: xerces-c -Version: 3.2.2-8 +Version: 3.2.2-10 +Homepage: https://github.com/apache/xerces-c Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. Feature: icu diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 017cb7cab..5f8fa4c11 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF Xerces-C_3_2_2 SHA512 66f60fe9194376ac0ca99d13ea5bce23ada86e0261dde30686c21ceb5499e754dab8eb0a98adadd83522bda62709377715501f6dac49763e3a686f9171cc63ea HEAD_REF trunk - PATCHES disable-tests.patch + PATCHES + disable-tests.patch + remove-dll-export-macro.patch ) set(DISABLE_ICU ON) @@ -38,13 +40,16 @@ endif() file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake _contents) string(REPLACE - "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" + "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" _contents "${_contents}" ) file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfigInternal.cmake "${_contents}") +file(READ ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake _contents) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/xercesc/XercesCConfig.cmake "include(CMakeFindDependencyMacro)\nfind_dependency(Threads)\n${_contents}") + configure_file( ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/xercesc diff --git a/ports/xerces-c/remove-dll-export-macro.patch b/ports/xerces-c/remove-dll-export-macro.patch new file mode 100644 index 000000000..f6f0e6975 --- /dev/null +++ b/ports/xerces-c/remove-dll-export-macro.patch @@ -0,0 +1,27 @@ +diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp +index 8071260..cd6bd68 100644 +--- a/src/xercesc/util/XercesDefs.hpp ++++ b/src/xercesc/util/XercesDefs.hpp +@@ -133,7 +133,7 @@ typedef XMLUInt32 UCS4Ch; + // The DLL_EXPORT flag should be defined on the command line during the build of a DLL + // configure conspires to make this happen. + +-#if defined(DLL_EXPORT) ++#if defined(XERCES_DLL_EXPORT) + #if defined(XERCES_BUILDING_LIBRARY) + #define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT + #define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT +diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in +index e849e08..69fe3bf 100644 +--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in ++++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in +@@ -85,9 +85,6 @@ + #define XERCES_PLATFORM_EXPORT @XERCES_PLATFORM_EXPORT@ + #define XERCES_PLATFORM_IMPORT @XERCES_PLATFORM_IMPORT@ + #define XERCES_TEMPLATE_EXTERN @XERCES_TEMPLATE_EXTERN@ +-#ifdef XERCES_DLL_EXPORT +-# define DLL_EXPORT +-#endif + + // --------------------------------------------------------------------------- + // Include standard headers, if available, that we may rely on below. diff --git a/ports/xerces-c/vcpkg-cmake-wrapper.cmake b/ports/xerces-c/vcpkg-cmake-wrapper.cmake index c6cfff8a4..6704b83d5 100644 --- a/ports/xerces-c/vcpkg-cmake-wrapper.cmake +++ b/ports/xerces-c/vcpkg-cmake-wrapper.cmake @@ -6,4 +6,3 @@ if (APPLE) list(APPEND XercesC_LIBRARIES "-framework CoreServices" "-framework CoreFoundation" curl)
endif()
endif()
-
diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL index f0581395c..c85f193c3 100644 --- a/ports/xeus/CONTROL +++ b/ports/xeus/CONTROL @@ -1,4 +1,4 @@ Source: xeus
-Version: 2019-02-13-1
+Version: 0.19.2 Description: C++ implementation of the Jupyter kernel protocol
-Build-Depends: cppzmq, cryptopp, libuuid (linux), nlohmann-json, xtl, zeromq
+Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq
diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake index 1ba0df8f7..f040af0c7 100644 --- a/ports/xeus/portfile.cmake +++ b/ports/xeus/portfile.cmake @@ -3,28 +3,35 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO QuantStack/xeus
- REF f78c60c7ce28baecb2479f2b82e4e8d1a6c35188
- SHA512 9d83f32f641bcad4ac96e263c465d46bdfa7d18d41f1e201309244c95587ce08ff2426f7cdd3a4399563d46064ed9bedd4d0babf4840f65e95c6a2c6f23ac9bb
+ REF 4bc3d2017fcf35ee6e69babf9be1e463483cd11c + SHA512 6f68f564a3dfaab5fdfbf9778602c75c883d761e8dd00a4b19f3f57c16e87b8252d40479abdd8eedb350799479e3213f16010176da286e5c3e6c9b9e76e6793d
HEAD_REF master
- PATCHES
- static-lib.patch
)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_EXAMPLES=OFF
+ -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DBUILD_TESTS=OFF
-DDOWNLOAD_GTEST=OFF
- -DXEUS_USE_SHARED_CRYPTOPP=OFF # `cryptopp` port currently only supports static linkage.
-DDISABLE_ARCH_NATIVE=OFF
)
vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+file(COPY
+ ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake
+ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+)
+
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share
@@ -44,4 +51,4 @@ configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copy file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
# CMake integration test
-#vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/xeus/static-lib.patch b/ports/xeus/static-lib.patch deleted file mode 100644 index e9ab41f01..000000000 --- a/ports/xeus/static-lib.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 26118eb..ccda00b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,7 +141,12 @@ set(XEUS_SOURCES - # Output - # ====== - --add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS}) -+option(BUILD_SHARED_LIBS "Build shared instead of static libraries." ON) -+if (BUILD_SHARED_LIBS) -+ add_library(xeus SHARED ${XEUS_SOURCES} ${XEUS_HEADERS}) -+else () -+ add_library(xeus STATIC ${XEUS_SOURCES} ${XEUS_HEADERS}) -+endif () - - if (APPLE) - set_target_properties(xeus PROPERTIES -@@ -166,9 +171,9 @@ target_link_libraries(xeus - - OPTION(XEUS_USE_SHARED_CRYPTOPP "Used shared library for cryptopp" OFF) - if (XEUS_USE_SHARED_CRYPTOPP) -- target_link_libraries(xeus PRIVATE cryptopp-shared) -+ target_link_libraries(xeus PUBLIC cryptopp-shared) - else () -- target_link_libraries(xeus PRIVATE cryptopp-static) -+ target_link_libraries(xeus PUBLIC cryptopp-static) - endif () - - if(NOT MSVC) -@@ -226,6 +231,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" - message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") - endif() - -+if (NOT BUILD_SHARED_LIBS) -+ target_compile_definitions(xeus PUBLIC XEUS_STATIC_LIB) -+endif () -+ - if(MSVC) - target_compile_definitions(xeus PUBLIC -DNOMINMAX) - target_compile_options(xeus PUBLIC /DGUID_WINDOWS /MP /bigobj) -diff --git a/include/xeus/xeus.hpp b/include/xeus/xeus.hpp -index 99e1d79..522bb78 100644 ---- a/include/xeus/xeus.hpp -+++ b/include/xeus/xeus.hpp -@@ -10,10 +10,14 @@ - #define XEUS_EXPORT_HPP - - #ifdef _WIN32 -- #ifdef XEUS_EXPORTS -- #define XEUS_API __declspec(dllexport) -+ #ifdef XEUS_STATIC_LIB -+ #define XEUS_API - #else -- #define XEUS_API __declspec(dllimport) -+ #ifdef XEUS_EXPORTS -+ #define XEUS_API __declspec(dllexport) -+ #else -+ #define XEUS_API __declspec(dllimport) -+ #endif - #endif - #else - #define XEUS_API diff --git a/ports/xeus/usage b/ports/xeus/usage index bac932eb9..1f959804e 100644 --- a/ports/xeus/usage +++ b/ports/xeus/usage @@ -1,4 +1,4 @@ The package xeus provides CMake targets:
find_package(xeus CONFIG REQUIRED)
- target_link_libraries(main PRIVATE xeus)
+ target_link_libraries(main PRIVATE xeus xeus_static)
diff --git a/ports/xeus/vcpkg-cmake-wrapper.cmake b/ports/xeus/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..62a3cc765 --- /dev/null +++ b/ports/xeus/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +_find_package(${ARGS})
+
+if(TARGET xeus AND NOT TARGET xeus_static)
+ add_library(xeus_static INTERFACE IMPORTED)
+ set_target_properties(xeus_static PROPERTIES INTERFACE_LINK_LIBRARIES xeus)
+elseif(TARGET xeus_static AND NOT TARGET xeus)
+ add_library(xeus INTERFACE IMPORTED)
+ set_target_properties(xeus PROPERTIES INTERFACE_LINK_LIBRARIES xeus_static)
+endif()
diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL index 80606821b..6433b748e 100644 --- a/ports/xlnt/CONTROL +++ b/ports/xlnt/CONTROL @@ -1,3 +1,4 @@ Source: xlnt
Version: 1.3.0-1
+Homepage: https://github.com/tfussell/xlnt
Description: Cross-platform user-friendly xlsx library for C++14
diff --git a/ports/xmsh/portfile.cmake b/ports/xmsh/portfile.cmake index 51897e6bd..285205b61 100644 --- a/ports/xmsh/portfile.cmake +++ b/ports/xmsh/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO nagzira/xmsh + REPO libxmsh/xmsh REF v0.4.1 SHA512 7bd9fe9e565b33722fec37a7e3d9bd8b7b132692add5d26e31954367fb284b49a26a21532ddcb0e425af7f8208e755f21f2d8de81b33ed2a1149724f4ccd2c38 HEAD_REF master diff --git a/ports/xproperty/CONTROL b/ports/xproperty/CONTROL new file mode 100644 index 000000000..ba2ed12ab --- /dev/null +++ b/ports/xproperty/CONTROL @@ -0,0 +1,4 @@ +Source: xproperty
+Version: 0.8.1
+Build-Depends: xtl
+Description: Traitlets-like C++ properties and implementation of the observer pattern
diff --git a/ports/xproperty/fix-target.patch b/ports/xproperty/fix-target.patch new file mode 100644 index 000000000..a838b29c8 --- /dev/null +++ b/ports/xproperty/fix-target.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5dcddc2..9d99227 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,7 @@ + ############################################################################ + + cmake_minimum_required(VERSION 3.1) +-project(xproperty) ++project(xproperty CXX) + + set(XPROPERTY_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) + +@@ -28,7 +28,8 @@ message(STATUS "xproperty v${${PROJECT_NAME}_VERSION}") + # Dependencies + # ============ + +-find_package(xtl 0.5.3 REQUIRED) ++set(xtl_REQUIRED_VERSION 0.5.3) ++find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED) + message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl") + + # Build +diff --git a/xpropertyConfig.cmake.in b/xpropertyConfig.cmake.in +index 192c04f..38b305a 100644 +--- a/xpropertyConfig.cmake.in ++++ b/xpropertyConfig.cmake.in +@@ -15,7 +15,12 @@ + + @PACKAGE_INIT@ + +-set(PN xproperty) +-set_and_check(${PN}_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@") +-set(${PN}_LIBRARY "") +-check_required_components(${PN}) ++include(CMakeFindDependencyMacro) ++find_dependency(xtl @xtl_REQUIRED_VERSION@) ++ ++if(NOT TARGET @PROJECT_NAME@) ++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++ get_target_property(@PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@ INTERFACE_INCLUDE_DIRECTORIES) ++endif() ++ ++set(@PROJECT_NAME@_LIBRARY "") diff --git a/ports/xproperty/portfile.cmake b/ports/xproperty/portfile.cmake new file mode 100644 index 000000000..8a415f2a1 --- /dev/null +++ b/ports/xproperty/portfile.cmake @@ -0,0 +1,30 @@ +# header-only library
+
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO QuantStack/xproperty
+ REF 0.8.1
+ SHA512 70fcce3a3cc84be98d844aa59c14686945907db3c8fa1c9a916f0bab811ef96512464031e53f00d29cba7db750a0032f4b59d6ca524f52bc7cfe8de5cebad5e5
+ HEAD_REF master
+ PATCHES
+ fix-target.patch
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DBUILD_TESTS=OFF
+ -DDOWNLOAD_GTEST=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL index 602fe6626..05241ac5e 100644 --- a/ports/xsimd/CONTROL +++ b/ports/xsimd/CONTROL @@ -1,5 +1,5 @@ Source: xsimd
-Version: 7.2.1
+Version: 7.2.3 Description: Modern, portable C++ wrappers for SIMD intrinsics
Feature: xcomplex
diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index 6e20a2a29..a25bcb532 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO QuantStack/xsimd
- REF 7.2.1
- SHA512 5b2bb403215cc621428957f6f8012c7e93d068152b8702a64803713b078767539c84c0dccb963e7002bbb3dc1aee887744d80014b01536becb49fe081eb882d4
+ REF 7.2.3 + SHA512 fb34eeb585f6820499734f10f03a4efd0d9a9b4be56f9bee21f3564eb92be56e7abe7682e476fafaff4733939f33f91cb4ab9209140b19f7b740538853433532
HEAD_REF master
)
diff --git a/ports/xtensor/CONTROL b/ports/xtensor/CONTROL index ba5ff3402..3e5e33013 100644 --- a/ports/xtensor/CONTROL +++ b/ports/xtensor/CONTROL @@ -1,5 +1,5 @@ Source: xtensor
-Version: 0.20.5
+Version: 0.20.7 Description: C++ tensors with broadcasting and lazy computing
Build-Depends: nlohmann-json, xtl
diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index f7c8c2339..51e24c6e9 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO QuantStack/xtensor
- REF 0.20.5
- SHA512 038f6858bea33a0b6e3b6622c9bbb316864335f7190ef64455ec0a062c13bcafcf215c089bbdf1f72acca63c50ceb2f1d11eb4874d82a5bfff3eead10cbfc00c
+ REF 0.20.7 + SHA512 de09900d0934f9b10453f16e43d1c3af28503f365224f9c6789b88a0cf00db820ca31e12099df1a2e3aafa73d7d83223df82f01b7611c1addb48367f936e5122
HEAD_REF master
)
diff --git a/ports/xxhash/CONTROL b/ports/xxhash/CONTROL index 4cdbf5435..be4cc2900 100644 --- a/ports/xxhash/CONTROL +++ b/ports/xxhash/CONTROL @@ -1,3 +1,4 @@ Source: xxhash
-Version: 0.6.4-1
+Version: 0.7.0
+Homepage: https://github.com/Cyan4973/xxHash
Description: Extremely fast hash algorithm
diff --git a/ports/xxhash/fix-arm-uwp.patch b/ports/xxhash/fix-arm-uwp.patch new file mode 100644 index 000000000..51bbc7474 --- /dev/null +++ b/ports/xxhash/fix-arm-uwp.patch @@ -0,0 +1,34 @@ +diff --git a/xxh3.h b/xxh3.h +index 0972c46..e5c7101 100644 +--- a/xxh3.h ++++ b/xxh3.h +@@ -40,7 +40,7 @@ + #ifndef XXH3_H + #define XXH3_H + +- ++#pragma warning (disable : 4146) + /* === Dependencies === */ + + #undef XXH_INLINE_ALL /* in case it's already defined */ +@@ -97,7 +97,7 @@ + #endif + + /* U64 XXH_mult32to64(U32 a, U64 b) { return (U64)a * (U64)b; } */ +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && (!_WIN32_WINNT >= 0x0A00) + # include <intrin.h> + /* MSVC doesn't do a good job with the mull detection. */ + # define XXH_mult32to64 __emulu +diff --git a/xxhsum.c b/xxhsum.c +index 0ec11c0..7d39c24 100644 +--- a/xxhsum.c ++++ b/xxhsum.c +@@ -31,6 +31,7 @@ + #ifndef XXHASH_C_2097394837 + #define XXHASH_C_2097394837 + ++#pragma warning (disable : 4146) + /* ************************************ + * Compiler Options + **************************************/ diff --git a/ports/xxhash/portfile.cmake b/ports/xxhash/portfile.cmake index 91f713578..74b19715f 100644 --- a/ports/xxhash/portfile.cmake +++ b/ports/xxhash/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Cyan4973/xxHash - REF v0.6.4 - SHA512 6c914bac5092dfd01349c8223c382d3c13ba1b22e08300ce86ea9663a9a934f930debdeb71c14365ec57d72b95088a4354da92dfb7fcf7d07ec01c0f4fb70ca7 - HEAD_REF dev) + REF a728fc9fe895460ff0e5f1efc2ce233d2095fd20 + SHA512 7795be00054d5f7abf4afab5912cc532bfc47f0bc8278cf09a44feb854f11e921d3d43e734efda1edbae0722450e4f9f02eeb5954220293eac930b4fa13ff737 + HEAD_REF dev + PATCHES fix-arm-uwp.patch +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/cmake_unofficial @@ -18,6 +20,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xxhash) diff --git a/ports/yaml-cpp/CONTROL b/ports/yaml-cpp/CONTROL index 0689f8d4e..93988ece9 100644 --- a/ports/yaml-cpp/CONTROL +++ b/ports/yaml-cpp/CONTROL @@ -1,3 +1,4 @@ Source: yaml-cpp Version: 0.6.2-2 +Homepage: https://github.com/jbeder/yaml-cpp Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec. diff --git a/ports/yara/CONTROL b/ports/yara/CONTROL index 5e2832bb5..b1d90b471 100644 --- a/ports/yara/CONTROL +++ b/ports/yara/CONTROL @@ -1,4 +1,5 @@ Source: yara
Version: e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-2
+Homepage: https://github.com/VirusTotal/yara
Description: The pattern matching swiss knife
Build-Depends: openssl, jansson
diff --git a/ports/yoga/CONTROL b/ports/yoga/CONTROL index 650808140..14ed48f16 100644 --- a/ports/yoga/CONTROL +++ b/ports/yoga/CONTROL @@ -1,3 +1,4 @@ Source: yoga Version: 1.14.0 +Homepage: https://github.com/facebook/yoga Description: Yoga is a cross-platform layout engine which implements Flexbox diff --git a/ports/z3/CONTROL b/ports/z3/CONTROL index f06d776bb..5a806da95 100644 --- a/ports/z3/CONTROL +++ b/ports/z3/CONTROL @@ -1,3 +1,3 @@ Source: z3 -Version: 4.8.4 +Version: 4.8.5-1 Description: An SMT solver diff --git a/ports/z3/fix-install-path.patch b/ports/z3/fix-install-path.patch new file mode 100644 index 000000000..170ca085a --- /dev/null +++ b/ports/z3/fix-install-path.patch @@ -0,0 +1,85 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e73daf63..c6bca7918 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,7 +615,7 @@ install(EXPORT + Z3_EXPORTED_TARGETS + FILE "Z3Targets.cmake" + NAMESPACE z3:: +- DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}" ++ DESTINATION share/z3 + ) + set(Z3_INSTALL_TREE_CMAKE_CONFIG_FILE "${PROJECT_BINARY_DIR}/cmake/Z3Config.cmake") + set(Z3_FIRST_PACKAGE_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}") +@@ -640,7 +640,7 @@ unset(CONFIG_FILE_TYPE) + # Add install rule to install ${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE} + install( + FILES "${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}" +- DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}" ++ DESTINATION share/z3 + ) + + # TODO: Provide a `Z3Version.cmake` file so that clients can specify the version +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index d5778add9..35b7e4c55 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -88,6 +88,6 @@ set(CMAKE_INSTALL_API_BINDINGS_DOC + if (INSTALL_API_BINDINGS_DOCUMENTATION) + install( + DIRECTORY "${DOC_DEST_DIR}" +- DESTINATION "${CMAKE_INSTALL_API_BINDINGS_DOC}" ++ DESTINATION share/z3 + ) + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9b6f00b62..8b47125d3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -173,7 +173,8 @@ install(TARGETS libz3 + EXPORT Z3_EXPORTED_TARGETS + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed? +- RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" # For Windows. DLLs are runtime targets for CMake ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX. + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) + +diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt +index f593d91a4..70682b721 100644 +--- a/src/api/java/CMakeLists.txt ++++ b/src/api/java/CMakeLists.txt +@@ -228,7 +228,7 @@ if (INSTALL_JAVA_BINDINGS) + PATH + "Directory to install Z3 Java JNI bridge library relative to install prefix" + ) +- install(TARGETS z3java DESTINATION "${Z3_JAVA_JNI_LIB_INSTALLDIR}") ++ install(TARGETS z3java DESTINATION share/z3) + # Note: Don't use ``DESTINATION`` here as the version of ``UseJava.cmake`` shipped + # with CMake 2.8.12.2 handles that incorrectly. + install_jar(z3JavaJar "${Z3_JAVA_JAR_INSTALLDIR}") +diff --git a/src/api/python/CMakeLists.txt b/src/api/python/CMakeLists.txt +index 6cabb779a..0b79861bf 100644 +--- a/src/api/python/CMakeLists.txt ++++ b/src/api/python/CMakeLists.txt +@@ -136,7 +136,7 @@ if (INSTALL_PYTHON_BINDINGS) + # Using DESTDIR still seems to work even if we use an absolute path + message(STATUS "Python bindings will be installed to \"${CMAKE_INSTALL_PYTHON_PKG_DIR}\"") + install(FILES ${build_z3_python_bindings_target_depends} +- DESTINATION "${CMAKE_INSTALL_PYTHON_PKG_DIR}/z3" ++ DESTINATION share/z3 + ) + else() + message(STATUS "Not emitting rules to install Z3 python bindings") +diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt +index 278246341..b6cd2f1c1 100644 +--- a/src/shell/CMakeLists.txt ++++ b/src/shell/CMakeLists.txt +@@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS}) + z3_add_component_dependencies_to_target(shell ${shell_expanded_deps}) + z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS}) + install(TARGETS shell +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION tools/z3 + ) diff --git a/ports/z3/fix_cmake_long_dir.patch b/ports/z3/fix_cmake_long_dir.patch deleted file mode 100644 index f7dc505d6..000000000 --- a/ports/z3/fix_cmake_long_dir.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/cmake/z3_add_component.cmake b/cmake/z3_add_component.cmake -index 8ab6e045d..ac6d1ec06 100644 ---- a/cmake/z3_add_component.cmake -+++ b/cmake/z3_add_component.cmake -@@ -262,18 +262,20 @@ macro(z3_add_install_tactic_rule) - GLOBAL - PROPERTY Z3_${dependency}_TACTIC_HEADERS - ) -- list(APPEND _tactic_header_files ${_component_tactic_header_files}) -+ list(APPEND _tactic_header_files "${_component_tactic_header_files}") - endforeach() - unset(_component_tactic_header_files) - -+ string(REPLACE ";" "\n" _tactic_header_files "${_tactic_header_files}") -+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps" ${_tactic_header_files}) - add_custom_command(OUTPUT "install_tactic.cpp" - COMMAND "${PYTHON_EXECUTABLE}" - "${CMAKE_SOURCE_DIR}/scripts/mk_install_tactic_cpp.py" - "${CMAKE_CURRENT_BINARY_DIR}" -- ${_tactic_header_files} -+ "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps" - DEPENDS "${CMAKE_SOURCE_DIR}/scripts/mk_install_tactic_cpp.py" - ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES} -- ${_tactic_header_files} -+ "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps" - COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.cpp\"" - ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG} - VERBATIM -diff --git a/scripts/mk_install_tactic_cpp.py b/scripts/mk_install_tactic_cpp.py -index a152eff14..b82e71354 100755 ---- a/scripts/mk_install_tactic_cpp.py -+++ b/scripts/mk_install_tactic_cpp.py -@@ -14,19 +14,22 @@ def main(args): - logging.basicConfig(level=logging.INFO) - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument("destination_dir", help="destination directory") -- parser.add_argument("header_files", nargs="+", -- help="One or more header files to parse") -+ parser.add_argument("deps", help="file with header file names to parse") - pargs = parser.parse_args(args) - - if not mk_genfile_common.check_dir_exists(pargs.destination_dir): - return 1 - -- if not mk_genfile_common.check_files_exist(pargs.header_files): -+ if not mk_genfile_common.check_files_exist([pargs.deps]): - return 1 - -- h_files_full_path = [] -- for header_file in pargs.header_files: -- h_files_full_path.append(os.path.abspath(header_file)) -+ with open(pargs.deps, 'r') as f: -+ lines = f.read().split('\n') -+ h_files_full_path = [os.path.abspath(header_file) -+ for header_file in lines if header_file] -+ -+ if not mk_genfile_common.check_files_exist(h_files_full_path): -+ return 1 - - output = mk_genfile_common.mk_install_tactic_cpp_internal( - h_files_full_path, diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 46182793d..e3adeabb0 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -15,10 +15,11 @@ vcpkg_add_to_path("${PYTHON2_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.8.4 - SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4 + REF Z3-4.8.5 + SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309 HEAD_REF master - PATCHES fix_cmake_long_dir.patch + PATCHES + fix-install-path.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -32,32 +33,10 @@ vcpkg_configure_cmake( ${BUILD_STATIC} ) -vcpkg_build_cmake() +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets() +vcpkg_copy_pdbs() - -function(install_z3 SHORT_BUILDTYPE DEBUG_DIR) - set(LIBS ".so" ".lib" ".dylib" ".a") - set(DLLS ".dll" ".pdb") - file(GLOB FILES ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}/libz3.*) - - foreach (FILE in ${FILES}) - get_filename_component(FILEXT ${FILE} EXT) - if ("${FILEXT}" IN_LIST LIBS) - file(INSTALL ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}${DEBUG_DIR}/lib) - elseif ("${FILEXT}" IN_LIST DLLS) - file(INSTALL ${FILE} DESTINATION ${CURRENT_PACKAGES_DIR}${DEBUG_DIR}/bin) - endif() - endforeach() -endfunction() - -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - install_z3("dbg" "/debug") -endif() -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - install_z3("rel" "") -endif() - -file(GLOB HEADERS ${SOURCE_PATH}/src/api/z3*.h) -file(INSTALL ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/z3 RENAME copyright) diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL index 6a7af61f5..24796e155 100644 --- a/ports/zeromq/CONTROL +++ b/ports/zeromq/CONTROL @@ -1,5 +1,6 @@ Source: zeromq -Version: 2019-04-19 +Version: 2019-05-07 +Homepage: https://github.com/zeromq/libzmq Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products Feature: sodium diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 42632bab0..06b5d3aee 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF e3a96778b6fae8a80eb22d5a4f411c1cfb2666de - SHA512 a79d74e8e17aafd7487815358663c85a81103d20682052db7b4b16fe3013603f40fde3b1413650d96066b958d3e740a34a3f13c15305b4b335ce24f034c8b740 + REF f41f51461fd86f2272209a3175d1df0e655883ef + SHA512 ee37cda1e86063fc4f9edfc2ae27246d7919f59efe90532944f299b03478d53d8708eb18be824d3885c96ca38917e1f6f72a941845c9b376ddda7ee1fd42cfac HEAD_REF master ) diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL index 2138e31af..aa7c7b6e9 100644 --- a/ports/zlib/CONTROL +++ b/ports/zlib/CONTROL @@ -1,3 +1,4 @@ Source: zlib Version: 1.2.11-5 +Homepage: https://www.zlib.net/ Description: A compression library diff --git a/ports/zopfli/CONTROL b/ports/zopfli/CONTROL new file mode 100644 index 000000000..9db22d105 --- /dev/null +++ b/ports/zopfli/CONTROL @@ -0,0 +1,3 @@ +Source: zopfli
+Version: 2019-01-19-1
+Description: Zopfli Compression Algorithm compression library programmed in C
diff --git a/ports/zopfli/portfile.cmake b/ports/zopfli/portfile.cmake new file mode 100644 index 000000000..bb5b9c211 --- /dev/null +++ b/ports/zopfli/portfile.cmake @@ -0,0 +1,75 @@ +include(vcpkg_common_functions)
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO google/zopfli
+ REF ef109ddf164911cf1e5612e90b4a619839a1e3ca
+ SHA512 9067d14c3ca7f5f07a0c4913ae1804128cf928770359618eab3c655ccbfa7260a11ec1db871a7e5be7d92098c2dda5a55b948eb779c9c64647bddfd1e9ace1f5
+ HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DZOPFLI_BUILD_INSTALL=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_copy_pdbs()
+
+if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set(EXECUTABLE_SUFFIX ".exe")
+else()
+ set(EXECUTABLE_SUFFIX "")
+endif()
+
+# Install tools
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX}
+ DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX}
+ DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+else()
+ file(REMOVE
+ ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX}
+ ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX}
+ ${CURRENT_PACKAGES_DIR}/debug/bin/zopfli${EXECUTABLE_SUFFIX}
+ ${CURRENT_PACKAGES_DIR}/debug/bin/zopflipng${EXECUTABLE_SUFFIX}
+ )
+endif()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Zopfli)
+
+# vcpkg_fixup_cmake_targets can not handles this on UNIX currently.
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR
+ VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake
+ "\"\${_IMPORT_PREFIX}/debug/bin/zopfli\""
+ "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\""
+ )
+ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake
+ "\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\""
+ "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\""
+ )
+ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake
+ "\"\${_IMPORT_PREFIX}/bin/zopfli\""
+ "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\""
+ )
+ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake
+ "\"\${_IMPORT_PREFIX}/bin/zopflipng\""
+ "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\""
+ )
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
+
+# CMake integration test
+vcpkg_test_cmake(PACKAGE_NAME ${PORT})
diff --git a/ports/zserge-webview/CONTROL b/ports/zserge-webview/CONTROL new file mode 100644 index 000000000..a595bee39 --- /dev/null +++ b/ports/zserge-webview/CONTROL @@ -0,0 +1,3 @@ +Source: zserge-webview +Version: 2019-04-27-2 +Description: Tiny cross-platform webview library for C/C++/Golang. diff --git a/ports/zserge-webview/portfile.cmake b/ports/zserge-webview/portfile.cmake new file mode 100644 index 000000000..7f0603d88 --- /dev/null +++ b/ports/zserge-webview/portfile.cmake @@ -0,0 +1,56 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zserge/webview + REF 16c93bcaeaeb6aa7bb5a1432de3bef0b9ecc44f3 + SHA512 153824bd444eafe6cc5ae00800422b41d4047dc85a164c465990c3be06d82003b532e1e869bb40e3a77cbe4789ff970fcda50ef00ac7b3e2f22ef3f566340026 + HEAD_REF master +) + +file(COPY ${SOURCE_PATH}/webview.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +set(WEBVIEW_GTK "0") +set(WEBVIEW_WINAPI "0") +set(WEBVIEW_COCOA "0") + +if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(WEBVIEW_WINAPI "1") +elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(WEBVIEW_COCOA "1") +elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(WEBVIEW_GTK "1") +endif() + +file(READ ${CURRENT_PACKAGES_DIR}/include/webview.h _contents) +string(REPLACE + "#ifdef WEBVIEW_STATIC" + "#if 1 // #ifdef WEBVIEW_STATIC" + _contents "${_contents}" +) +string(REPLACE + "#ifdef WEBVIEW_IMPLEMENTATION" + "#if 1 // #ifdef WEBVIEW_IMPLEMENTATION" + _contents "${_contents}" +) +string(REPLACE + "defined(WEBVIEW_GTK)" + "${WEBVIEW_GTK} // defined(WEBVIEW_GTK)" + _contents "${_contents}" +) +string(REPLACE + "defined(WEBVIEW_WINAPI)" + "${WEBVIEW_WINAPI} // defined(WEBVIEW_WINAPI)" + _contents "${_contents}" +) +string(REPLACE + "defined(WEBVIEW_COCOA)" + "${WEBVIEW_COCOA} // defined(WEBVIEW_COCOA)" + _contents "${_contents}" +) +file(WRITE ${CURRENT_PACKAGES_DIR}/include/webview.h "${_contents}") + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL index 985c24b0c..bab75367d 100644 --- a/ports/zstd/CONTROL +++ b/ports/zstd/CONTROL @@ -1,3 +1,4 @@ Source: zstd -Version: 1.3.7-1 -Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net +Version: 1.4.0 +Description: Zstandard - Fast real-time compression algorithm +Homepage: https://facebook.github.io/zstd/ diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index dfbb2e3f2..4b7522c76 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -2,8 +2,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd - REF v1.3.7 - SHA512 b7a432b13e237ac1490cd82b87727f6a4385d5ea7b89f566dea61a3993e17909c03288f727326ada326e36eb47ea5f9eab67c097808ee42f52cc800a7f7e1738 + REF v1.4.0 + SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671 HEAD_REF dev PATCHES enable-debug-mode.patch ) @@ -40,7 +40,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") foreach(HEADER zdict.h zstd.h zstd_errors.h) file(READ ${CURRENT_PACKAGES_DIR}/include/${HEADER} HEADER_CONTENTS) string(REPLACE "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") diff --git a/ports/zstr/CONTROL b/ports/zstr/CONTROL new file mode 100644 index 000000000..fe7e50c84 --- /dev/null +++ b/ports/zstr/CONTROL @@ -0,0 +1,3 @@ +Source: zstr +Version: 1.0.1 +Description: This C++ header-only library enables the use of C++ standard iostreams to access ZLib-compressed streams.
\ No newline at end of file diff --git a/ports/zstr/portfile.cmake b/ports/zstr/portfile.cmake new file mode 100644 index 000000000..61244eb60 --- /dev/null +++ b/ports/zstr/portfile.cmake @@ -0,0 +1,17 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mateidavid/zstr + REF v1.0.1 + SHA512 616df2394c41038bc8512748a6a699cb45310ff518e75f591c7f957d6ab3da66a384755a6015c3eb588b576940cbff429ff9798985c452b6eda6e22f94dfb264 + HEAD_REF master +) + +# Install source files +file(INSTALL ${SOURCE_PATH}/src/strict_fstream.hpp + ${SOURCE_PATH}/src/zstr.hpp + DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + +# Install license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/zxing-cpp/0001-opencv4-compat.patch b/ports/zxing-cpp/0001-opencv4-compat.patch new file mode 100644 index 000000000..51cec5387 --- /dev/null +++ b/ports/zxing-cpp/0001-opencv4-compat.patch @@ -0,0 +1,30 @@ +diff --git a/opencv-cli/src/main.cpp b/opencv-cli/src/main.cpp +index 63b6fd3..430dda6 100755 +--- 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/CONTROL b/ports/zxing-cpp/CONTROL index 52dfd95b2..c97ad1734 100644 --- a/ports/zxing-cpp/CONTROL +++ b/ports/zxing-cpp/CONTROL @@ -1,4 +1,4 @@ Source: zxing-cpp -Version: 3.3.3-2 -Build-Depends: opencv[core] +Version: 3.3.3-5 +Build-Depends: opencv Description: Barcode detection and decoding library. diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake index 405210d9c..044342ed6 100644 --- a/ports/zxing-cpp/portfile.cmake +++ b/ports/zxing-cpp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF 5aad4744a3763d814df98a18886979893e638274 SHA512 a079ad47171224de4469e76bf0779b6ebc9c6dfb3604bd5dbf5e6e5f321d9e6255f689daa749855f8400023602f1773214013c006442e9b32dd4b8146c888c02 HEAD_REF master + PATCHES + 0001-opencv4-compat.patch ) vcpkg_configure_cmake( @@ -18,15 +20,15 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/zxing/cmake" TARGET_PATH share/zxing) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/zxing/cmake TARGET_PATH share/zxing) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/zxing) -if (WIN32) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing) -else(WIN32) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing) -endif(WIN32) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/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() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) diff --git a/ports/zydis/CONTROL b/ports/zydis/CONTROL new file mode 100644 index 000000000..bd4f59d95 --- /dev/null +++ b/ports/zydis/CONTROL @@ -0,0 +1,3 @@ +Source: zydis +Version: 2.0.3 +Description: Fast and lightweight x86/x86-64 disassembler library.
\ No newline at end of file diff --git a/ports/zydis/portfile.cmake b/ports/zydis/portfile.cmake new file mode 100644 index 000000000..412cbdf87 --- /dev/null +++ b/ports/zydis/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zyantific/zydis + REF v2.0.3 + SHA512 254aee734f93ee51a8b963404f79d6edfd0831867763243b8020c44ec2d7dd4cb7e445248df4a9af7cd2743c020674df482661d59d3278a44d2ad9a2e0611a39 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +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) +endif() + +vcpkg_copy_pdbs() + +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/zziplib/CMakeLists.txt b/ports/zziplib/CMakeLists.txt index 1cb198e69..634bc5edb 100644 --- a/ports/zziplib/CMakeLists.txt +++ b/ports/zziplib/CMakeLists.txt @@ -29,12 +29,14 @@ if(UNIX) endforeach() endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.in" "${CMAKE_CURRENT_LIST_DIR}/zzip/config.h") # List the header files set(HEADERS zzip/__debug.h zzip/__dirent.h zzip/__fnmatch.h zzip/__hints.h zzip/__mmap.h + zzip/config.h zzip/_msvc.h zzip/autoconf.h zzip/conf.h diff --git a/ports/zziplib/CONTROL b/ports/zziplib/CONTROL index 4db036083..f756d19ae 100644 --- a/ports/zziplib/CONTROL +++ b/ports/zziplib/CONTROL @@ -1,4 +1,5 @@ Source: zziplib -Version: 0.13.69-2 +Version: 0.13.69-3 Build-Depends: zlib +Homepage: https://github.com/gdraheim/zziplib Description: library providing read access on ZIP-archives diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index 9e0306528..534744714 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") message(STATUS "Configuring zziplib") vcpkg_execute_required_process( - COMMAND "./configure" + COMMAND "./configure" --prefix=${CURRENT_INSTALLED_DIR} --with-zlib WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME "autotools-config-${TARGET_TRIPLET}" ) @@ -22,6 +22,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS -DZLIB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include ) vcpkg_install_cmake() diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 07a9fcbaa..6234efaa3 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -339,10 +339,16 @@ if ($disableMetrics) $platform = "x86" $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x86.release" - +if($PSVersionTable.PSVersion.Major -le 2) +{ + $architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture +} +else +{ + $architecture=(Get-CimInstance win32_operatingsystem | Select-Object osarchitecture).osarchitecture +} if ($win64) { - $architecture=(Get-WmiObject win32_operatingsystem | Select-Object osarchitecture).osarchitecture if (-not $architecture -like "*64*") { throw "Cannot build 64-bit on non-64-bit system" @@ -352,6 +358,15 @@ if ($win64) $vcpkgReleaseDir = "$vcpkgSourcesPath\msbuild.x64.release" } +if ($architecture -like "*64*") +{ + $PreferredToolArchitecture = "x64" +} +else +{ + $PreferredToolArchitecture = "x86" +} + $arguments = ( "`"/p:VCPKG_VERSION=-nohash`"", "`"/p:DISABLE_METRICS=$disableMetricsValue`"", @@ -359,7 +374,7 @@ $arguments = ( "/p:Platform=$platform", "/p:PlatformToolset=$platformToolset", "/p:TargetPlatformVersion=$windowsSDK", -"/p:PreferredToolArchitecture=x64", +"/p:PreferredToolArchitecture=$PreferredToolArchitecture", "/verbosity:minimal", "/m", "/nologo", diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 99d8dab68..b0e4f98a5 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -100,7 +100,7 @@ vcpkgDownloadFile() url=$1; downloadPath=$2 sha512=$3 vcpkgCheckRepoTool "curl" rm -rf "$downloadPath.part" - curl -L $url --create-dirs --output "$downloadPath.part" || exit 1 + curl -L $url --create-dirs --retry 3 --output "$downloadPath.part" || exit 1 vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512 mv "$downloadPath.part" "$downloadPath" @@ -203,7 +203,9 @@ selectCXX() if [ "x$CXX" = "x" ]; then CXX=g++ - if which g++-8 >/dev/null 2>&1; then + if which g++-9 >/dev/null 2>&1; then + CXX=g++-9 + elif which g++-8 >/dev/null 2>&1; then CXX=g++-8 elif which g++-7 >/dev/null 2>&1; then CXX=g++-7 diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index cf363f12e..2fdd9fdb4 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -9,7 +9,7 @@ $g_is_debug = $g_install_root -match '(.*\\)?debug(\\)?$' # Ensure we create the copied files log, even if we don't end up copying any files if ($copiedFilesLog) { - Set-Content -Path $copiedFilesLog -Value "" -Encoding Ascii + Set-Content -Path $copiedFilesLog -Value "" -Encoding UTF8 } # Note: this function signature is depended upon by the qtdeploy.ps1 script introduced in 5.7.1-7 @@ -28,7 +28,7 @@ function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$tar Write-Verbose " ${targetBinaryName}: Copying $SourceDir\$targetBinaryName" Copy-Item "$SourceDir\$targetBinaryName" $targetBinaryDir } - if ($copiedFilesLog) { Add-Content $copiedFilesLog "$targetBinaryDir\$targetBinaryName" } + if ($copiedFilesLog) { Add-Content $copiedFilesLog "$targetBinaryDir\$targetBinaryName" -Encoding UTF8 } if ($tlogFile) { Add-Content $tlogFile "$targetBinaryDir\$targetBinaryName" } } diff --git a/scripts/buildsystems/osx/applocal.py b/scripts/buildsystems/osx/applocal.py new file mode 100644 index 000000000..b3f8f138e --- /dev/null +++ b/scripts/buildsystems/osx/applocal.py @@ -0,0 +1,420 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +""" +finish the job started by macdeployqtfix +from: https://github.com/arl/macdeployqtfix + +The MIT License (MIT) + +Copyright (c) 2015 Aurelien Rainone + +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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +""" + +from subprocess import Popen, PIPE +from string import Template +import os +import sys +import logging +import argparse +import re +from collections import namedtuple + + +QTLIB_NAME_REGEX = r'^(?:@executable_path)?/.*/(Qt[a-zA-Z]*).framework/(?:Versions/\d/)?\1$' +QTLIB_NORMALIZED = r'$prefix/Frameworks/$qtlib.framework/Versions/$qtversion/$qtlib' + +QTPLUGIN_NAME_REGEX = r'^(?:@executable_path)?/.*/[pP]lug[iI]ns/(.*)/(.*).dylib$' +QTPLUGIN_NORMALIZED = r'$prefix/PlugIns/$plugintype/$pluginname.dylib' + +LOADERPATH_REGEX = r'^@[a-z_]+path/(.*)' +LOADERPATH_NORMALIZED = r'$prefix/Frameworks/$loaderpathlib' + + +class GlobalConfig(object): + logger = None + qtpath = None + exepath = None + + +def run_and_get_output(popen_args): + """Run process and get all output""" + process_output = namedtuple('ProcessOutput', ['stdout', 'stderr', 'retcode']) + try: + GlobalConfig.logger.debug('run_and_get_output({0})'.format(repr(popen_args))) + + proc = Popen(popen_args, stdin=PIPE, stdout=PIPE, stderr=PIPE) + stdout, stderr = proc.communicate(b'') + proc_out = process_output(stdout, stderr, proc.returncode) + + GlobalConfig.logger.debug('\tprocess_output: {0}'.format(proc_out)) + return proc_out + except Exception as exc: + GlobalConfig.logger.error('\texception: {0}'.format(exc)) + return process_output('', exc.message, -1) + + +def get_dependencies(filename): + """ + input: filename must be an absolute path + Should call `otool` and returns the list of dependencies, unsorted, + unmodified, just the raw list so then we could eventually re-use in other + more specialized functions + """ + GlobalConfig.logger.debug('get_dependencies({0})'.format(filename)) + popen_args = ['otool', '-L', filename] + proc_out = run_and_get_output(popen_args) + deps = [] + if proc_out.retcode == 0: + # some string splitting + deps = [s.strip().split(' ')[0] for s in proc_out.stdout.splitlines()[1:] if s] + # prevent infinite recursion when a binary depends on itself (seen with QtWidgets)... + deps = [s for s in deps if os.path.basename(filename) not in s] + return deps + + +def is_qt_plugin(filename): + """ + Checks if a given file is a qt plugin. + Accepts absolute path as well as path containing @executable_path + """ + qtlib_name_rgx = re.compile(QTPLUGIN_NAME_REGEX) + return qtlib_name_rgx.match(filename) is not None + + +def is_qt_lib(filename): + """ + Checks if a given file is a qt library. + Accepts absolute path as well as path containing @executable_path + """ + qtlib_name_rgx = re.compile(QTLIB_NAME_REGEX) + return qtlib_name_rgx.match(filename) is not None + + +def is_loader_path_lib(filename): + """ + Checks if a given file is loaded via @loader_path or @rpath + """ + qtlib_name_rgx = re.compile(LOADERPATH_REGEX) + return qtlib_name_rgx.match(filename) is not None + + +def normalize_qtplugin_name(filename): + """ + input: a path to a qt plugin, as returned by otool, that can have this form : + - an absolute path /../plugins/PLUGINTYPE/PLUGINNAME.dylib + - @executable_path/../plugins/PLUGINTYPE/PLUGINNAME.dylib + output: + a tuple (qtlib, abspath, rpath) where: + - qtname is the name of the plugin (libqcocoa.dylib, etc.) + - abspath is the absolute path of the qt lib inside the app bundle of exepath + - relpath is the correct rpath to a qt lib inside the app bundle + """ + + GlobalConfig.logger.debug('normalize_plugin_name({0})'.format(filename)) + + qtplugin_name_rgx = re.compile(QTPLUGIN_NAME_REGEX) + rgxret = qtplugin_name_rgx.match(filename) + if not rgxret: + msg = 'couldn\'t normalize a non-qt plugin filename: {0}'.format(filename) + GlobalConfig.logger.critical(msg) + raise Exception(msg) + + # qtplugin normalization settings + qtplugintype = rgxret.groups()[0] + qtpluginname = rgxret.groups()[1] + + templ = Template(QTPLUGIN_NORMALIZED) + + # from qtlib, forge 2 path : + # - absolute path of qt lib in bundle, + abspath = os.path.normpath(templ.safe_substitute( + prefix=os.path.dirname(GlobalConfig.exepath) + '/..', + plugintype=qtplugintype, + pluginname=qtpluginname)) + + # - and rpath containing @executable_path, relative to exepath + rpath = templ.safe_substitute( + prefix='@executable_path/..', + plugintype=qtplugintype, + pluginname=qtpluginname) + + GlobalConfig.logger.debug('\treturns({0})'.format((qtpluginname, abspath, rpath))) + return qtpluginname, abspath, rpath + + +def normalize_qtlib_name(filename): + """ + input: a path to a qt library, as returned by otool, that can have this form : + - an absolute path /lib/xxx/yyy + - @executable_path/../Frameworks/QtSerialPort.framework/Versions/5/QtSerialPort + output: + a tuple (qtlib, abspath, rpath) where: + - qtlib is the name of the qtlib (QtCore, QtWidgets, etc.) + - abspath is the absolute path of the qt lib inside the app bundle of exepath + - relpath is the correct rpath to a qt lib inside the app bundle + """ + GlobalConfig.logger.debug('normalize_qtlib_name({0})'.format(filename)) + + qtlib_name_rgx = re.compile(QTLIB_NAME_REGEX) + rgxret = qtlib_name_rgx.match(filename) + if not rgxret: + msg = 'couldn\'t normalize a non-qt lib filename: {0}'.format(filename) + GlobalConfig.logger.critical(msg) + raise Exception(msg) + + # qtlib normalization settings + qtlib = rgxret.groups()[0] + qtversion = 5 + + templ = Template(QTLIB_NORMALIZED) + + # from qtlib, forge 2 path : + # - absolute path of qt lib in bundle, + abspath = os.path.normpath(templ.safe_substitute( + prefix=os.path.dirname(GlobalConfig.exepath) + '/..', + qtlib=qtlib, + qtversion=qtversion)) + + # - and rpath containing @executable_path, relative to exepath + rpath = templ.safe_substitute( + prefix='@executable_path/..', + qtlib=qtlib, + qtversion=qtversion) + + GlobalConfig.logger.debug('\treturns({0})'.format((qtlib, abspath, rpath))) + return qtlib, abspath, rpath + + +def normalize_loaderpath_name(filename): + """ + input: a path to a loaderpath library, as returned by otool, that can have this form : + - an relative path @loaderpath/yyy + output: + a tuple (loaderpathlib, abspath, rpath) where: + - loaderpathlib is the name of the loaderpath lib + - abspath is the absolute path of the qt lib inside the app bundle of exepath + - relpath is the correct rpath to a qt lib inside the app bundle + """ + GlobalConfig.logger.debug('normalize_loaderpath_name({0})'.format(filename)) + + loaderpath_name_rgx = re.compile(LOADERPATH_REGEX) + rgxret = loaderpath_name_rgx.match(filename) + if not rgxret: + msg = 'couldn\'t normalize a loaderpath lib filename: {0}'.format(filename) + GlobalConfig.logger.critical(msg) + raise Exception(msg) + + # loaderpath normalization settings + loaderpathlib = rgxret.groups()[0] + templ = Template(LOADERPATH_NORMALIZED) + + # from loaderpath, forge 2 path : + # - absolute path of qt lib in bundle, + abspath = os.path.normpath(templ.safe_substitute( + prefix=os.path.dirname(GlobalConfig.exepath) + '/..', + loaderpathlib=loaderpathlib)) + + # - and rpath containing @executable_path, relative to exepath + rpath = templ.safe_substitute( + prefix='@executable_path/..', + loaderpathlib=loaderpathlib) + + GlobalConfig.logger.debug('\treturns({0})'.format((loaderpathlib, abspath, rpath))) + return loaderpathlib, abspath, rpath + + +def fix_dependency(binary, dep): + """ + fix 'dep' dependency of 'binary'. 'dep' is a qt library + """ + if is_qt_lib(dep): + qtname, dep_abspath, dep_rpath = normalize_qtlib_name(dep) + qtnamesrc = os.path.join(GlobalConfig.qtpath, 'lib', '{0}.framework'. + format(qtname), qtname) + elif is_qt_plugin(dep): + qtname, dep_abspath, dep_rpath = normalize_qtplugin_name(dep) + qtnamesrc = os.path.join(GlobalConfig.qtpath, 'lib', '{0}.framework'. + format(qtname), qtname) + elif is_loader_path_lib(dep): + qtname, dep_abspath, dep_rpath = normalize_loaderpath_name(dep) + qtnamesrc = os.path.join(GlobalConfig.qtpath + '/lib', qtname) + else: + return True + + dep_ok = True + # check that rpath of 'dep' inside binary has been correctly set + # (ie: relative to exepath using '@executable_path' syntax) + if dep != dep_rpath: + # dep rpath is not ok + GlobalConfig.logger.info('changing rpath \'{0}\' in binary {1}'.format(dep, binary)) + + # call install_name_tool -change on binary + popen_args = ['install_name_tool', '-change', dep, dep_rpath, binary] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.error(proc_out.stderr) + dep_ok = False + else: + # call install_name_tool -id on binary + popen_args = ['install_name_tool', '-id', dep_rpath, binary] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.error(proc_out.stderr) + dep_ok = False + + # now ensure that 'dep' exists at the specified path, relative to bundle + if dep_ok and not os.path.exists(dep_abspath): + + # ensure destination directory exists + GlobalConfig.logger.info('ensuring directory \'{0}\' exists: {0}'. + format(os.path.dirname(dep_abspath))) + popen_args = ['mkdir', '-p', os.path.dirname(dep_abspath)] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.info(proc_out.stderr) + dep_ok = False + else: + # copy missing dependency into bundle + GlobalConfig.logger.info('copying missing dependency in bundle: {0}'. + format(qtname)) + popen_args = ['cp', qtnamesrc, dep_abspath] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.info(proc_out.stderr) + dep_ok = False + else: + # ensure permissions are correct if we ever have to change its rpath + GlobalConfig.logger.info('ensuring 755 perm to {0}'.format(dep_abspath)) + popen_args = ['chmod', '755', dep_abspath] + proc_out = run_and_get_output(popen_args) + if proc_out.retcode != 0: + GlobalConfig.logger.info(proc_out.stderr) + dep_ok = False + else: + GlobalConfig.logger.debug('{0} is at correct location in bundle'.format(qtname)) + + if dep_ok: + return fix_binary(dep_abspath) + return False + + +def fix_binary(binary): + """ + input: + binary: relative or absolute path (no @executable_path syntax) + process: + - first fix the rpath for the qt libs on which 'binary' depend + - copy into the bundle of exepath the eventual libraries that are missing + - (create the soft links) needed ? + - do the same for all qt dependencies of binary (recursive) + """ + GlobalConfig.logger.debug('fix_binary({0})'.format(binary)) + + # loop on 'binary' dependencies + for dep in get_dependencies(binary): + if not fix_dependency(binary, dep): + GlobalConfig.logger.error('quitting early: couldn\'t fix dependency {0} of {1}'.format(dep, binary)) + return False + return True + + +def fix_main_binaries(): + """ + list the main binaries of the app bundle and fix them + """ + # deduce bundle path + bundlepath = os.path.sep.join(GlobalConfig.exepath.split(os.path.sep)[0:-3]) + + # fix main binary + GlobalConfig.logger.info('fixing executable \'{0}\''.format(GlobalConfig.exepath)) + if fix_binary(GlobalConfig.exepath): + GlobalConfig.logger.info('fixing plugins') + for root, dummy, files in os.walk(bundlepath): + for name in [f for f in files if os.path.splitext(f)[1] == '.dylib']: + GlobalConfig.logger.info('fixing plugin {0}'.format(name)) + if not fix_binary(os.path.join(root, name)): + return False + return True + + +def main(): + descr = """finish the job started by macdeployqt! + - find dependencies/rpaths with otool + - copy missed dependencies with cp and mkdir + - fix missed rpaths with install_name_tool + + exit codes: + - 0 : success + - 1 : error + """ + + parser = argparse.ArgumentParser(description=descr, + formatter_class=argparse.RawTextHelpFormatter) + parser.add_argument('exepath', + help='path to the binary depending on Qt') + parser.add_argument('qtpath', + help='path of Qt libraries used to build the Qt application') + parser.add_argument('-q', '--quiet', action='store_true', default=False, + help='do not create log on standard output') + parser.add_argument('-nl', '--no-log-file', action='store_true', default=False, + help='do not create log file \'./macdeployqtfix.log\'') + parser.add_argument('-v', '--verbose', action='store_true', default=False, + help='produce more log messages(debug log)') + args = parser.parse_args() + + # globals + GlobalConfig.qtpath = os.path.normpath(args.qtpath) + GlobalConfig.exepath = args.exepath + GlobalConfig.logger = logging.getLogger() + + # configure logging + ################### + + # create formatter + formatter = logging.Formatter('%(levelname)s | %(message)s') + # create console GlobalConfig.logger + if not args.quiet: + chdlr = logging.StreamHandler(sys.stdout) + chdlr.setFormatter(formatter) + GlobalConfig.logger.addHandler(chdlr) + + # create file GlobalConfig.logger + if not args.no_log_file: + fhdlr = logging.FileHandler('./macdeployqtfix.log', mode='w') + fhdlr.setFormatter(formatter) + GlobalConfig.logger.addHandler(fhdlr) + + if args.no_log_file and args.quiet: + GlobalConfig.logger.addHandler(logging.NullHandler()) + else: + GlobalConfig.logger.setLevel(logging.DEBUG if args.verbose else logging.INFO) + + if fix_main_binaries(): + GlobalConfig.logger.info('macdeployqtfix terminated with success') + ret = 0 + else: + GlobalConfig.logger.error('macdeployqtfix terminated with error') + ret = 1 + sys.exit(ret) + + +if __name__ == "__main__": + main()
\ No newline at end of file diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 10e8bd75e..f657e2710 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -107,7 +107,7 @@ if(NOT EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" AND NOT _CMAKE_I message(WARNING "There are no libraries installed for the Vcpkg triplet ${VCPKG_TARGET_TRIPLET}.") endif() -if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. +if(CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. list(APPEND CMAKE_PREFIX_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} ) @@ -130,6 +130,8 @@ else() #Release build: Put Release paths before Debug paths. Debug Paths are req endif() file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles) +set(_PROGRAMFILESX86 "PROGRAMFILES(x86)") +file(TO_CMAKE_PATH "$ENV{${_PROGRAMFILESX86}}" _programfiles_x86) set(CMAKE_SYSTEM_IGNORE_PATH "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-Win32" @@ -138,6 +140,13 @@ set(CMAKE_SYSTEM_IGNORE_PATH "${_programfiles}/OpenSSL-Win64/lib/VC" "${_programfiles}/OpenSSL-Win32/lib/VC/static" "${_programfiles}/OpenSSL-Win64/lib/VC/static" + "${_programfiles_x86}/OpenSSL" + "${_programfiles_x86}/OpenSSL-Win32" + "${_programfiles_x86}/OpenSSL-Win64" + "${_programfiles_x86}/OpenSSL-Win32/lib/VC" + "${_programfiles_x86}/OpenSSL-Win64/lib/VC" + "${_programfiles_x86}/OpenSSL-Win32/lib/VC/static" + "${_programfiles_x86}/OpenSSL-Win64/lib/VC/static" "C:/OpenSSL/" "C:/OpenSSL-Win32/" "C:/OpenSSL-Win64/" @@ -160,14 +169,25 @@ function(add_executable name) _add_executable(${ARGV}) list(FIND ARGV "IMPORTED" IMPORTED_IDX) list(FIND ARGV "ALIAS" ALIAS_IDX) + list(FIND ARGV "MACOSX_BUNDLE" MACOSX_BUNDLE_IDX) if(IMPORTED_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) - if(VCPKG_APPLOCAL_DEPS AND _VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") - add_custom_command(TARGET ${name} POST_BUILD - COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1 - -targetBinary $<TARGET_FILE:${name}> - -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin" - -OutVariable out - ) + if(VCPKG_APPLOCAL_DEPS) + if(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") + add_custom_command(TARGET ${name} POST_BUILD + COMMAND powershell -noprofile -executionpolicy Bypass -file ${_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1 + -targetBinary $<TARGET_FILE:${name}> + -installedDir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin" + -OutVariable out + ) + elseif(_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") + if (NOT MACOSX_BUNDLE_IDX EQUAL -1) + add_custom_command(TARGET ${name} POST_BUILD + COMMAND python ${_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py + $<TARGET_FILE:${name}> + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>" + ) + endif() + endif() endif() set_target_properties(${name} PROPERTIES VS_USER_PROPS do_not_import_user.props) set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index adbd58ca5..09090db68 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -113,5 +113,13 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) message(STATUS "Acquiring MSYS Packages... OK") endif() + # Deal with a stale process created by MSYS + if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_execute_required_process( + COMMAND TASKKILL /F /IM gpg-agent.exe /fi "memusage gt 2" + WORKING_DIRECTORY ${SOURCE_PATH} + ) + endif() + set(${PATH_TO_ROOT_OUT} ${PATH_TO_ROOT} PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index e86632c7e..b110d2cc9 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -60,10 +60,6 @@ function(vcpkg_build_cmake) set(TARGET_PARAM) endif() - if(_bc_DISABLE_PARALLEL) - set(PARALLEL_ARG ${NO_PARALLEL_ARG}) - endif() - foreach(BUILDTYPE "debug" "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) if(BUILDTYPE STREQUAL "debug") @@ -75,8 +71,6 @@ function(vcpkg_build_cmake) endif() message(STATUS "Building ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") - set(LOGPREFIX "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") - set(LOGS) if(_bc_ADD_BIN_TO_PATH) set(_BACKUP_ENV_PATH "$ENV{PATH}") @@ -91,121 +85,22 @@ function(vcpkg_build_cmake) set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin${_PATHSEP}$ENV{PATH}") endif() endif() - execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG} - OUTPUT_FILE "${LOGPREFIX}-out.log" - ERROR_FILE "${LOGPREFIX}-err.log" - RESULT_VARIABLE error_code - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) - if(error_code) - file(READ "${LOGPREFIX}-out.log" out_contents) - file(READ "${LOGPREFIX}-err.log" err_contents) - - if(out_contents) - list(APPEND LOGS "${LOGPREFIX}-out.log") - endif() - if(err_contents) - list(APPEND LOGS "${LOGPREFIX}-err.log") - endif() - - if(out_contents MATCHES "LINK : fatal error LNK1102:" OR out_contents MATCHES " fatal error C1060: ") - # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. - message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} without parallelism because memory exceeded") - execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG} - OUTPUT_FILE "${LOGPREFIX}-out-1.log" - ERROR_FILE "${LOGPREFIX}-err-1.log" - RESULT_VARIABLE error_code - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) - - if(error_code) - file(READ "${LOGPREFIX}-out-1.log" out_contents) - file(READ "${LOGPREFIX}-err-1.log" err_contents) - - if(out_contents) - list(APPEND LOGS "${LOGPREFIX}-out-1.log") - endif() - if(err_contents) - list(APPEND LOGS "${LOGPREFIX}-err-1.log") - endif() - endif() - elseif(out_contents MATCHES ": No such file or directory") - # WSL workaround - WSL occassionally fails with no such file or directory. Detect if we are running in WSL and restart. - execute_process(COMMAND "uname" "-r" - OUTPUT_VARIABLE UNAME_R ERROR_VARIABLE UNAME_R - OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) - - if (UNAME_R MATCHES "Microsoft") - set(ITERATION 0) - while (ITERATION LESS 10 AND out_contents MATCHES ": No such file or directory") - MATH(EXPR ITERATION "${ITERATION}+1") - message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of wsl subsystem issue. Iteration: ${ITERATION}") - execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} - OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log" - ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log" - RESULT_VARIABLE error_code - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) - if(error_code) - file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents) - file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents) - - if(out_contents) - list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log") - endif() - if(err_contents) - list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log") - endif() - else() - break() - endif() - endwhile() - endif() - elseif(out_contents MATCHES "mt : general error c101008d: ") - # Antivirus workaround - occasionally files are locked and cause mt.exe to fail - set(ITERATION 0) - while (ITERATION LESS 3 AND out_contents MATCHES "mt : general error c101008d: ") - MATH(EXPR ITERATION "${ITERATION}+1") - message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${ITERATION}") - execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} - OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log" - ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log" - RESULT_VARIABLE error_code - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) - - if(error_code) - file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents) - file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents) - - if(out_contents) - list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log") - endif() - if(err_contents) - list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log") - endif() - else() - break() - endif() - endwhile() - endif() - - if(error_code) - set(STRINGIFIED_LOGS) - foreach(LOG ${LOGS}) - file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG) - list(APPEND STRINGIFIED_LOGS " ${NATIVE_LOG}\n") - endforeach() - set(_eb_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG}) - set(_eb_WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) - message(FATAL_ERROR - " Command failed: ${_eb_COMMAND}\n" - " Working Directory: ${_eb_WORKING_DIRECTORY}\n" - " See logs for more information:\n" - ${STRINGIFIED_LOGS}) - endif() + if (_bc_DISABLE_PARALLEL) + vcpkg_execute_build_process( + COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} + LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}" + ) + else() + vcpkg_execute_build_process( + COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG} + NO_PARALLEL_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} + LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}" + ) endif() + if(_bc_ADD_BIN_TO_PATH) set(ENV{PATH} "${_BACKUP_ENV_PATH}") endif() diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 80a0aef0d..cf79fe8fc 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -11,9 +11,11 @@ function(vcpkg_build_qmake) cmake_parse_arguments(_csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS" ${ARGN}) if(CMAKE_HOST_WIN32) + set(_PATHSEP ";") vcpkg_find_acquire_program(JOM) set(INVOKE "${JOM}") else() + set(_PATHSEP ":") find_program(MAKE make) set(INVOKE "${MAKE}") endif() @@ -56,7 +58,7 @@ function(vcpkg_build_qmake) #First generate the makefiles so we can modify them if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/debug/lib;${CURRENT_INSTALLED_DIR}/debug/bin;${CURRENT_INSTALLED_DIR}/tools/qt5;${ENV_PATH_BACKUP}") + set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/debug/lib${_PATHSEP}${CURRENT_INSTALLED_DIR}/debug/bin${_PATHSEP}${CURRENT_INSTALLED_DIR}/tools/qt5${_PATHSEP}${ENV_PATH_BACKUP}") if(NOT _csc_SKIP_MAKEFILES) run_jom(qmake_all makefiles dbg) @@ -81,7 +83,7 @@ function(vcpkg_build_qmake) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/tools/qt5;${ENV_PATH_BACKUP}") + set(ENV{PATH} "${CURRENT_INSTALLED_DIR}/lib${_PATHSEP}${CURRENT_INSTALLED_DIR}/bin${_PATHSEP}${CURRENT_INSTALLED_DIR}/tools/qt5${_PATHSEP}${ENV_PATH_BACKUP}") if(NOT _csc_SKIP_MAKEFILES) run_jom(qmake_all makefiles rel) diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index d66fc5eff..b99f8bee8 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -7,6 +7,7 @@ include(vcpkg_extract_source_archive) include(vcpkg_extract_source_archive_ex) include(vcpkg_execute_required_process) include(vcpkg_execute_required_process_repeat) +include(vcpkg_execute_build_process) include(vcpkg_find_acquire_program) include(vcpkg_fixup_cmake_targets) include(vcpkg_from_github) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index ceff199ab..8f3aa6425 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -207,6 +207,7 @@ function(vcpkg_configure_cmake) "-DVCPKG_C_FLAGS_DEBUG=${VCPKG_C_FLAGS_DEBUG}" "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" + "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" ) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 3c6903c9d..f1ae0e65f 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -26,7 +26,7 @@ function(vcpkg_configure_meson) set(MESON_RELEASE_LDFLAGS "${MESON_RELEASE_LDFLAGS} /INCREMENTAL:NO /OPT:REF /OPT:ICF") # select meson cmd-line options - list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja) + list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) list(APPEND _vcm_OPTIONS --default-library shared) else() diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake new file mode 100644 index 000000000..d440ba2f6 --- /dev/null +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -0,0 +1,141 @@ +## # vcpkg_execute_build_process +## +## Execute a required build process +## +## ## Usage +## ```cmake +## vcpkg_execute_build_process( +## COMMAND <cmd> [<args>...] +## [NO_PARALLEL_COMMAND <cmd> [<args>...]] +## WORKING_DIRECTORY </path/to/dir> +## LOGNAME <log_name>) +## ) +## ``` +## ## Parameters +## ### COMMAND +## The command to be executed, along with its arguments. +## +## ### NO_PARALLEL_COMMAND +## Optional parameter which specifies a non-parallel command to attempt if a +## failure potentially due to parallelism is detected. +## +## ### WORKING_DIRECTORY +## The directory to execute the command in. +## +## ### LOGNAME +## The prefix to use for the log files. +## +## This should be a unique name for different triplets so that the logs don't +## conflict when building multiple at once. +## +## ## Examples +## +## * [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) +function(vcpkg_execute_build_process) + cmake_parse_arguments(_ebp "" "WORKING_DIRECTORY;LOGNAME" "COMMAND;NO_PARALLEL_COMMAND" ${ARGN}) + + set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out.log") + set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-err.log") + + execute_process( + COMMAND ${_ebp_COMMAND} + WORKING_DIRECTORY ${_ebp_WORKING_DIRECTORY} + OUTPUT_FILE ${LOG_OUT} + ERROR_FILE ${LOG_ERR} + RESULT_VARIABLE error_code + ) + + if(error_code) + file(READ ${LOG_OUT} out_contents) + file(READ ${LOG_ERR} err_contents) + + if(out_contents) + list(APPEND LOGS ${LOG_OUT}) + endif() + if(err_contents) + list(APPEND LOGS ${LOG_ERR}) + endif() + + if(out_contents MATCHES "LINK : fatal error LNK1102:" OR out_contents MATCHES " fatal error C1060: " + OR err_contents MATCHES "LINK : fatal error LNK1102:" OR err_contents MATCHES " fatal error C1060: " + OR out_contents MATCHES "LINK : fatal error LNK1318: Unexpected PDB error; ACCESS_DENIED" + OR out_contents MATCHES "LINK : fatal error LNK1104:" + OR out_contents MATCHES "LINK : fatal error LNK1201:") + # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. + message(STATUS "Restarting Build without parallelism because memory exceeded") + set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out-1.log") + set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-err-1.log") + + if(_ebp_NO_PARALLEL_COMMAND) + execute_process( + COMMAND ${_ebp_NO_PARALLEL_COMMAND} + WORKING_DIRECTORY ${_ebp_WORKING_DIRECTORY} + OUTPUT_FILE ${LOG_OUT} + ERROR_FILE ${LOG_ERR} + RESULT_VARIABLE error_code + ) + else() + execute_process( + COMMAND ${_ebp_COMMAND} + WORKING_DIRECTORY ${_ebp_WORKING_DIRECTORY} + OUTPUT_FILE ${LOG_OUT} + ERROR_FILE ${LOG_ERR} + RESULT_VARIABLE error_code + ) + endif() + + if(error_code) + file(READ ${LOG_OUT} out_contents) + file(READ ${LOG_ERR} err_contents) + + if(out_contents) + list(APPEND LOGS ${LOG_OUT}) + endif() + if(err_contents) + list(APPEND LOGS ${LOG_ERR}) + endif() + endif() + elseif(out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: ") + # Antivirus workaround - occasionally files are locked and cause mt.exe to fail + message(STATUS "mt.exe has failed. This may be the result of anti-virus. Disabling anti-virus on the buildtree folder may improve build speed") + set(ITERATION 0) + while (ITERATION LESS 3 AND (out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: ")) + MATH(EXPR ITERATION "${ITERATION}+1") + message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${ITERATION}") + execute_process( + COMMAND ${_ebp_COMMAND} + OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log" + ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log" + RESULT_VARIABLE error_code + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) + + if(error_code) + file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents) + file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents) + + if(out_contents) + list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log") + endif() + if(err_contents) + list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log") + endif() + else() + break() + endif() + endwhile() + endif() + + if(error_code) + set(STRINGIFIED_LOGS) + foreach(LOG ${LOGS}) + file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG) + list(APPEND STRINGIFIED_LOGS " ${NATIVE_LOG}\n") + endforeach() + message(FATAL_ERROR + " Command failed: ${_ebp_COMMAND}\n" + " Working Directory: ${_ebp_WORKING_DIRECTORY}\n" + " See logs for more information:\n" + ${STRINGIFIED_LOGS}) + endif(error_code) + endif(error_code) +endfunction(vcpkg_execute_build_process) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index d5e95eb4b..451f4bcd3 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -79,9 +79,9 @@ function(vcpkg_find_acquire_program VAR) set(PROGNAME python) set(SUBDIR "python3") set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(URL "https://www.python.org/ftp/python/3.5.4/python-3.5.4-embed-win32.zip") - set(ARCHIVE "python-3.5.4-embed-win32.zip") - set(HASH b5240fdc95088c2d7f65d2dd598650f8dd106b49589d94156bd4a078b108c6cabbe7a38ef73e2b2cf00e8312a93d2e587eac2c54ce85540d3c7a26cc60013156) + set(URL "https://www.python.org/ftp/python/3.7.3/python-3.7.3-embed-win32.zip") + set(ARCHIVE "python-3.7.3-embed-win32.zip") + set(HASH 2c1b1f0a29d40a91771ae21a5f733eedc10984cd182cb10c2793bbd24191a89f20612a3f23c34047f37fb06369016bfd4a52915ed1b4a56f8bd2b4ca6994eb31) else() set(PROGNAME python3) set(BREW_PACKAGE_NAME "python") @@ -202,9 +202,9 @@ function(vcpkg_find_acquire_program VAR) set(REQUIRED_INTERPRETER PERL) set(SCRIPTNAME "gas-preprocessor.pl") set(PATHS ${DOWNLOADS}/tools/gas-preprocessor) - set(URL "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/36bacb4cba27003c572e5bf7a9c4dfe3c9a8d40d/gas-preprocessor.pl") + set(URL "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/cbe88474ec196370161032a3863ec65050f70ba4/gas-preprocessor.pl") set(ARCHIVE "gas-preprocessor.pl") - set(HASH a25caadccd1457a0fd2abb5a0da9aca1713b2c351d76daf87a4141e52021f51aa09e95a62942c6f0764f79cc1fa65bf71584955b09e62ee7da067b5c82baf6b3) + set(HASH f6965875608bf2a3ee337e00c3f16e06cd9b5d10013da600d2a70887e47a7b4668af87b3524acf73dd122475712af831495a613a2128c1adb5fe0b4a11d96cd3) elseif(VAR MATCHES "DARK") set(PROGNAME dark) set(SUBDIR "wix311-binaries") @@ -223,9 +223,9 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "DOXYGEN") set(PROGNAME doxygen) set(PATHS ${DOWNLOADS}/tools/doxygen) - set(URL "http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.14.windows.bin.zip") - set(ARCHIVE "doxygen-1.8.14.windows.bin.zip") - set(HASH d0d706501e7112045b1f401f22d12a2c8d9b7728edee9ad1975a17dff914c16494ae48a70beab6f6304643779935843f268c7afed3b9da7d403b5cb11cac0c50) + set(URL "http://doxygen.nl/files/doxygen-1.8.15.windows.bin.zip") + set(ARCHIVE "doxygen-1.8.15.windows.bin.zip") + set(HASH 89482dcb1863d381d47812c985593e736d703931d49994e09c7c03ef67e064115d0222b8de1563a7930404c9bc2d3be323f3d13a01ef18861be584db3d5a953c) # Download Tools elseif(VAR MATCHES "ARIA2") set(PROGNAME aria2c) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index 48bfd828a..c0d657bbc 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -161,7 +161,7 @@ function(vcpkg_from_github) # Parse the github refs response with regex. # TODO: use some JSON swiss-army-knife utility instead. - file(READ "${ARCHIVE_VERSION}" _contents) + file(READ "${downloaded_file_path}.version" _contents) string(REGEX MATCH "\"sha\": \"[a-f0-9]+\"" x "${_contents}") string(REGEX REPLACE "\"sha\": \"([a-f0-9]+)\"" "\\1" _version ${x}) diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index b9cbc0ff3..70f224da9 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -4,6 +4,9 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "")
endif()
set(CMAKE_SYSTEM_NAME Linux CACHE STRING "")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+ set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "")
+endif()
get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE )
if(NOT _CMAKE_IN_TRY_COMPILE)
diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index dd92f6a31..fccf2b7ad 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -11,7 +11,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") if(NOT VCPKG_ALLOW_APPLE_CLANG)
message(FATAL_ERROR
"Building the vcpkg tool requires support for the C++ Filesystem TS.
-Apple clang versions 9 and below do not have support for it.
+Apple clang versions 10.01 and below do not have support for it.
Please install gcc6 or newer from homebrew (brew install gcc6).
If you would like to try anyway, pass --allowAppleClang to bootstrap.sh.")
else()
@@ -20,7 +20,7 @@ If you would like to try anyway, pass --allowAppleClang to bootstrap.sh.") elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
set(CLANG 1)
elseif(MSVC)
- add_compile_options(/std:c++17)
+ add_compile_options(/std:c++17 /FC)
else()
message(FATAL_ERROR "Unknown compiler: ${CMAKE_CXX_COMPILER_ID}")
endif()
diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt index ce62ec959..c2116e0e8 100644 --- a/toolsrc/VERSION.txt +++ b/toolsrc/VERSION.txt @@ -1 +1 @@ -"2018.11.23"
\ No newline at end of file +"2019.06.21"
\ No newline at end of file diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h index fa2c2bb72..15ec25e76 100644 --- a/toolsrc/include/pch.h +++ b/toolsrc/include/pch.h @@ -37,11 +37,8 @@ #include <cstdarg> #include <cstddef> #include <cstdint> -#if defined(_WIN32) -#include <filesystem> -#else +#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING #include <experimental/filesystem> -#endif #include <cstring> #include <fstream> #include <functional> diff --git a/toolsrc/include/tests.utils.h b/toolsrc/include/tests.utils.h index 7f7ec9e88..3e8514e67 100644 --- a/toolsrc/include/tests.utils.h +++ b/toolsrc/include/tests.utils.h @@ -13,7 +13,7 @@ namespace Microsoft::VisualStudio::CppUnitTestFramework { template<> - std::wstring ToString<vcpkg::Dependencies::InstallPlanType>(const vcpkg::Dependencies::InstallPlanType& t) + inline std::wstring ToString<vcpkg::Dependencies::InstallPlanType>(const vcpkg::Dependencies::InstallPlanType& t) { switch (t) { @@ -26,7 +26,7 @@ namespace Microsoft::VisualStudio::CppUnitTestFramework } template<> - std::wstring ToString<vcpkg::Dependencies::RequestType>(const vcpkg::Dependencies::RequestType& t) + inline std::wstring ToString<vcpkg::Dependencies::RequestType>(const vcpkg::Dependencies::RequestType& t) { switch (t) { @@ -38,13 +38,13 @@ namespace Microsoft::VisualStudio::CppUnitTestFramework } template<> - std::wstring ToString<vcpkg::PackageSpecParseResult>(const vcpkg::PackageSpecParseResult& t) + inline std::wstring ToString<vcpkg::PackageSpecParseResult>(const vcpkg::PackageSpecParseResult& t) { return ToString(static_cast<uint32_t>(t)); } template<> - std::wstring ToString<vcpkg::PackageSpec>(const vcpkg::PackageSpec& t) + inline std::wstring ToString<vcpkg::PackageSpec>(const vcpkg::PackageSpec& t) { return ToString(t.to_string()); } diff --git a/toolsrc/include/vcpkg/base/chrono.h b/toolsrc/include/vcpkg/base/chrono.h index 26294fdf8..89cd15273 100644 --- a/toolsrc/include/vcpkg/base/chrono.h +++ b/toolsrc/include/vcpkg/base/chrono.h @@ -56,8 +56,8 @@ namespace vcpkg::Chrono static Optional<CTime> get_current_date_time(); static Optional<CTime> parse(CStringView str); - constexpr CTime() noexcept : m_tm {0} {} - explicit constexpr CTime(tm t) noexcept : m_tm {t} {} + constexpr CTime() noexcept : m_tm{0} {} + explicit constexpr CTime(tm t) noexcept : m_tm{t} {} CTime add_hours(const int hours) const; diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index b07ff25b3..3ea0d6036 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -2,11 +2,8 @@ #include <vcpkg/base/expected.h> -#if defined(_WIN32) -#include <filesystem> -#else +#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING #include <experimental/filesystem> -#endif namespace fs { @@ -27,21 +24,25 @@ namespace vcpkg::Files { struct Filesystem { + std::string read_contents(const fs::path& file_path, LineInfo linfo) const; virtual Expected<std::string> read_contents(const fs::path& file_path) const = 0; virtual Expected<std::vector<std::string>> read_lines(const fs::path& file_path) const = 0; virtual fs::path find_file_recursively_up(const fs::path& starting_dir, const std::string& filename) const = 0; virtual std::vector<fs::path> get_files_recursive(const fs::path& dir) const = 0; virtual std::vector<fs::path> get_files_non_recursive(const fs::path& dir) const = 0; - - virtual void write_lines(const fs::path& file_path, const std::vector<std::string>& lines) = 0; + void write_lines(const fs::path& file_path, const std::vector<std::string>& lines, LineInfo linfo); + virtual void write_lines(const fs::path& file_path, + const std::vector<std::string>& lines, + std::error_code& ec) = 0; + void write_contents(const fs::path& path, const std::string& data, LineInfo linfo); virtual void write_contents(const fs::path& file_path, const std::string& data, std::error_code& ec) = 0; - virtual void rename(const fs::path& oldpath, const fs::path& newpath) = 0; + void rename(const fs::path& oldpath, const fs::path& newpath, LineInfo linfo); virtual void rename(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) = 0; virtual void rename_or_copy(const fs::path& oldpath, const fs::path& newpath, StringLiteral temp_suffix, std::error_code& ec) = 0; - virtual bool remove(const fs::path& path) = 0; + bool remove(const fs::path& path, LineInfo linfo); virtual bool remove(const fs::path& path, std::error_code& ec) = 0; virtual std::uintmax_t remove_all(const fs::path& path, std::error_code& ec) = 0; virtual bool exists(const fs::path& path) const = 0; @@ -60,8 +61,6 @@ namespace vcpkg::Files virtual fs::file_status symlink_status(const fs::path& path, std::error_code& ec) const = 0; virtual std::vector<fs::path> find_from_PATH(const std::string& name) const = 0; - - void write_contents(const fs::path& file_path, const std::string& data); }; Filesystem& get_real_filesystem(); diff --git a/toolsrc/include/vcpkg/base/graphs.h b/toolsrc/include/vcpkg/base/graphs.h index 46831a911..9901a49a0 100644 --- a/toolsrc/include/vcpkg/base/graphs.h +++ b/toolsrc/include/vcpkg/base/graphs.h @@ -44,9 +44,9 @@ namespace vcpkg::Graphs void shuffle(Container& c, Randomizer* r) { if (!r) return; - for (int i = static_cast<int>(c.size()); i > 1; --i) + for (auto i = c.size(); i > 1; --i) { - auto j = r->random(i); + auto j = r->random(static_cast<int>(i)); if (j != i - 1) { std::swap(c[i - 1], c[j]); diff --git a/toolsrc/include/vcpkg/base/optional.h b/toolsrc/include/vcpkg/base/optional.h index 4d386a961..2d8c126c6 100644 --- a/toolsrc/include/vcpkg/base/optional.h +++ b/toolsrc/include/vcpkg/base/optional.h @@ -19,6 +19,9 @@ namespace vcpkg template<class T, bool B = std::is_copy_constructible<T>::value> struct OptionalStorage { +#if defined(_WIN32) +#pragma warning(suppress : 26495) +#endif constexpr OptionalStorage() noexcept : m_is_present(false), m_inactive() {} constexpr OptionalStorage(const T& t) : m_is_present(true), m_t(t) {} constexpr OptionalStorage(T&& t) : m_is_present(true), m_t(std::move(t)) {} @@ -28,12 +31,18 @@ namespace vcpkg if (m_is_present) m_t.~T(); } +#if defined(_WIN32) +#pragma warning(suppress : 26495) +#endif OptionalStorage(const OptionalStorage& o) : m_is_present(o.m_is_present), m_inactive() { if (m_is_present) new (&m_t) T(o.m_t); } - OptionalStorage(OptionalStorage&& o) : m_is_present(o.m_is_present), m_inactive() +#if defined(_WIN32) +#pragma warning(suppress : 26495) +#endif + OptionalStorage(OptionalStorage&& o) noexcept : m_is_present(o.m_is_present), m_inactive() { if (m_is_present) { @@ -59,7 +68,7 @@ namespace vcpkg return *this; } - OptionalStorage& operator=(OptionalStorage&& o) + OptionalStorage& operator=(OptionalStorage&& o) noexcept { if (m_is_present && o.m_is_present) { @@ -100,6 +109,9 @@ namespace vcpkg template<class T> struct OptionalStorage<T, false> { +#if defined(_WIN32) +#pragma warning(suppress : 26495) +#endif constexpr OptionalStorage() noexcept : m_is_present(false), m_inactive() {} constexpr OptionalStorage(T&& t) : m_is_present(true), m_t(std::move(t)) {} @@ -108,7 +120,10 @@ namespace vcpkg if (m_is_present) m_t.~T(); } - OptionalStorage(OptionalStorage&& o) : m_is_present(o.m_is_present), m_inactive() +#if defined(_WIN32) +#pragma warning(suppress : 26495) +#endif + OptionalStorage(OptionalStorage&& o) noexcept : m_is_present(o.m_is_present), m_inactive() { if (m_is_present) { @@ -116,7 +131,7 @@ namespace vcpkg } } - OptionalStorage& operator=(OptionalStorage&& o) + OptionalStorage& operator=(OptionalStorage&& o) noexcept { if (m_is_present && o.m_is_present) { diff --git a/toolsrc/include/vcpkg/base/strings.h b/toolsrc/include/vcpkg/base/strings.h index 3165dc8ee..d553d1d41 100644 --- a/toolsrc/include/vcpkg/base/strings.h +++ b/toolsrc/include/vcpkg/base/strings.h @@ -43,7 +43,7 @@ namespace vcpkg::Strings::details t.to_string(into); } - template<class T, class=void, class = decltype(to_string(std::declval<std::string&>(), std::declval<const T&>()))> + template<class T, class = void, class = decltype(to_string(std::declval<std::string&>(), std::declval<const T&>()))> void append_internal(std::string& into, const T& t) { to_string(into, t); @@ -66,7 +66,8 @@ namespace vcpkg::Strings } template<class... Args> - [[nodiscard]] std::string concat(const Args&... args) { + [[nodiscard]] std::string concat(const Args&... args) + { std::string ret; append(ret, args...); return ret; @@ -113,8 +114,7 @@ namespace vcpkg::Strings bool starts_with(StringView s, StringView pattern); template<class InputIterator, class Transformer> - std::string join(const char* delimiter, InputIterator begin, InputIterator end, - Transformer transformer) + std::string join(const char* delimiter, InputIterator begin, InputIterator end, Transformer transformer) { if (begin == end) { @@ -145,8 +145,7 @@ namespace vcpkg::Strings std::string join(const char* delimiter, InputIterator begin, InputIterator end) { using Element = decltype(*begin); - return join(delimiter, begin, end, - [](const Element& x) -> const Element& { return x; }); + return join(delimiter, begin, end, [](const Element& x) -> const Element& { return x; }); } template<class Container> @@ -164,7 +163,7 @@ namespace vcpkg::Strings std::vector<std::string> split(const std::string& s, const std::string& delimiter); - std::vector<std::string> split(const std::string& s, const std::string& delimiter, int max_count); + std::vector<std::string> split(const std::string& s, const std::string& delimiter, size_t max_count); std::vector<StringView> find_all_enclosed(StringView input, StringView left_delim, StringView right_delim); diff --git a/toolsrc/include/vcpkg/base/system.h b/toolsrc/include/vcpkg/base/system.h index 0245b684a..907a692a2 100644 --- a/toolsrc/include/vcpkg/base/system.h +++ b/toolsrc/include/vcpkg/base/system.h @@ -28,4 +28,6 @@ namespace vcpkg::System const Optional<fs::path>& get_program_files_32_bit(); const Optional<fs::path>& get_program_files_platform_bitness(); + + int get_num_logical_cores(); } diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index f27e9d67b..04cd7cf87 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -20,7 +20,7 @@ namespace vcpkg::Build namespace Command { void perform_and_exit_ex(const FullPackageSpec& full_spec, - const fs::path& port_dir, + const SourceControlFileLocation& scfl, const ParsedArguments& options, const VcpkgPaths& paths); @@ -51,6 +51,12 @@ namespace vcpkg::Build YES }; + enum class CleanDownloads + { + NO = 0, + YES + }; + enum class ConfigurationType { DEBUG, @@ -82,6 +88,7 @@ namespace vcpkg::Build AllowDownloads allow_downloads; CleanBuildtrees clean_buildtrees; CleanPackages clean_packages; + CleanDownloads clean_downloads; DownloadTool download_tool; BinaryCaching binary_caching; FailOnTombstone fail_on_tombstone; diff --git a/toolsrc/include/vcpkg/dependencies.h b/toolsrc/include/vcpkg/dependencies.h index 16fdb3f73..8c2050b3d 100644 --- a/toolsrc/include/vcpkg/dependencies.h +++ b/toolsrc/include/vcpkg/dependencies.h @@ -48,7 +48,7 @@ namespace vcpkg::Dependencies const RequestType& request_type); InstallPlanAction(const PackageSpec& spec, - const SourceControlFile& scf, + const SourceControlFileLocation& scfl, const std::set<std::string>& features, const RequestType& request_type, std::vector<PackageSpec>&& dependencies); @@ -57,7 +57,7 @@ namespace vcpkg::Dependencies PackageSpec spec; - Optional<const SourceControlFile&> source_control_file; + Optional<const SourceControlFileLocation&> source_control_file_location; Optional<InstalledPackageView> installed_package; InstallPlanType plan_type; @@ -129,26 +129,31 @@ namespace vcpkg::Dependencies struct PortFileProvider { - virtual Optional<const SourceControlFile&> get_control_file(const std::string& src_name) const = 0; + virtual Optional<const SourceControlFileLocation&> get_control_file(const std::string& src_name) const = 0; + virtual std::vector<const SourceControlFileLocation*> load_all_control_files() const = 0; }; struct MapPortFileProvider : Util::ResourceBase, PortFileProvider { - explicit MapPortFileProvider(const std::unordered_map<std::string, SourceControlFile>& map); - Optional<const SourceControlFile&> get_control_file(const std::string& src_name) const override; + explicit MapPortFileProvider(const std::unordered_map<std::string, SourceControlFileLocation>& map); + Optional<const SourceControlFileLocation&> get_control_file(const std::string& src_name) const override; + std::vector<const SourceControlFileLocation*> load_all_control_files() const override; private: - const std::unordered_map<std::string, SourceControlFile>& ports; + const std::unordered_map<std::string, SourceControlFileLocation>& ports; }; struct PathsPortFileProvider : Util::ResourceBase, PortFileProvider { - explicit PathsPortFileProvider(const VcpkgPaths& paths); - Optional<const SourceControlFile&> get_control_file(const std::string& src_name) const override; + explicit PathsPortFileProvider(const vcpkg::VcpkgPaths& paths, + const std::vector<std::string>* ports_dirs_paths); + Optional<const SourceControlFileLocation&> get_control_file(const std::string& src_name) const override; + std::vector<const SourceControlFileLocation*> load_all_control_files() const override; private: - const VcpkgPaths& ports; - mutable std::unordered_map<std::string, SourceControlFile> cache; + Files::Filesystem& filesystem; + std::vector<fs::path> ports_dirs; + mutable std::unordered_map<std::string, SourceControlFileLocation> cache; }; struct ClusterGraph; @@ -181,7 +186,7 @@ namespace vcpkg::Dependencies std::vector<ExportPlanAction> create_export_plan(const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db); - std::vector<AnyAction> create_feature_install_plan(const std::unordered_map<std::string, SourceControlFile>& map, + std::vector<AnyAction> create_feature_install_plan(const std::unordered_map<std::string, SourceControlFileLocation>& map, const std::vector<FeatureSpec>& specs, const StatusParagraphs& status_db); diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h index 2026ea369..263b5f80c 100644 --- a/toolsrc/include/vcpkg/globalstate.h +++ b/toolsrc/include/vcpkg/globalstate.h @@ -13,8 +13,6 @@ namespace vcpkg static Util::LockGuarded<Chrono::ElapsedTimer> timer; static Util::LockGuarded<std::string> g_surveydate; - static std::atomic<bool> debugging; - static std::atomic<bool> feature_packages; static std::atomic<bool> g_binary_caching; static std::atomic<int> g_init_console_cp; diff --git a/toolsrc/include/vcpkg/postbuildlint.h b/toolsrc/include/vcpkg/postbuildlint.h index 5dcfeb8df..027619eb8 100644 --- a/toolsrc/include/vcpkg/postbuildlint.h +++ b/toolsrc/include/vcpkg/postbuildlint.h @@ -9,5 +9,6 @@ namespace vcpkg::PostBuildLint size_t perform_all_checks(const PackageSpec& spec, const VcpkgPaths& paths, const Build::PreBuildInfo& pre_build_info, - const Build::BuildInfo& build_info); + const Build::BuildInfo& build_info, + const fs::path& port_dir); } diff --git a/toolsrc/include/vcpkg/sourceparagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h index ae5812ea7..6232a3fd2 100644 --- a/toolsrc/include/vcpkg/sourceparagraph.h +++ b/toolsrc/include/vcpkg/sourceparagraph.h @@ -48,6 +48,7 @@ namespace vcpkg std::string version; std::string description; std::string maintainer; + std::string homepage; std::vector<std::string> supports; std::vector<Dependency> depends; std::vector<std::string> default_features; @@ -67,6 +68,15 @@ namespace vcpkg Optional<const FeatureParagraph&> find_feature(const std::string& featurename) const; }; + /// <summary> + /// Full metadata of a package: core and other features. As well as the location the SourceControlFile was loaded from. + /// </summary> + struct SourceControlFileLocation + { + std::unique_ptr<SourceControlFile> source_control_file; + fs::path source_location; + }; + void print_error_message(Span<const std::unique_ptr<Parse::ParseControlErrorInfo>> error_info_list); inline void print_error_message(const std::unique_ptr<Parse::ParseControlErrorInfo>& error_info_list) { diff --git a/toolsrc/include/vcpkg/vcpkgcmdarguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h index de65eec28..cad013eb8 100644 --- a/toolsrc/include/vcpkg/vcpkgcmdarguments.h +++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h @@ -15,6 +15,7 @@ namespace vcpkg { std::unordered_set<std::string> switches; std::unordered_map<std::string, std::string> settings; + std::unordered_map<std::string, std::vector<std::string>> multisettings; }; struct VcpkgPaths; @@ -41,10 +42,22 @@ namespace vcpkg StringLiteral short_help_text; }; + struct CommandMultiSetting + { + constexpr CommandMultiSetting(const StringLiteral& name, const StringLiteral& short_help_text) + : name(name), short_help_text(short_help_text) + { + } + + StringLiteral name; + StringLiteral short_help_text; + }; + struct CommandOptionsStructure { Span<const CommandSwitch> switches; Span<const CommandSetting> settings; + Span<const CommandMultiSetting> multisettings; }; struct CommandStructure @@ -74,6 +87,7 @@ namespace vcpkg std::unique_ptr<std::string> vcpkg_root_dir; std::unique_ptr<std::string> triplet; + std::unique_ptr<std::vector<std::string>> overlay_ports; Optional<bool> debug = nullopt; Optional<bool> sendmetrics = nullopt; Optional<bool> printmetrics = nullopt; @@ -88,6 +102,6 @@ namespace vcpkg ParsedArguments parse_arguments(const CommandStructure& command_structure) const; private: - std::unordered_map<std::string, Optional<std::string>> optional_command_arguments; + std::unordered_map<std::string, Optional<std::vector<std::string>>> optional_command_arguments; }; } diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index 42de40d9c..b09169b02 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -50,8 +50,6 @@ namespace vcpkg static Expected<VcpkgPaths> create(const fs::path& vcpkg_root_dir, const std::string& default_vs_path); fs::path package_dir(const PackageSpec& spec) const; - fs::path port_dir(const PackageSpec& spec) const; - fs::path port_dir(const std::string& name) const; fs::path build_info_file_path(const PackageSpec& spec) const; fs::path listfile_path(const BinaryParagraph& pgh) const; diff --git a/toolsrc/src/tests.arguments.cpp b/toolsrc/src/tests.arguments.cpp index c87281fa8..51ababd3d 100644 --- a/toolsrc/src/tests.arguments.cpp +++ b/toolsrc/src/tests.arguments.cpp @@ -1,7 +1,9 @@ #include "tests.pch.h"
+#if defined(_WIN32)
#pragma comment(lib, "version")
#pragma comment(lib, "winhttp")
+#endif
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
@@ -33,8 +35,8 @@ namespace UnitTest1 TEST_METHOD(create_from_arg_sequence_valued_options)
{
- std::array<CommandSetting, 1> settings = { {{"--a", ""}} };
- CommandStructure cmdstruct = { "", 0, SIZE_MAX, {{}, settings }, nullptr };
+ std::array<CommandSetting, 1> settings = {{{"--a", ""}}};
+ CommandStructure cmdstruct = {"", 0, SIZE_MAX, {{}, settings}, nullptr};
std::vector<std::string> t = {"--a=b", "command", "argument"};
auto v = VcpkgCmdArguments::create_from_arg_sequence(t.data(), t.data() + t.size());
@@ -47,8 +49,8 @@ namespace UnitTest1 TEST_METHOD(create_from_arg_sequence_valued_options2)
{
- std::array<CommandSwitch, 2> switches = { {{"--a", ""}, {"--c", ""}} };
- std::array<CommandSetting, 2> settings = { { {"--b", ""}, {"--d", ""}} };
+ std::array<CommandSwitch, 2> switches = {{{"--a", ""}, {"--c", ""}}};
+ std::array<CommandSetting, 2> settings = {{{"--b", ""}, {"--d", ""}}};
CommandStructure cmdstruct = {"", 0, SIZE_MAX, {switches, settings}, nullptr};
std::vector<std::string> t = {"--a", "--b=c"};
@@ -61,4 +63,4 @@ namespace UnitTest1 Assert::AreEqual(size_t{0}, v.command_arguments.size());
}
};
-}
\ No newline at end of file +}
diff --git a/toolsrc/src/tests.dependencies.cpp b/toolsrc/src/tests.dependencies.cpp index f82fad4e4..7d8283ed6 100644 --- a/toolsrc/src/tests.dependencies.cpp +++ b/toolsrc/src/tests.dependencies.cpp @@ -1,7 +1,9 @@ #include "tests.pch.h" +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/toolsrc/src/tests.packagespec.cpp b/toolsrc/src/tests.packagespec.cpp index 32ad81227..d3bc18c79 100644 --- a/toolsrc/src/tests.packagespec.cpp +++ b/toolsrc/src/tests.packagespec.cpp @@ -2,8 +2,10 @@ #include <tests.utils.h> +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/toolsrc/src/tests.paragraph.cpp b/toolsrc/src/tests.paragraph.cpp index 9a56ad9ee..e99d07694 100644 --- a/toolsrc/src/tests.paragraph.cpp +++ b/toolsrc/src/tests.paragraph.cpp @@ -1,7 +1,9 @@ #include "tests.pch.h" +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/toolsrc/src/tests.plan.cpp b/toolsrc/src/tests.plan.cpp index 238aa7032..ab24266b4 100644 --- a/toolsrc/src/tests.plan.cpp +++ b/toolsrc/src/tests.plan.cpp @@ -47,7 +47,8 @@ namespace UnitTest1 Assert::AreEqual(plan.spec.triplet().to_string().c_str(), triplet.to_string().c_str()); - Assert::AreEqual(pkg_name.c_str(), plan.source_control_file.get()->core_paragraph->name.c_str()); + auto* scfl = plan.source_control_file_location.get(); + Assert::AreEqual(pkg_name.c_str(), scfl->source_control_file->core_paragraph->name.c_str()); Assert::AreEqual(size_t(vec.size()), feature_list.size()); for (auto&& feature_name : vec) @@ -79,7 +80,7 @@ namespace UnitTest1 /// </summary> struct PackageSpecMap { - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; Triplet triplet; PackageSpecMap(const Triplet& t = Triplet::X86_WINDOWS) noexcept { triplet = t; } @@ -94,7 +95,8 @@ namespace UnitTest1 { auto spec = PackageSpec::from_name_and_triplet(scf.core_paragraph->name, triplet); Assert::IsTrue(spec.has_value()); - map.emplace(scf.core_paragraph->name, std::move(scf)); + map.emplace(scf.core_paragraph->name, + SourceControlFileLocation{std::unique_ptr<SourceControlFile>(std::move(&scf)), ""}); return PackageSpec{*spec.get()}; } }; diff --git a/toolsrc/src/tests.update.cpp b/toolsrc/src/tests.update.cpp index b6e487c17..5e3f9f3e2 100644 --- a/toolsrc/src/tests.update.cpp +++ b/toolsrc/src/tests.update.cpp @@ -21,9 +21,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation { std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), @@ -45,9 +45,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation { std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), @@ -71,9 +71,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "0"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation{ std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), @@ -92,9 +92,9 @@ namespace UnitTest1 StatusParagraphs status_db(std::move(status_paragraphs)); - std::unordered_map<std::string, SourceControlFile> map; + std::unordered_map<std::string, SourceControlFileLocation> map; auto scf = unwrap(SourceControlFile::parse_control_file(Pgh{{{"Source", "a"}, {"Version", "2"}}})); - map.emplace("a", std::move(*scf)); + map.emplace("a", SourceControlFileLocation{ std::move(scf), "" }); Dependencies::MapPortFileProvider provider(map); auto pkgs = SortedVector<OutdatedPackage>(Update::find_outdated_packages(provider, status_db), diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 2c0f562b6..e02bdc71f 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -40,8 +40,10 @@ #include <memory> #include <random> +#if defined(_WIN32) #pragma comment(lib, "ole32") #pragma comment(lib, "shell32") +#endif using namespace vcpkg; @@ -294,11 +296,11 @@ int main(const int argc, const char* const* const argv) Checks::register_global_shutdown_handler([]() { const auto elapsed_us_inner = GlobalState::timer.lock()->microseconds(); - bool debugging = GlobalState::debugging; + bool debugging = Debug::g_debugging; auto metrics = Metrics::g_metrics.lock(); metrics->track_metric("elapsed_us", elapsed_us_inner); - GlobalState::debugging = false; + Debug::g_debugging = false; metrics->flush(); #if defined(_WIN32) @@ -337,14 +339,13 @@ int main(const int argc, const char* const* const argv) const VcpkgCmdArguments args = VcpkgCmdArguments::create_from_command_line(argc, argv); - if (const auto p = args.featurepackages.get()) GlobalState::feature_packages = *p; if (const auto p = args.binarycaching.get()) GlobalState::g_binary_caching = *p; if (const auto p = args.printmetrics.get()) Metrics::g_metrics.lock()->set_print_metrics(*p); if (const auto p = args.sendmetrics.get()) Metrics::g_metrics.lock()->set_send_metrics(*p); - if (const auto p = args.debug.get()) GlobalState::debugging = *p; + if (const auto p = args.debug.get()) Debug::g_debugging = *p; - if (GlobalState::debugging) + if (Debug::g_debugging) { inner(args); Checks::exit_fail(VCPKG_LINE_INFO); @@ -389,6 +390,6 @@ int main(const int argc, const char* const* const argv) } fflush(stdout); - //It is expected that one of the sub-commands will exit cleanly before we get here. + // It is expected that one of the sub-commands will exit cleanly before we get here. Checks::exit_fail(VCPKG_LINE_INFO); } diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index 037cbdc14..69a916828 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -1,8 +1,8 @@ #include "pch.h" #include <vcpkg/archives.h> -#include <vcpkg/commands.h> #include <vcpkg/base/system.process.h> +#include <vcpkg/commands.h> namespace vcpkg::Archives { diff --git a/toolsrc/src/vcpkg/base/chrono.cpp b/toolsrc/src/vcpkg/base/chrono.cpp index 959ff90c8..86dc590f8 100644 --- a/toolsrc/src/vcpkg/base/chrono.cpp +++ b/toolsrc/src/vcpkg/base/chrono.cpp @@ -22,7 +22,7 @@ namespace vcpkg::Chrono static tm to_local_time(const std::time_t& t) { - tm parts {}; + tm parts{}; #if defined(_WIN32) localtime_s(&parts, &t); #else @@ -33,7 +33,7 @@ namespace vcpkg::Chrono static Optional<tm> to_utc_time(const std::time_t& t) { - tm parts {}; + tm parts{}; #if defined(_WIN32) const errno_t err = gmtime_s(&parts, &t); if (err) @@ -127,7 +127,7 @@ namespace vcpkg::Chrono const Optional<tm> opt = to_utc_time(ct); if (auto p_tm = opt.get()) { - return CTime {*p_tm}; + return CTime{*p_tm}; } return nullopt; @@ -160,11 +160,11 @@ namespace vcpkg::Chrono return ret; } - CTime CTime::add_hours(const int hours) const { return CTime {date_plus_hours(&this->m_tm, hours)}; } + CTime CTime::add_hours(const int hours) const { return CTime{date_plus_hours(&this->m_tm, hours)}; } std::string CTime::to_string() const { - std::array<char, 80> date {}; + std::array<char, 80> date{}; strftime(&date[0], date.size(), "%Y-%m-%dT%H:%M:%S.0Z", &m_tm); return &date[0]; } diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index 590c48ff5..4bb2178e5 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -44,18 +44,20 @@ namespace vcpkg::Downloads Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError()); // Win7 IE Proxy fallback - if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) { + if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) + { // First check if any proxy has been found automatically - WINHTTP_PROXY_INFO proxyInfo;
- DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO);
- auto noProxyFound =
- !WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize)
- || proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY;
-
- // If no proxy was found automatically, use IE's proxy settings, if any
- if (noProxyFound) { + WINHTTP_PROXY_INFO proxyInfo; + DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO); + auto noProxyFound = !WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize) || + proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY; + + // If no proxy was found automatically, use IE's proxy settings, if any + if (noProxyFound) + { WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy; - if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) { + if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) + { WINHTTP_PROXY_INFO proxy; proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; proxy.lpszProxy = ieProxy.lpszProxy; @@ -103,7 +105,7 @@ namespace vcpkg::Downloads bResults = WinHttpQueryDataAvailable(hRequest, &dwSize); Checks::check_exit(VCPKG_LINE_INFO, bResults, "WinHttpQueryDataAvailable() failed: %d", GetLastError()); - if (buf.size() < dwSize) buf.resize(dwSize * 2); + if (buf.size() < dwSize) buf.resize(static_cast<size_t>(dwSize) * 2); bResults = WinHttpReadData(hRequest, (LPVOID)buf.data(), dwSize, &downloaded_size); Checks::check_exit(VCPKG_LINE_INFO, bResults, "WinHttpReadData() failed: %d", GetLastError()); @@ -155,9 +157,10 @@ namespace vcpkg::Downloads const std::string& sha512) { const std::string download_path_part = download_path.u8string() + ".part"; + auto download_path_part_path = fs::u8path(download_path_part); std::error_code ec; fs.remove(download_path, ec); - fs.remove(download_path_part, ec); + fs.remove(download_path_part_path, ec); #if defined(_WIN32) auto url_no_proto = url.substr(8); // drop https:// auto path_begin = Util::find(url_no_proto, '/'); @@ -171,14 +174,7 @@ namespace vcpkg::Downloads Checks::check_exit(VCPKG_LINE_INFO, code == 0, "Could not download %s", url); #endif - verify_downloaded_file_hash(fs, url, download_path_part, sha512); - fs.rename(download_path_part, download_path, ec); - Checks::check_exit(VCPKG_LINE_INFO, - !ec, - "Failed to do post-download rename-in-place.\n" - "fs.rename(%s, %s, %s)", - download_path_part, - download_path.u8string(), - ec.message()); + verify_downloaded_file_hash(fs, url, download_path_part_path, sha512); + fs.rename(download_path_part_path, download_path, VCPKG_LINE_INFO); } } diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index 164394100..5099795e9 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -7,24 +7,60 @@ #include <vcpkg/base/system.process.h> #include <vcpkg/base/util.h> -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) #include <fcntl.h> -#include <sys/sendfile.h> +#include <string.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> #endif +#if defined(__linux__) +#include <sys/sendfile.h> +#elif defined(__APPLE__) +#include <copyfile.h> +#endif namespace vcpkg::Files { static const std::regex FILESYSTEM_INVALID_CHARACTERS_REGEX = std::regex(R"([\/:*?"<>|])"); - void Filesystem::write_contents(const fs::path& file_path, const std::string& data) + std::string Filesystem::read_contents(const fs::path& path, LineInfo linfo) const + { + auto maybe_contents = this->read_contents(path); + if (auto p = maybe_contents.get()) + return std::move(*p); + else + Checks::exit_with_message( + linfo, "error reading file: %s: %s", path.u8string(), maybe_contents.error().message()); + } + void Filesystem::write_contents(const fs::path& path, const std::string& data, LineInfo linfo) + { + std::error_code ec; + this->write_contents(path, data, ec); + if (ec) Checks::exit_with_message(linfo, "error writing file: %s: %s", path.u8string(), ec.message()); + } + void Filesystem::rename(const fs::path& oldpath, const fs::path& newpath, LineInfo linfo) + { + std::error_code ec; + this->rename(oldpath, newpath, ec); + if (ec) + Checks::exit_with_message( + linfo, "error renaming file: %s: %s: %s", oldpath.u8string(), newpath.u8string(), ec.message()); + } + + bool Filesystem::remove(const fs::path& path, LineInfo linfo) + { + std::error_code ec; + auto r = this->remove(path, ec); + if (ec) Checks::exit_with_message(linfo, "error removing file: %s: %s", path.u8string(), ec.message()); + return r; + } + + void Filesystem::write_lines(const fs::path& path, const std::vector<std::string>& lines, LineInfo linfo) { std::error_code ec; - write_contents(file_path, data, ec); - Checks::check_exit( - VCPKG_LINE_INFO, !ec, "error while writing file: %s: %s", file_path.u8string(), ec.message()); + this->write_lines(path, lines, ec); + if (ec) Checks::exit_with_message(linfo, "error writing lines: %s: %s", path.u8string(), ec.message()); } struct RealFilesystem final : Filesystem @@ -142,31 +178,40 @@ namespace vcpkg::Files return ret; } - virtual void write_lines(const fs::path& file_path, const std::vector<std::string>& lines) override + virtual void write_lines(const fs::path& file_path, + const std::vector<std::string>& lines, + std::error_code& ec) override { std::fstream output(file_path, std::ios_base::out | std::ios_base::binary | std::ios_base::trunc); + if (!output) + { + ec.assign(errno, std::generic_category()); + return; + } for (const std::string& line : lines) { output << line << "\n"; + if (!output) + { + output.close(); + ec.assign(errno, std::generic_category()); + return; + } } output.close(); } - virtual void rename(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) override { fs::stdfs::rename(oldpath, newpath, ec); } - virtual void rename(const fs::path& oldpath, const fs::path& newpath) override - { - fs::stdfs::rename(oldpath, newpath); - } virtual void rename_or_copy(const fs::path& oldpath, const fs::path& newpath, StringLiteral temp_suffix, std::error_code& ec) override { this->rename(oldpath, newpath, ec); -#if defined(__linux__) + Util::unused(temp_suffix); +#if defined(__linux__) || defined(__APPLE__) if (ec) { auto dst = newpath; @@ -182,13 +227,25 @@ namespace vcpkg::Files return; } +#if defined(__linux__) off_t bytes = 0; struct stat info = {0}; fstat(i_fd, &info); auto written_bytes = sendfile(o_fd, i_fd, &bytes, info.st_size); +#elif defined(__APPLE__) + auto written_bytes = fcopyfile(i_fd, o_fd, 0, COPYFILE_ALL); +#endif + if (written_bytes == -1) + { + ec.assign(errno, std::generic_category()); + close(i_fd); + close(o_fd); + + return; + } + close(i_fd); close(o_fd); - if (written_bytes == -1) return; this->rename(dst, newpath, ec); if (ec) return; @@ -196,7 +253,6 @@ namespace vcpkg::Files } #endif } - virtual bool remove(const fs::path& path) override { return fs::stdfs::remove(path); } virtual bool remove(const fs::path& path, std::error_code& ec) override { return fs::stdfs::remove(path, ec); } virtual std::uintmax_t remove_all(const fs::path& path, std::error_code& ec) override { diff --git a/toolsrc/src/vcpkg/base/strings.cpp b/toolsrc/src/vcpkg/base/strings.cpp index ce634a227..54a74a7a1 100644 --- a/toolsrc/src/vcpkg/base/strings.cpp +++ b/toolsrc/src/vcpkg/base/strings.cpp @@ -185,7 +185,7 @@ std::vector<std::string> Strings::split(const std::string& s, const std::string& return output; } -std::vector<std::string> Strings::split(const std::string& s, const std::string& delimiter, int max_count) +std::vector<std::string> Strings::split(const std::string& s, const std::string& delimiter, size_t max_count) { std::vector<std::string> output; diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index 132c1f074..c5ff050f0 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -16,7 +16,9 @@ #include <sys/sysctl.h> #endif +#if defined(_WIN32) #pragma comment(lib, "Advapi32") +#endif using namespace vcpkg::System; @@ -177,8 +179,8 @@ namespace vcpkg } std::string System::make_cmake_cmd(const fs::path& cmake_exe, - const fs::path& cmake_script, - const std::vector<CMakeVariable>& pass_variables) + const fs::path& cmake_script, + const std::vector<CMakeVariable>& pass_variables) { const std::string cmd_cmake_pass_variables = Strings::join(" ", pass_variables, [](auto&& v) { return v.s; }); return Strings::format( @@ -345,7 +347,8 @@ namespace vcpkg } #endif - int System::cmd_execute_clean(const ZStringView cmd_line, const std::unordered_map<std::string, std::string>& extra_env) + int System::cmd_execute_clean(const ZStringView cmd_line, + const std::unordered_map<std::string, std::string>& extra_env) { auto timer = Chrono::ElapsedTimer::create_started(); #if defined(_WIN32) @@ -385,6 +388,7 @@ namespace vcpkg // Flush stdout before launching external process fflush(nullptr); + auto timer = Chrono::ElapsedTimer::create_started(); #if defined(_WIN32) // We are wrap the command line in quotes to cause cmd.exe to correctly process it auto actual_cmd_line = Strings::concat('"', cmd_line, '"'); @@ -392,11 +396,19 @@ namespace vcpkg g_ctrl_c_state.transition_to_spawn_process(); const int exit_code = _wsystem(Strings::to_utf16(actual_cmd_line).c_str()); g_ctrl_c_state.transition_from_spawn_process(); - Debug::print("_wsystem() returned ", exit_code, '\n'); + Debug::print("_wsystem() returned ", + exit_code, + " after ", + Strings::format("%8d", static_cast<int>(timer.microseconds())), + " us\n"); #else Debug::print("_system(", cmd_line, ")\n"); const int exit_code = system(cmd_line.c_str()); - Debug::print("_system() returned ", exit_code, '\n'); + Debug::print("_system() returned ", + exit_code, + " after ", + Strings::format("%8d", static_cast<int>(timer.microseconds())), + " us\n"); #endif return exit_code; } @@ -595,6 +607,11 @@ namespace vcpkg #else void System::register_console_ctrl_handler() {} #endif + + int System::get_num_logical_cores() + { + return std::thread::hardware_concurrency(); + } } namespace vcpkg::Debug diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index 53b782edc..059a09432 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -6,6 +6,7 @@ #include <vcpkg/base/hash.h>
#include <vcpkg/base/optional.h>
#include <vcpkg/base/stringliteral.h>
+#include <vcpkg/base/system.debug.h>
#include <vcpkg/base/system.print.h>
#include <vcpkg/base/system.process.h>
@@ -22,6 +23,7 @@ #include <vcpkg/vcpkglib.h>
using vcpkg::Build::BuildResult;
+using vcpkg::Dependencies::PathsPortFileProvider;
using vcpkg::Parse::ParseControlErrorInfo;
using vcpkg::Parse::ParseExpected;
@@ -33,34 +35,26 @@ namespace vcpkg::Build::Command static constexpr StringLiteral OPTION_CHECKS_ONLY = "--checks-only";
void perform_and_exit_ex(const FullPackageSpec& full_spec,
- const fs::path& port_dir,
+ const SourceControlFileLocation& scfl,
const ParsedArguments& options,
const VcpkgPaths& paths)
{
const PackageSpec& spec = full_spec.package_spec;
+ const auto& scf = *scfl.source_control_file;
if (Util::Sets::contains(options.switches, OPTION_CHECKS_ONLY))
{
const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet());
const auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec));
- const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
+ const size_t error_count =
+ PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info, scfl.source_location);
Checks::check_exit(VCPKG_LINE_INFO, error_count == 0);
Checks::exit_success(VCPKG_LINE_INFO);
}
- const ParseExpected<SourceControlFile> source_control_file =
- Paragraphs::try_load_port(paths.get_filesystem(), port_dir);
-
- if (!source_control_file.has_value())
- {
- print_error_message(source_control_file.error());
- Checks::exit_fail(VCPKG_LINE_INFO);
- }
-
- const auto& scf = source_control_file.value_or_exit(VCPKG_LINE_INFO);
Checks::check_exit(VCPKG_LINE_INFO,
- spec.name() == scf->core_paragraph->name,
+ spec.name() == scf.core_paragraph->name,
"The Source field inside the CONTROL file does not match the port directory: '%s' != '%s'",
- scf->core_paragraph->name,
+ scf.core_paragraph->name,
spec.name());
const StatusParagraphs status_db = database_load_check(paths);
@@ -69,6 +63,7 @@ namespace vcpkg::Build::Command Build::AllowDownloads::YES,
Build::CleanBuildtrees::NO,
Build::CleanPackages::NO,
+ Build::CleanDownloads::NO,
Build::DownloadTool::BUILT_IN,
GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO,
Build::FailOnTombstone::NO,
@@ -78,7 +73,7 @@ namespace vcpkg::Build::Command features_as_set.emplace("core");
const Build::BuildPackageConfig build_config{
- *scf, spec.triplet(), fs::path{port_dir}, build_package_options, features_as_set};
+ scf, spec.triplet(), fs::path(scfl.source_location), build_package_options, features_as_set};
const auto build_timer = Chrono::ElapsedTimer::create_started();
const auto result = Build::build_package(paths, build_config, status_db);
@@ -126,15 +121,19 @@ namespace vcpkg::Build::Command // Build only takes a single package and all dependencies must already be installed
const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE);
std::string first_arg = args.command_arguments.at(0);
+
const FullPackageSpec spec = Input::check_and_get_full_package_spec(
std::move(first_arg), default_triplet, COMMAND_STRUCTURE.example_text);
+
Input::check_triplet(spec.package_spec.triplet(), paths);
- if (!spec.features.empty() && !GlobalState::feature_packages)
- {
- Checks::exit_with_message(
- VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag.");
- }
- perform_and_exit_ex(spec, paths.port_dir(spec.package_spec), options, paths);
+
+ PathsPortFileProvider provider(paths, args.overlay_ports.get());
+ const auto port_name = spec.package_spec.name();
+ const auto* scfl = provider.get_control_file(port_name).get();
+
+ Checks::check_exit(VCPKG_LINE_INFO, scfl != nullptr, "Error: Couldn't find port '%s'", port_name);
+
+ perform_and_exit_ex(spec, *scfl, options, paths);
}
}
@@ -237,7 +236,7 @@ namespace vcpkg::Build if (!pre_build_info.cmake_system_name.empty() && pre_build_info.cmake_system_name != "WindowsStore") return "";
const char* tonull = " >nul";
- if (GlobalState::debugging)
+ if (Debug::g_debugging)
{
tonull = "";
}
@@ -283,7 +282,7 @@ namespace vcpkg::Build start += "\n" + Strings::serialize(feature);
}
const fs::path binary_control_file = paths.packages / bcf.core_paragraph.dir() / "CONTROL";
- paths.get_filesystem().write_contents(binary_control_file, start);
+ paths.get_filesystem().write_contents(binary_control_file, start, VCPKG_LINE_INFO);
}
static std::vector<FeatureSpec> compute_required_feature_specs(const BuildPackageConfig& config,
@@ -337,6 +336,23 @@ namespace vcpkg::Build return ret;
}
+ static int get_concurrency()
+ {
+ static int concurrency = [] {
+ auto user_defined_concurrency = System::get_environment_variable("VCPKG_MAX_CONCURRENCY");
+ if (user_defined_concurrency)
+ {
+ return std::stoi(user_defined_concurrency.value_or_exit(VCPKG_LINE_INFO));
+ }
+ else
+ {
+ return System::get_num_logical_cores() + 1;
+ }
+ }();
+
+ return concurrency;
+ }
+
static ExtendedBuildResult do_build_package(const VcpkgPaths& paths,
const PreBuildInfo& pre_build_info,
const PackageSpec& spec,
@@ -346,6 +362,12 @@ namespace vcpkg::Build auto& fs = paths.get_filesystem();
const Triplet& triplet = spec.triplet();
+ if (!Strings::starts_with(Strings::ascii_to_lowercase(config.port_dir.u8string()),
+ Strings::ascii_to_lowercase(paths.ports.u8string())))
+ {
+ System::printf("-- Installing port from location: %s\n", config.port_dir.u8string());
+ }
+
#if !defined(_WIN32)
// TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107.
// bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted.
@@ -363,19 +385,19 @@ namespace vcpkg::Build const Toolset& toolset = paths.get_toolset(pre_build_info);
- std::vector<System::CMakeVariable> variables {
+ std::vector<System::CMakeVariable> variables{
{"CMD", "BUILD"},
{"PORT", config.scf.core_paragraph->name},
{"CURRENT_PORT_DIR", config.port_dir},
{"TARGET_TRIPLET", spec.triplet().canonical_name()},
{"VCPKG_PLATFORM_TOOLSET", toolset.version.c_str()},
- {"VCPKG_USE_HEAD_VERSION",
- Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
+ {"VCPKG_USE_HEAD_VERSION", Util::Enum::to_bool(config.build_package_options.use_head_version) ? "1" : "0"},
{"DOWNLOADS", paths.downloads},
{"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
{"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
{"FEATURES", Strings::join(";", config.feature_list)},
{"ALL_FEATURES", all_features},
+ {"VCPKG_CONCURRENCY", std::to_string(get_concurrency())},
};
if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
@@ -383,10 +405,7 @@ namespace vcpkg::Build variables.push_back({"GIT", git_exe_path});
}
- const std::string cmd_launch_cmake = System::make_cmake_cmd(
- cmake_exe_path,
- paths.ports_cmake,
- variables);
+ const std::string cmd_launch_cmake = System::make_cmake_cmd(cmake_exe_path, paths.ports_cmake, variables);
auto command = make_build_env_cmd(pre_build_info, toolset);
if (!command.empty())
@@ -417,7 +436,8 @@ namespace vcpkg::Build }
const BuildInfo build_info = read_build_info(fs, paths.build_info_file_path(spec));
- const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
+ const size_t error_count =
+ PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info, config.port_dir);
auto bcf = create_binary_control_file(*config.scf.core_paragraph, triplet, build_info, abi_tag);
@@ -487,14 +507,14 @@ namespace vcpkg::Build // the order of recursive_directory_iterator is undefined so save the names to sort
std::vector<fs::path> port_files;
- for (auto &port_file : fs::stdfs::recursive_directory_iterator(config.port_dir))
+ for (auto& port_file : fs::stdfs::recursive_directory_iterator(config.port_dir))
{
if (fs::is_regular_file(status(port_file)))
{
port_files.push_back(port_file);
if (port_files.size() > max_port_file_count)
{
- abi_tag_entries.emplace_back(AbiEntry{ "no_hash_max_portfile", "" });
+ abi_tag_entries.emplace_back(AbiEntry{"no_hash_max_portfile", ""});
break;
}
}
@@ -505,17 +525,17 @@ namespace vcpkg::Build std::sort(port_files.begin(), port_files.end());
int counter = 0;
- for (auto & port_file : port_files)
+ for (auto& port_file : port_files)
{
// When vcpkg takes a dependency on C++17 it can use fs::relative,
// which will give a stable ordering and better names in the key entry.
// this is not available in the filesystem TS so instead number the files for the key.
std::string key = Strings::format("file_%03d", counter++);
- if (GlobalState::debugging)
+ if (Debug::g_debugging)
{
System::print2("[DEBUG] mapping ", key, " from ", port_file.u8string(), "\n");
}
- abi_tag_entries.emplace_back(AbiEntry{ key, vcpkg::Hash::get_file_hash(fs, port_file, "SHA1") });
+ abi_tag_entries.emplace_back(AbiEntry{key, vcpkg::Hash::get_file_hash(fs, port_file, "SHA1")});
}
}
@@ -536,7 +556,7 @@ namespace vcpkg::Build const std::string full_abi_info =
Strings::join("", abi_tag_entries, [](const AbiEntry& p) { return p.key + " " + p.value + "\n"; });
- if (GlobalState::debugging)
+ if (Debug::g_debugging)
{
System::print2("[DEBUG] <abientries>\n");
for (auto&& entry : abi_tag_entries)
@@ -554,7 +574,7 @@ namespace vcpkg::Build std::error_code ec;
fs.create_directories(paths.buildtrees / name, ec);
const auto abi_file_path = paths.buildtrees / name / (triplet.canonical_name() + ".vcpkg_abi_info.txt");
- fs.write_contents(abi_file_path, full_abi_info);
+ fs.write_contents(abi_file_path, full_abi_info, VCPKG_LINE_INFO);
return AbiTagAndFile{Hash::get_file_hash(fs, abi_file_path, "SHA1"), abi_file_path};
}
@@ -605,8 +625,8 @@ namespace vcpkg::Build System::cmd_execute_clean(Strings::format(
R"("%s" a "%s" "%s\*" >nul)", seven_zip_exe.u8string(), destination.u8string(), source.u8string()));
#else
- System::cmd_execute_clean(Strings::format(
- R"(cd '%s' && zip --quiet -r '%s' *)", source.u8string(), destination.u8string()));
+ System::cmd_execute_clean(
+ Strings::format(R"(cd '%s' && zip --quiet -r '%s' *)", source.u8string(), destination.u8string()));
#endif
}
@@ -694,7 +714,7 @@ namespace vcpkg::Build }
}
- System::print2("Could not locate cached archive: ", archive_path.u8string(), "\n");
+ System::printf("Could not locate cached archive: %s\n", archive_path.u8string());
ExtendedBuildResult result = do_build_package_and_clean_buildtrees(
paths, pre_build_info, spec, maybe_abi_tag_and_file.value_or(AbiTagAndFile{}).tag, config);
@@ -733,7 +753,7 @@ namespace vcpkg::Build const auto tmp_failure_zip = paths.buildtrees / spec.name() / "failure_logs.zip";
fs.create_directories(tmp_log_path_destination, ec);
- for (auto &log_file : fs::stdfs::directory_iterator(paths.buildtrees / spec.name()))
+ for (auto& log_file : fs::stdfs::directory_iterator(paths.buildtrees / spec.name()))
{
if (log_file.path().extension() == ".log")
{
diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp index afef518eb..3cf4dd98f 100644 --- a/toolsrc/src/vcpkg/commands.autocomplete.cpp +++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp @@ -90,7 +90,8 @@ namespace vcpkg::Commands::Autocomplete const auto port_name = match[2].str(); const auto triplet_prefix = match[3].str(); - auto maybe_port = Paragraphs::try_load_port(paths.get_filesystem(), paths.port_dir(port_name)); + // TODO: Support autocomplete for ports in --overlay-ports + auto maybe_port = Paragraphs::try_load_port(paths.get_filesystem(), paths.ports / port_name); if (maybe_port.error()) { Checks::exit_success(VCPKG_LINE_INFO); diff --git a/toolsrc/src/vcpkg/commands.buildexternal.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp index 19b89c2f5..1c3c511c2 100644 --- a/toolsrc/src/vcpkg/commands.buildexternal.cpp +++ b/toolsrc/src/vcpkg/commands.buildexternal.cpp @@ -23,7 +23,12 @@ namespace vcpkg::Commands::BuildExternal std::string(args.command_arguments.at(0)), default_triplet, COMMAND_STRUCTURE.example_text); Input::check_triplet(spec.package_spec.triplet(), paths); - const fs::path port_dir = args.command_arguments.at(1); - Build::Command::perform_and_exit_ex(spec, port_dir, options, paths); + auto overlays = args.overlay_ports ? *args.overlay_ports : std::vector<std::string>(); + overlays.insert(overlays.begin(), args.command_arguments.at(1)); + Dependencies::PathsPortFileProvider provider(paths, &overlays); + auto maybe_scfl = provider.get_control_file(spec.package_spec.name()); + Checks::check_exit( + VCPKG_LINE_INFO, maybe_scfl.has_value(), "could not load control file for %s", spec.package_spec.name()); + Build::Command::perform_and_exit_ex(spec, maybe_scfl.value_or_exit(VCPKG_LINE_INFO), options, paths); } } diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 10cb7d9fe..8cab79504 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -55,27 +55,20 @@ namespace vcpkg::Commands::CI struct XunitTestResults { public: + XunitTestResults() { m_assembly_run_datetime = Chrono::CTime::get_current_date_time(); } - XunitTestResults() + void add_test_results(const std::string& spec, + const Build::BuildResult& build_result, + const Chrono::ElapsedTime& elapsed_time, + const std::string& abi_tag) { - m_assembly_run_datetime = Chrono::CTime::get_current_date_time(); - } - - void add_test_results(const std::string& spec, const Build::BuildResult& build_result, const Chrono::ElapsedTime& elapsed_time, const std::string& abi_tag) - { - m_collections.back().tests.push_back({ spec, build_result, elapsed_time, abi_tag }); + m_collections.back().tests.push_back({spec, build_result, elapsed_time, abi_tag}); } // Starting a new test collection - void push_collection( const std::string& name) - { - m_collections.push_back({name}); - } + void push_collection(const std::string& name) { m_collections.push_back({name}); } - void collection_time(const vcpkg::Chrono::ElapsedTime& time) - { - m_collections.back().time = time; - } + void collection_time(const vcpkg::Chrono::ElapsedTime& time) { m_collections.back().time = time; } const std::string& build_xml() { @@ -96,13 +89,9 @@ namespace vcpkg::Commands::CI return m_xml; } - void assembly_time(const vcpkg::Chrono::ElapsedTime& assembly_time) - { - m_assembly_time = assembly_time; - } + void assembly_time(const vcpkg::Chrono::ElapsedTime& assembly_time) { m_assembly_time = assembly_time; } private: - struct XunitTest { std::string name; @@ -126,34 +115,33 @@ namespace vcpkg::Commands::CI auto rawDateTime = m_assembly_run_datetime.get()->to_string(); // The expected format is "yyyy-mm-ddThh:mm:ss.0Z" // 0123456789012345678901 - datetime = Strings::format(R"(run-date="%s" run-time="%s")", - rawDateTime.substr(0, 10), rawDateTime.substr(11, 8)); + datetime = Strings::format( + R"(run-date="%s" run-time="%s")", rawDateTime.substr(0, 10), rawDateTime.substr(11, 8)); } std::string time = Strings::format(R"(time="%lld")", m_assembly_time.as<std::chrono::seconds>().count()); - m_xml += Strings::format( - R"(<assemblies>)" "\n" - R"( <assembly name="vcpkg" %s %s>)" "\n" - , datetime, time); + m_xml += Strings::format(R"(<assemblies>)" + "\n" + R"( <assembly name="vcpkg" %s %s>)" + "\n", + datetime, + time); } void xml_finish_assembly() { m_xml += " </assembly>\n" - "</assemblies>\n"; + "</assemblies>\n"; } void xml_start_collection(const XunitCollection& collection) { m_xml += Strings::format(R"( <collection name="%s" time="%lld">)" - "\n", - collection.name, - collection.time.as<std::chrono::seconds>().count()); - } - void xml_finish_collection() - { - m_xml += " </collection>\n"; + "\n", + collection.name, + collection.time.as<std::chrono::seconds>().count()); } + void xml_finish_collection() { m_xml += " </collection>\n"; } void xml_test(const XunitTest& test) { @@ -161,23 +149,20 @@ namespace vcpkg::Commands::CI const char* result_string = ""; switch (test.result) { - case BuildResult::POST_BUILD_CHECKS_FAILED: - case BuildResult::FILE_CONFLICTS: - case BuildResult::BUILD_FAILED: - result_string = "Fail"; - message_block = Strings::format("<failure><message><![CDATA[%s]]></message></failure>", to_string(test.result)); - break; - case BuildResult::EXCLUDED: - case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: - result_string = "Skip"; - message_block = Strings::format("<reason><![CDATA[%s]]></reason>", to_string(test.result)); - break; - case BuildResult::SUCCEEDED: - result_string = "Pass"; - break; - default: - Checks::exit_fail(VCPKG_LINE_INFO); - break; + case BuildResult::POST_BUILD_CHECKS_FAILED: + case BuildResult::FILE_CONFLICTS: + case BuildResult::BUILD_FAILED: + result_string = "Fail"; + message_block = + Strings::format("<failure><message><![CDATA[%s]]></message></failure>", to_string(test.result)); + break; + case BuildResult::EXCLUDED: + case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: + result_string = "Skip"; + message_block = Strings::format("<reason><![CDATA[%s]]></reason>", to_string(test.result)); + break; + case BuildResult::SUCCEEDED: result_string = "Pass"; break; + default: Checks::exit_fail(VCPKG_LINE_INFO); break; } std::string traits_block; @@ -187,13 +172,13 @@ namespace vcpkg::Commands::CI } m_xml += Strings::format(R"( <test name="%s" method="%s" time="%lld" result="%s">%s%s</test>)" - "\n", - test.name, - test.name, - test.time.as<std::chrono::seconds>().count(), - result_string, - traits_block, - message_block); + "\n", + test.name, + test.name, + test.time.as<std::chrono::seconds>().count(), + result_string, + traits_block, + message_block); } Optional<vcpkg::Chrono::CTime> m_assembly_run_datetime; @@ -203,7 +188,6 @@ namespace vcpkg::Commands::CI std::string m_xml; }; - struct UnknownCIPortsResults { std::vector<FullPackageSpec> unknown; @@ -212,11 +196,12 @@ namespace vcpkg::Commands::CI std::map<PackageSpec, std::string> abi_tag_map; }; - static std::unique_ptr<UnknownCIPortsResults> find_unknown_ports_for_ci(const VcpkgPaths& paths, - const std::set<std::string>& exclusions, - const Dependencies::PortFileProvider& provider, - const std::vector<FeatureSpec>& fspecs, - const bool purge_tombstones) + static std::unique_ptr<UnknownCIPortsResults> find_unknown_ports_for_ci( + const VcpkgPaths& paths, + const std::set<std::string>& exclusions, + const Dependencies::PortFileProvider& provider, + const std::vector<FeatureSpec>& fspecs, + const bool purge_tombstones) { auto ret = std::make_unique<UnknownCIPortsResults>(); @@ -229,6 +214,7 @@ namespace vcpkg::Commands::CI Build::AllowDownloads::YES, Build::CleanBuildtrees::YES, Build::CleanPackages::YES, + Build::CleanDownloads::NO, Build::DownloadTool::BUILT_IN, GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO, Build::FailOnTombstone::YES, @@ -246,12 +232,17 @@ namespace vcpkg::Commands::CI { // determine abi tag std::string abi; - if (auto scf = p->source_control_file.get()) + if (auto scfl = p->source_control_file_location.get()) { auto triplet = p->spec.triplet(); - const Build::BuildPackageConfig build_config { - *scf, triplet, paths.port_dir(p->spec), build_options, p->feature_list}; + const Build::BuildPackageConfig build_config{ + *scfl->source_control_file, + triplet, + static_cast<fs::path>(scfl->source_location), + build_options, + p->feature_list + }; auto dependency_abis = Util::fmap(p->computed_dependencies, [&](const PackageSpec& spec) -> Build::AbiEntry { @@ -296,7 +287,7 @@ namespace vcpkg::Commands::CI bool b_will_build = false; ret->features.emplace(p->spec, - std::vector<std::string> {p->feature_list.begin(), p->feature_list.end()}); + std::vector<std::string>{p->feature_list.begin(), p->feature_list.end()}); if (Util::Sets::contains(exclusions, p->spec.name())) { @@ -365,13 +356,15 @@ namespace vcpkg::Commands::CI } StatusParagraphs status_db = database_load_check(paths); - const auto& paths_port_file = Dependencies::PathsPortFileProvider(paths); + + Dependencies::PathsPortFileProvider provider(paths, args.overlay_ports.get()); const Build::BuildPackageOptions install_plan_options = { Build::UseHeadVersion::NO, Build::AllowDownloads::YES, Build::CleanBuildtrees::YES, Build::CleanPackages::YES, + Build::CleanDownloads::NO, Build::DownloadTool::BUILT_IN, GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO, Build::FailOnTombstone::YES, @@ -382,7 +375,10 @@ namespace vcpkg::Commands::CI XunitTestResults xunitTestResults; - std::vector<std::string> all_ports = Install::get_all_port_names(paths); + std::vector<std::string> all_ports = + Util::fmap(provider.load_all_control_files(), [](auto&& scfl) -> std::string { + return scfl->source_control_file.get()->core_paragraph->name; + }); std::vector<TripletAndSummary> results; auto timer = Chrono::ElapsedTimer::create_started(); for (const Triplet& triplet : triplets) @@ -391,13 +387,13 @@ namespace vcpkg::Commands::CI xunitTestResults.push_collection(triplet.canonical_name()); - Dependencies::PackageGraph pgraph(paths_port_file, status_db); + Dependencies::PackageGraph pgraph(provider, status_db); std::vector<PackageSpec> specs = PackageSpec::to_package_specs(all_ports, triplet); // Install the default features for every package auto all_feature_specs = Util::fmap(specs, [](auto& spec) { return FeatureSpec(spec, ""); }); auto split_specs = - find_unknown_ports_for_ci(paths, exclusions_set, paths_port_file, all_feature_specs, purge_tombstones); + find_unknown_ports_for_ci(paths, exclusions_set, provider, all_feature_specs, purge_tombstones); auto feature_specs = FullPackageSpec::to_feature_specs(split_specs->unknown); for (auto&& fspec : feature_specs) @@ -467,21 +463,27 @@ namespace vcpkg::Commands::CI for (auto&& result : summary.results) { split_specs->known.erase(result.spec); - xunitTestResults.add_test_results(result.spec.to_string(), result.build_result.code, result.timing, split_specs->abi_tag_map.at(result.spec)); + xunitTestResults.add_test_results(result.spec.to_string(), + result.build_result.code, + result.timing, + split_specs->abi_tag_map.at(result.spec)); } // Adding results for ports that were not built because they have known states for (auto&& port : split_specs->known) { - xunitTestResults.add_test_results(port.first.to_string(), port.second, Chrono::ElapsedTime{}, split_specs->abi_tag_map.at(port.first)); + xunitTestResults.add_test_results(port.first.to_string(), + port.second, + Chrono::ElapsedTime{}, + split_specs->abi_tag_map.at(port.first)); } all_known_results.emplace_back(std::move(split_specs->known)); abi_tag_map.insert(split_specs->abi_tag_map.begin(), split_specs->abi_tag_map.end()); - results.push_back({ triplet, std::move(summary)}); + results.push_back({triplet, std::move(summary)}); - xunitTestResults.collection_time( collection_time_elapsed ); + xunitTestResults.collection_time(collection_time_elapsed); } } xunitTestResults.assembly_time(timer.elapsed()); @@ -492,11 +494,11 @@ namespace vcpkg::Commands::CI System::print2("Total elapsed time: ", result.summary.total_elapsed_time, "\n"); result.summary.print(); } - + auto& fs = paths.get_filesystem(); auto it_xunit = options.settings.find(OPTION_XUNIT); if (it_xunit != options.settings.end()) { - paths.get_filesystem().write_contents(fs::u8path(it_xunit->second), xunitTestResults.build_xml()); + fs.write_contents(fs::u8path(it_xunit->second), xunitTestResults.build_xml(), VCPKG_LINE_INFO); } Checks::exit_success(VCPKG_LINE_INFO); diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index a6f2c8838..31bf97f30 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -9,8 +9,7 @@ namespace vcpkg::Commands::Create { const CommandStructure COMMAND_STRUCTURE = { - Help::create_example_string( - R"###(create zlib2 http://zlib.net/zlib1211.zip "zlib1211-2.zip")###"), + Help::create_example_string(R"###(create zlib2 http://zlib.net/zlib1211.zip "zlib1211-2.zip")###"), 2, 3, {}, diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp index 92ba15c1f..c0800a4b5 100644 --- a/toolsrc/src/vcpkg/commands.dependinfo.cpp +++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp @@ -6,6 +6,9 @@ #include <vcpkg/commands.h>
#include <vcpkg/help.h>
#include <vcpkg/paragraphs.h>
+#include <vcpkg/dependencies.h>
+
+using vcpkg::Dependencies::PathsPortFileProvider;
namespace vcpkg::Commands::DependInfo
{
@@ -16,7 +19,8 @@ namespace vcpkg::Commands::DependInfo constexpr std::array<CommandSwitch, 3> DEPEND_SWITCHES = {{
{OPTION_DOT, "Creates graph on basis of dot"},
{OPTION_DGML, "Creates graph on basis of dgml"},
- {OPTION_NO_RECURSE, "Computes only immediate dependencies of packages explicitly specified on the command-line"},
+ {OPTION_NO_RECURSE,
+ "Computes only immediate dependencies of packages explicitly specified on the command-line"},
}};
const CommandStructure COMMAND_STRUCTURE = {
@@ -34,7 +38,7 @@ namespace vcpkg::Commands::DependInfo return output;
}
- std::string create_dot_as_string(const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
+ std::string create_dot_as_string(const std::vector<const SourceControlFile*>& source_control_files)
{
int empty_node_count = 0;
@@ -63,7 +67,7 @@ namespace vcpkg::Commands::DependInfo return s;
}
- std::string create_dgml_as_string(const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
+ std::string create_dgml_as_string(const std::vector<const SourceControlFile*>& source_control_files)
{
std::string s;
s.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
@@ -108,7 +112,7 @@ namespace vcpkg::Commands::DependInfo }
std::string create_graph_as_string(const std::unordered_set<std::string>& switches,
- const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files)
+ const std::vector<const SourceControlFile*>& source_control_files)
{
if (Util::Sets::contains(switches, OPTION_DOT))
{
@@ -123,7 +127,7 @@ namespace vcpkg::Commands::DependInfo void build_dependencies_list(std::set<std::string>& packages_to_keep,
const std::string& requested_package,
- const std::vector<std::unique_ptr<SourceControlFile>>& source_control_files,
+ const std::vector<const SourceControlFile*>& source_control_files,
const std::unordered_set<std::string>& switches)
{
const auto source_control_file =
@@ -153,7 +157,11 @@ namespace vcpkg::Commands::DependInfo {
const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE);
- auto source_control_files = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports);
+ // TODO: Optimize implementation, current implementation needs to load all ports from disk which is too slow.
+ PathsPortFileProvider provider(paths, args.overlay_ports.get());
+ auto source_control_files = Util::fmap(provider.load_all_control_files(), [](auto&& scfl) -> const SourceControlFile * {
+ return scfl->source_control_file.get();
+ });
if (args.command_arguments.size() >= 1)
{
@@ -177,7 +185,7 @@ namespace vcpkg::Commands::DependInfo for (auto&& source_control_file : source_control_files)
{
- const SourceParagraph& source_paragraph = *source_control_file->core_paragraph;
+ const SourceParagraph& source_paragraph = *source_control_file->core_paragraph.get();
const auto s = Strings::join(", ", source_paragraph.depends, [](const Dependency& d) { return d.name(); });
System::print2(source_paragraph.name, ": ", s, "\n");
}
diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index b2309aa41..f2f0b1569 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -19,26 +19,16 @@ namespace vcpkg::Commands::Edit HKEY root; StringLiteral subkey; } REGKEYS[] = { - { - HKEY_LOCAL_MACHINE, - R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1)" - }, - { - HKEY_LOCAL_MACHINE, - R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1)" - }, - { - HKEY_LOCAL_MACHINE, - R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1)" - }, - { - HKEY_CURRENT_USER, - R"(Software\Microsoft\Windows\CurrentVersion\Uninstall\{771FD6B0-FA20-440A-A002-3B3BAC16DC50}_is1)" - }, - { - HKEY_LOCAL_MACHINE, - R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1)" - }, + {HKEY_LOCAL_MACHINE, + R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1)"}, + {HKEY_LOCAL_MACHINE, + R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1)"}, + {HKEY_LOCAL_MACHINE, + R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1)"}, + {HKEY_CURRENT_USER, + R"(Software\Microsoft\Windows\CurrentVersion\Uninstall\{771FD6B0-FA20-440A-A002-3B3BAC16DC50}_is1)"}, + {HKEY_LOCAL_MACHINE, + R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1)"}, }; for (auto&& keypath : REGKEYS) @@ -89,6 +79,7 @@ namespace vcpkg::Commands::Edit const auto& fs = paths.get_filesystem(); auto packages = fs.get_files_non_recursive(paths.packages); + // TODO: Support edit for --overlay-ports return Util::fmap(ports, [&](const std::string& port_name) -> std::string { const auto portpath = paths.ports / port_name; const auto portfile = portpath / "portfile.cmake"; @@ -177,7 +168,8 @@ namespace vcpkg::Commands::Edit const std::vector<fs::path> from_registry = find_from_registry(); candidate_paths.insert(candidate_paths.end(), from_registry.cbegin(), from_registry.cend()); #elif defined(__APPLE__) - candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"}); + candidate_paths.push_back( + fs::path{"/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code"}); candidate_paths.push_back(fs::path{"/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code"}); #elif defined(__linux__) candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"}); diff --git a/toolsrc/src/vcpkg/commands.exportifw.cpp b/toolsrc/src/vcpkg/commands.exportifw.cpp index ba9e28233..f0946110c 100644 --- a/toolsrc/src/vcpkg/commands.exportifw.cpp +++ b/toolsrc/src/vcpkg/commands.exportifw.cpp @@ -106,7 +106,8 @@ namespace vcpkg::Export::IFW create_release_date(), action.spec.name(), action.spec.triplet().canonical_name(), - deps)); + deps), + VCPKG_LINE_INFO); // Return dir path for export package data return ifw_packages_dir_path / @@ -138,7 +139,8 @@ namespace vcpkg::Export::IFW <ReleaseDate>%s</ReleaseDate> </Package> )###", - create_release_date())); + create_release_date()), + VCPKG_LINE_INFO); for (const auto& unique_package : unique_packages) { @@ -167,7 +169,8 @@ namespace vcpkg::Export::IFW action.spec.name(), safe_rich_from_plain_text(binary_paragraph.description), binary_paragraph.version, - create_release_date())); + create_release_date()), + VCPKG_LINE_INFO); } } @@ -195,7 +198,8 @@ namespace vcpkg::Export::IFW <ReleaseDate>%s</ReleaseDate> </Package> )###", - create_release_date())); + create_release_date()), + VCPKG_LINE_INFO); for (const std::string& triplet : unique_triplets) { @@ -217,7 +221,8 @@ namespace vcpkg::Export::IFW </Package> )###", triplet, - create_release_date())); + create_release_date()), + VCPKG_LINE_INFO); } } @@ -243,7 +248,8 @@ namespace vcpkg::Export::IFW <ReleaseDate>%s</ReleaseDate> </Package> )###", - create_release_date())); + create_release_date()), + VCPKG_LINE_INFO); } void export_config(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths) @@ -283,7 +289,8 @@ namespace vcpkg::Export::IFW <TargetDir>@RootDir@/src/vcpkg</TargetDir>%s </Installer> )###", - formatted_repo_url)); + formatted_repo_url), + VCPKG_LINE_INFO); } void export_maintenance_tool(const fs::path& ifw_packages_dir_path, const VcpkgPaths& paths) @@ -325,7 +332,8 @@ namespace vcpkg::Export::IFW <ForcedInstallation>true</ForcedInstallation> </Package> )###", - create_release_date())); + create_release_date()), + VCPKG_LINE_INFO); const fs::path script_source = paths.root / "scripts" / "ifw" / "maintenance.qs"; const fs::path script_destination = ifw_packages_dir_path / "maintenance" / "meta" / "maintenance.qs"; fs.copy_file(script_source, script_destination, fs::copy_options::overwrite_existing, ec); diff --git a/toolsrc/src/vcpkg/commands.import.cpp b/toolsrc/src/vcpkg/commands.import.cpp index a2fd5d15d..40f5a434c 100644 --- a/toolsrc/src/vcpkg/commands.import.cpp +++ b/toolsrc/src/vcpkg/commands.import.cpp @@ -89,12 +89,11 @@ namespace vcpkg::Commands::Import place_library_files_in(paths.get_filesystem(), include_directory, project_directory, library_destination_path); const fs::path control_file_path = library_destination_path / "CONTROL"; - fs.write_contents(control_file_path, Strings::serialize(control_file_data)); + fs.write_contents(control_file_path, Strings::serialize(control_file_data), VCPKG_LINE_INFO); } const CommandStructure COMMAND_STRUCTURE = { - Help::create_example_string( - R"(import C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)"), + Help::create_example_string(R"(import C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)"), 3, 3, {}, diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 026ab3b77..6921a5390 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -124,7 +124,7 @@ namespace vcpkg::Commands::Integrate static ElevationPromptChoice elevated_cmd_execute(const std::string& param) { - SHELLEXECUTEINFOW sh_ex_info {}; + SHELLEXECUTEINFOW sh_ex_info{}; sh_ex_info.cbSize = sizeof(sh_ex_info); sh_ex_info.fMask = SEE_MASK_NOCLOSEPROCESS; sh_ex_info.hwnd = nullptr; @@ -209,7 +209,7 @@ namespace vcpkg::Commands::Integrate if (should_install_system) { const fs::path sys_src_path = tmp_dir / "vcpkg.system.targets"; - fs.write_contents(sys_src_path, create_system_targets_shortcut()); + fs.write_contents(sys_src_path, create_system_targets_shortcut(), VCPKG_LINE_INFO); const std::string param = Strings::format(R"(/c mkdir "%s" & copy "%s" "%s" /Y > nul)", SYSTEM_WIDE_TARGETS_FILE.parent_path().string(), @@ -248,7 +248,8 @@ namespace vcpkg::Commands::Integrate const fs::path appdata_src_path = tmp_dir / "vcpkg.user.targets"; fs.write_contents(appdata_src_path, - create_appdata_targets_shortcut(paths.buildsystems_msbuild_targets.u8string())); + create_appdata_targets_shortcut(paths.buildsystems_msbuild_targets.u8string()), + VCPKG_LINE_INFO); auto appdata_dst_path = get_appdata_targets_path(); const auto rc = fs.copy_file(appdata_src_path, appdata_dst_path, fs::copy_options::overwrite_existing, ec); @@ -268,12 +269,7 @@ namespace vcpkg::Commands::Integrate const auto pathtxt = get_path_txt_path(); std::error_code ec; - fs.write_contents(pathtxt, paths.root.generic_u8string(), ec); - if (ec) - { - System::print2(System::Color::error, "Error: Failed to write file: ", pathtxt.u8string(), "\n"); - Checks::exit_fail(VCPKG_LINE_INFO); - } + fs.write_contents(pathtxt, paths.root.generic_u8string(), VCPKG_LINE_INFO); System::print2(System::Color::success, "Applied user-wide integration for this vcpkg root.\n"); const fs::path cmake_toolchain = paths.buildsystems / "vcpkg.cmake"; @@ -344,9 +340,11 @@ CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=%s" const std::string nuget_id = get_nuget_id(paths.root); const std::string nupkg_version = "1.0.0"; - fs.write_contents(targets_file_path, create_nuget_targets_file_contents(paths.buildsystems_msbuild_targets)); - fs.write_contents(props_file_path, create_nuget_props_file_contents()); - fs.write_contents(nuspec_file_path, create_nuspec_file_contents(paths.root, nuget_id, nupkg_version)); + fs.write_contents( + targets_file_path, create_nuget_targets_file_contents(paths.buildsystems_msbuild_targets), VCPKG_LINE_INFO); + fs.write_contents(props_file_path, create_nuget_props_file_contents(), VCPKG_LINE_INFO); + fs.write_contents( + nuspec_file_path, create_nuspec_file_contents(paths.root, nuget_id, nupkg_version), VCPKG_LINE_INFO); // Using all forward slashes for the command line const std::string cmd_line = Strings::format(R"("%s" pack -OutputDirectory "%s" "%s" > nul)", @@ -415,7 +413,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console static void integrate_bash(const VcpkgPaths& paths) { const auto home_path = System::get_environment_variable("HOME").value_or_exit(VCPKG_LINE_INFO); - const fs::path bashrc_path = fs::path {home_path} / ".bashrc"; + const fs::path bashrc_path = fs::path{home_path} / ".bashrc"; auto& fs = paths.get_filesystem(); const fs::path completion_script_path = paths.scripts / "vcpkg_completion.bash"; @@ -430,7 +428,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console for (auto&& line : bashrc_content) { std::smatch match; - if (std::regex_match(line, match, std::regex {R"###(^source.*scripts/vcpkg_completion.bash$)###"})) + if (std::regex_match(line, match, std::regex{R"###(^source.*scripts/vcpkg_completion.bash$)###"})) { matches.push_back(line); } @@ -439,17 +437,17 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console if (!matches.empty()) { System::printf("vcpkg bash completion is already imported to your %s file.\n" - "The following entries were found:\n" - " %s\n" - "Please make sure you have started a new bash shell for the changes to take effect.\n", - bashrc_path.u8string(), - Strings::join("\n ", matches)); + "The following entries were found:\n" + " %s\n" + "Please make sure you have started a new bash shell for the changes to take effect.\n", + bashrc_path.u8string(), + Strings::join("\n ", matches)); Checks::exit_success(VCPKG_LINE_INFO); } System::printf("Adding vcpkg completion entry to %s\n", bashrc_path.u8string()); bashrc_content.push_back(Strings::format("source %s", completion_script_path.u8string())); - fs.write_contents(bashrc_path, Strings::join("\n", bashrc_content) + '\n'); + fs.write_contents(bashrc_path, Strings::join("\n", bashrc_content) + '\n', VCPKG_LINE_INFO); Checks::exit_success(VCPKG_LINE_INFO); } #endif diff --git a/toolsrc/src/vcpkg/commands.search.cpp b/toolsrc/src/vcpkg/commands.search.cpp index a0afd69e1..3d8387ee1 100644 --- a/toolsrc/src/vcpkg/commands.search.cpp +++ b/toolsrc/src/vcpkg/commands.search.cpp @@ -7,6 +7,9 @@ #include <vcpkg/paragraphs.h> #include <vcpkg/sourceparagraph.h> #include <vcpkg/vcpkglib.h> +#include <vcpkg/dependencies.h> + +using vcpkg::Dependencies::PathsPortFileProvider; namespace vcpkg::Commands::Search { @@ -63,7 +66,10 @@ namespace vcpkg::Commands::Search const ParsedArguments options = args.parse_arguments(COMMAND_STRUCTURE); const bool full_description = Util::Sets::contains(options.switches, OPTION_FULLDESC); - auto source_paragraphs = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports); + PathsPortFileProvider provider(paths, args.overlay_ports.get()); + auto source_paragraphs = Util::fmap(provider.load_all_control_files(), [](auto&& port) -> const SourceControlFile * { + return port->source_control_file.get(); + }); if (args.command_arguments.empty()) { diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index 29627db3d..77183ceaf 100644 --- a/toolsrc/src/vcpkg/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp @@ -43,7 +43,8 @@ namespace vcpkg::Commands::Upgrade StatusParagraphs status_db = database_load_check(paths); - Dependencies::PathsPortFileProvider provider(paths); + // Load ports from ports dirs + Dependencies::PathsPortFileProvider provider(paths, args.overlay_ports.get()); Dependencies::PackageGraph graph(provider, status_db); // input sanitization @@ -85,12 +86,12 @@ namespace vcpkg::Commands::Upgrade not_installed.push_back(spec); } - auto maybe_scf = provider.get_control_file(spec.name()); - if (auto p_scf = maybe_scf.get()) + auto maybe_scfl = provider.get_control_file(spec.name()); + if (auto p_scfl = maybe_scfl.get()) { if (it != status_db.end()) { - if (p_scf->core_paragraph->version != (*it)->package.version) + if (p_scfl->source_control_file->core_paragraph->version != (*it)->package.version) { to_upgrade.push_back(spec); } @@ -155,6 +156,7 @@ namespace vcpkg::Commands::Upgrade Build::AllowDownloads::YES, Build::CleanBuildtrees::NO, Build::CleanPackages::NO, + Build::CleanDownloads::NO, Build::DownloadTool::BUILT_IN, GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO, Build::FailOnTombstone::NO, diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 8fde28929..df472515f 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -22,7 +22,7 @@ namespace vcpkg::Dependencies struct ClusterSource { - const SourceControlFile* scf = nullptr; + const SourceControlFileLocation* scfl = nullptr; std::unordered_map<std::string, std::vector<FeatureSpec>> build_edges; }; @@ -92,12 +92,12 @@ namespace vcpkg::Dependencies if (it == m_graph.end()) { // Load on-demand from m_provider - auto maybe_scf = m_provider.get_control_file(spec.name()); + auto maybe_scfl = m_provider.get_control_file(spec.name()); auto& clust = m_graph[spec]; clust.spec = spec; - if (auto p_scf = maybe_scf.get()) + if (auto p_scfl = maybe_scfl.get()) { - clust.source = cluster_from_scf(*p_scf, clust.spec.triplet()); + clust.source = cluster_from_scf(*p_scfl, clust.spec.triplet()); } return clust; } @@ -105,15 +105,17 @@ namespace vcpkg::Dependencies } private: - static ClusterSource cluster_from_scf(const SourceControlFile& scf, Triplet t) + static ClusterSource cluster_from_scf(const SourceControlFileLocation& scfl, Triplet t) { ClusterSource ret; - ret.build_edges.emplace("core", filter_dependencies_to_specs(scf.core_paragraph->depends, t)); + ret.build_edges.emplace("core", + filter_dependencies_to_specs(scfl.source_control_file->core_paragraph->depends, + t)); - for (const auto& feature : scf.feature_paragraphs) + for (const auto& feature : scfl.source_control_file->feature_paragraphs) ret.build_edges.emplace(feature->name, filter_dependencies_to_specs(feature->depends, t)); - ret.scf = &scf; + ret.scfl = &scfl; return ret; } @@ -151,12 +153,12 @@ namespace vcpkg::Dependencies } InstallPlanAction::InstallPlanAction(const PackageSpec& spec, - const SourceControlFile& scf, + const SourceControlFileLocation& scfl, const std::set<std::string>& features, const RequestType& request_type, std::vector<PackageSpec>&& dependencies) : spec(spec) - , source_control_file(scf) + , source_control_file_location(scfl) , plan_type(InstallPlanType::BUILD_AND_INSTALL) , request_type(request_type) , build_options{} @@ -268,37 +270,145 @@ namespace vcpkg::Dependencies return left->spec.name() < right->spec.name(); } - MapPortFileProvider::MapPortFileProvider(const std::unordered_map<std::string, SourceControlFile>& map) : ports(map) - { - } + MapPortFileProvider::MapPortFileProvider(const std::unordered_map<std::string, SourceControlFileLocation>& map) + : ports(map) + {} - Optional<const SourceControlFile&> MapPortFileProvider::get_control_file(const std::string& spec) const + Optional<const SourceControlFileLocation&> MapPortFileProvider::get_control_file(const std::string& spec) const { auto scf = ports.find(spec); if (scf == ports.end()) return nullopt; return scf->second; } - PathsPortFileProvider::PathsPortFileProvider(const VcpkgPaths& paths) : ports(paths) {} + std::vector<const SourceControlFileLocation*> MapPortFileProvider::load_all_control_files() const + { + return Util::fmap(ports, [](auto&& kvpair) -> const SourceControlFileLocation * { return &kvpair.second; }); + } - Optional<const SourceControlFile&> PathsPortFileProvider::get_control_file(const std::string& spec) const + PathsPortFileProvider::PathsPortFileProvider(const vcpkg::VcpkgPaths& paths, + const std::vector<std::string>* ports_dirs_paths) + : filesystem(paths.get_filesystem()) + { + if (ports_dirs_paths) + { + for (auto&& overlay_path : *ports_dirs_paths) + { + if (!overlay_path.empty()) + { + auto overlay = fs::stdfs::canonical(fs::u8path(overlay_path)); + + Checks::check_exit(VCPKG_LINE_INFO, + filesystem.exists(overlay), + "Error: Path \"%s\" does not exist", + overlay.string()); + + Checks::check_exit(VCPKG_LINE_INFO, + fs::stdfs::is_directory(overlay), + "Error: Path \"%s\" must be a directory", + overlay.string()); + + ports_dirs.emplace_back(overlay); + } + } + } + ports_dirs.emplace_back(paths.ports); + } + + Optional<const SourceControlFileLocation&> PathsPortFileProvider::get_control_file(const std::string& spec) const { auto cache_it = cache.find(spec); if (cache_it != cache.end()) { return cache_it->second; } - Parse::ParseExpected<SourceControlFile> source_control_file = - Paragraphs::try_load_port(ports.get_filesystem(), ports.port_dir(spec)); - if (auto scf = source_control_file.get()) + for (auto&& ports_dir : ports_dirs) { - auto it = cache.emplace(spec, std::move(*scf->get())); - return it.first->second; + // Try loading individual port + if (filesystem.exists(ports_dir / "CONTROL")) + { + auto maybe_scf = Paragraphs::try_load_port(filesystem, ports_dir); + if (auto scf = maybe_scf.get()) + { + if (scf->get()->core_paragraph->name == spec) + { + SourceControlFileLocation scfl{ std::move(*scf), ports_dir }; + auto it = cache.emplace(spec, std::move(scfl)); + return it.first->second; + } + } + else + { + vcpkg::print_error_message(maybe_scf.error()); + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: Failed to load port from %s", + spec, ports_dir.u8string()); + } + } + + auto found_scf = Paragraphs::try_load_port(filesystem, ports_dir / spec); + if (auto scf = found_scf.get()) + { + if (scf->get()->core_paragraph->name == spec) + { + SourceControlFileLocation scfl{ std::move(*scf), ports_dir / spec }; + auto it = cache.emplace(spec, std::move(scfl)); + return it.first->second; + } + } } + return nullopt; } + std::vector<const SourceControlFileLocation*> PathsPortFileProvider::load_all_control_files() const + { + // Reload cache with ports contained in all ports_dirs + cache.clear(); + std::vector<const SourceControlFileLocation*> ret; + for (auto&& ports_dir : ports_dirs) + { + // Try loading individual port + if (filesystem.exists(ports_dir / "CONTROL")) + { + auto maybe_scf = Paragraphs::try_load_port(filesystem, ports_dir); + if (auto scf = maybe_scf.get()) + { + auto port_name = scf->get()->core_paragraph->name; + if (cache.find(port_name) == cache.end()) + { + SourceControlFileLocation scfl{ std::move(*scf), ports_dir }; + auto it = cache.emplace(port_name, std::move(scfl)); + ret.emplace_back(&it.first->second); + } + } + else + { + vcpkg::print_error_message(maybe_scf.error()); + Checks::exit_with_message(VCPKG_LINE_INFO, + "Error: Failed to load port from %s", + ports_dir.u8string()); + } + continue; + } + + // Try loading all ports inside ports_dir + auto found_scf = Paragraphs::load_all_ports(filesystem, ports_dir); + for (auto&& scf : found_scf) + { + auto port_name = scf->core_paragraph->name; + if (cache.find(port_name) == cache.end()) + { + SourceControlFileLocation scfl{ std::move(scf), ports_dir / port_name }; + auto it = cache.emplace(port_name, std::move(scfl)); + ret.emplace_back(&it.first->second); + } + } + } + return ret; + } + std::vector<RemovePlanAction> create_remove_plan(const std::vector<PackageSpec>& specs, const StatusParagraphs& status_db) { @@ -488,16 +598,18 @@ namespace vcpkg::Dependencies if (plus) return MarkPlusResult::SUCCESS; plus = true; - auto p_source = cluster.source.get(); - Checks::check_exit(VCPKG_LINE_INFO, - p_source != nullptr, - "Error: Cannot find definition for package `%s`.", - cluster.spec.name()); + const auto p_source = cluster.source.get(); + if (p_source == nullptr) + { + Checks::exit_with_message( + VCPKG_LINE_INFO, "Error: Cannot find definition for package `%s`.", cluster.spec.name()); + } + auto&& control_file = *p_source->scfl->source_control_file.get(); if (feature.empty()) { // Add default features for this package. This is an exact reference, so ignore prevent_default_features. - for (auto&& default_feature : p_source->scf->core_paragraph.get()->default_features) + for (auto&& default_feature : control_file.core_paragraph.get()->default_features) { auto res = mark_plus(default_feature, cluster, graph, graph_plan, prevent_default_features); if (res != MarkPlusResult::SUCCESS) @@ -512,7 +624,7 @@ namespace vcpkg::Dependencies if (feature == "*") { - for (auto&& fpgh : p_source->scf->feature_paragraphs) + for (auto&& fpgh : control_file.feature_paragraphs) { auto res = mark_plus(fpgh->name, cluster, graph, graph_plan, prevent_default_features); @@ -589,7 +701,8 @@ namespace vcpkg::Dependencies // Check if any default features have been added auto& previous_df = p_installed->ipv.core->package.default_features; - for (auto&& default_feature : p_source->scf->core_paragraph->default_features) + auto&& control_file = *p_source->scfl->source_control_file.get(); + for (auto&& default_feature : control_file.core_paragraph->default_features) { if (std::find(previous_df.begin(), previous_df.end(), default_feature) == previous_df.end()) { @@ -634,7 +747,7 @@ namespace vcpkg::Dependencies /// <param name="map">Map of all source control files in the current environment.</param> /// <param name="specs">Feature specifications to resolve dependencies for.</param> /// <param name="status_db">Status of installed packages in the current environment.</param> - std::vector<AnyAction> create_feature_install_plan(const std::unordered_map<std::string, SourceControlFile>& map, + std::vector<AnyAction> create_feature_install_plan(const std::unordered_map<std::string, SourceControlFileLocation>& map, const std::vector<FeatureSpec>& specs, const StatusParagraphs& status_db) { @@ -697,7 +810,11 @@ namespace vcpkg::Dependencies if (p_cluster->transient_uninstalled) { // If it will be transiently uninstalled, we need to issue a full installation command - auto pscf = p_cluster->source.value_or_exit(VCPKG_LINE_INFO).scf; + auto* pscfl = p_cluster->source.value_or_exit(VCPKG_LINE_INFO).scfl; + Checks::check_exit(VCPKG_LINE_INFO, + pscfl != nullptr, + "Error: Expected a SourceControlFileLocation to exist"); + auto&& scfl = *pscfl; auto dep_specs = Util::fmap(m_graph_plan->install_graph.adjacency_list(p_cluster), [](ClusterPtr const& p) { return p->spec; }); @@ -705,7 +822,7 @@ namespace vcpkg::Dependencies plan.emplace_back(InstallPlanAction{ p_cluster->spec, - *pscf, + scfl, p_cluster->to_install_features, p_cluster->request_type, std::move(dep_specs), diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp index 870d2c49e..88c1526c5 100644 --- a/toolsrc/src/vcpkg/export.cpp +++ b/toolsrc/src/vcpkg/export.cpp @@ -75,6 +75,7 @@ namespace vcpkg::Export Build::AllowDownloads::YES, Build::CleanBuildtrees::NO, Build::CleanPackages::NO, + Build::CleanDownloads::NO, Build::DownloadTool::BUILT_IN, Build::BinaryCaching::NO, Build::FailOnTombstone::NO, @@ -140,12 +141,12 @@ namespace vcpkg::Export std::error_code ec; fs.create_directories(paths.buildsystems / "tmp", ec); - fs.write_contents(targets_redirect, targets_redirect_content); + fs.write_contents(targets_redirect, targets_redirect_content, VCPKG_LINE_INFO); const std::string nuspec_file_content = create_nuspec_file_contents(raw_exported_dir.string(), targets_redirect.string(), nuget_id, nuget_version); const fs::path nuspec_file_path = paths.buildsystems / "tmp" / "vcpkg.export.nuspec"; - fs.write_contents(nuspec_file_path, nuspec_file_content); + fs.write_contents(nuspec_file_path, nuspec_file_content, VCPKG_LINE_INFO); // -NoDefaultExcludes is needed for ".vcpkg-root" const auto cmd_line = Strings::format(R"("%s" pack -OutputDirectory "%s" "%s" -NoDefaultExcludes > nul)", @@ -228,10 +229,10 @@ namespace vcpkg::Export { const std::vector<fs::path> integration_files_relative_to_root = { {".vcpkg-root"}, - {fs::path {"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"}, - {fs::path {"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"}, - {fs::path {"scripts"} / "buildsystems" / "vcpkg.cmake"}, - {fs::path {"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"}, + {fs::path{"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"}, + {fs::path{"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"}, + {fs::path{"scripts"} / "buildsystems" / "vcpkg.cmake"}, + {fs::path{"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"}, }; for (const fs::path& file : integration_files_relative_to_root) @@ -487,7 +488,10 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console // create the plan const StatusParagraphs status_db = database_load_check(paths); - Dependencies::PathsPortFileProvider provider(paths); + + // Load ports from ports dirs + Dependencies::PathsPortFileProvider provider(paths, args.overlay_ports.get()); + std::vector<ExportPlanAction> export_plan = Dependencies::create_export_plan(opts.specs, status_db); Checks::check_exit(VCPKG_LINE_INFO, !export_plan.empty(), "Export plan cannot be empty"); diff --git a/toolsrc/src/vcpkg/globalstate.cpp b/toolsrc/src/vcpkg/globalstate.cpp index 1a2c08474..aac5148fa 100644 --- a/toolsrc/src/vcpkg/globalstate.cpp +++ b/toolsrc/src/vcpkg/globalstate.cpp @@ -7,8 +7,6 @@ namespace vcpkg Util::LockGuarded<Chrono::ElapsedTimer> GlobalState::timer; Util::LockGuarded<std::string> GlobalState::g_surveydate; - std::atomic<bool> GlobalState::debugging(false); - std::atomic<bool> GlobalState::feature_packages(true); std::atomic<bool> GlobalState::g_binary_caching(false); std::atomic<int> GlobalState::g_init_console_cp(0); diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp index 84a054e0f..6ee573dfc 100644 --- a/toolsrc/src/vcpkg/help.cpp +++ b/toolsrc/src/vcpkg/help.cpp @@ -111,10 +111,12 @@ namespace vcpkg::Help " vcpkg contact Display contact information to send feedback\n" "\n" "Options:\n" - " --triplet <t> Specify the target architecture triplet.\n" + " --triplet <t> Specify the target architecture triplet\n" " (default: " ENVVAR(VCPKG_DEFAULT_TRIPLET) // ", see 'vcpkg help triplet')\n" "\n" + " --overlay-ports=<path> Specify directories to be used when searching for ports\n" + "\n" " --vcpkg-root <path> Specify the vcpkg root " "directory\n" " (default: " ENVVAR(VCPKG_ROOT) // @@ -137,7 +139,7 @@ namespace vcpkg::Help void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - args.parse_arguments(COMMAND_STRUCTURE); + Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); if (args.command_arguments.empty()) { diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 14dfb6fa3..781629236 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -138,7 +138,7 @@ namespace vcpkg::Install std::sort(output.begin(), output.end()); - fs.write_lines(listfile, output); + fs.write_lines(listfile, output, VCPKG_LINE_INFO); } static std::vector<file_pack> extract_files_in_triplet( @@ -156,14 +156,15 @@ namespace vcpkg::Install const std::string name = t.pgh.package.displayname(); - for (const std::string &file : t.files) + for (const std::string& file : t.files) { output.emplace_back(file_pack{std::string(file, remove_chars), name}); } } - std::sort(output.begin(), output.end(), - [](const file_pack &lhs, const file_pack &rhs) { return lhs.first < rhs.first; }); + std::sort(output.begin(), output.end(), [](const file_pack& lhs, const file_pack& rhs) { + return lhs.first < rhs.first; + }); return output; } @@ -180,8 +181,7 @@ namespace vcpkg::Install } static SortedVector<file_pack> build_list_of_installed_files( - const std::vector<StatusParagraphAndAssociatedFiles>& pgh_and_files, - const Triplet& triplet) + const std::vector<StatusParagraphAndAssociatedFiles>& pgh_and_files, const Triplet& triplet) { const size_t installed_remove_char_count = triplet.canonical_name().size() + 1; // +1 for the slash std::vector<file_pack> installed_files = @@ -198,13 +198,12 @@ namespace vcpkg::Install const SortedVector<std::string> package_files = build_list_of_package_files(paths.get_filesystem(), package_dir); - const SortedVector<file_pack> installed_files = - build_list_of_installed_files(pgh_and_files, triplet); + const SortedVector<file_pack> installed_files = build_list_of_installed_files(pgh_and_files, triplet); struct intersection_compare { - bool operator()(const std::string &lhs, const file_pack &rhs) { return lhs < rhs.first; } - bool operator()(const file_pack &lhs, const std::string &rhs) { return lhs.first < rhs; } + bool operator()(const std::string& lhs, const file_pack& rhs) { return lhs < rhs.first; } + bool operator()(const file_pack& lhs, const std::string& rhs) { return lhs.first < rhs; } }; std::vector<file_pack> intersection; @@ -216,11 +215,9 @@ namespace vcpkg::Install std::back_inserter(intersection), intersection_compare()); - std::sort(intersection.begin(), intersection.end(), - [](const file_pack &lhs, const file_pack &rhs) - { - return lhs.second < rhs.second; - }); + std::sort(intersection.begin(), intersection.end(), [](const file_pack& lhs, const file_pack& rhs) { + return lhs.second < rhs.second; + }); if (!intersection.empty()) { @@ -231,19 +228,13 @@ namespace vcpkg::Install bcf.core_paragraph.spec); auto i = intersection.begin(); - while (i != intersection.end()) { + while (i != intersection.end()) + { System::print2("Installed by ", i->second, "\n "); - auto next = std::find_if(i, intersection.end(), - [i](const auto &val) - { - return i->second != val.second; - }); - - System::print2(Strings::join("\n ", i, next, - [](const file_pack &file) - { - return file.first; - })); + auto next = + std::find_if(i, intersection.end(), [i](const auto& val) { return i->second != val.second; }); + + System::print2(Strings::join("\n ", i, next, [](const file_pack& file) { return file.first; })); System::print2("\n\n"); i = next; @@ -302,8 +293,7 @@ namespace vcpkg::Install { const InstallPlanType& plan_type = action.plan_type; const std::string display_name = action.spec.to_string(); - const std::string display_name_with_features = - GlobalState::feature_packages ? action.displayname() : display_name; + const std::string display_name_with_features = action.displayname(); const bool is_user_requested = action.request_type == RequestType::USER_REQUESTED; const bool use_head_version = Util::Enum::to_bool(action.build_options.use_head_version); @@ -340,9 +330,10 @@ namespace vcpkg::Install System::printf("Building package %s...\n", display_name_with_features); auto result = [&]() -> Build::ExtendedBuildResult { - const Build::BuildPackageConfig build_config{action.source_control_file.value_or_exit(VCPKG_LINE_INFO), + const auto& scfl = action.source_control_file_location.value_or_exit(VCPKG_LINE_INFO); + const Build::BuildPackageConfig build_config{*scfl.source_control_file, action.spec.triplet(), - paths.port_dir(action.spec), + static_cast<fs::path>(scfl.source_location), action.build_options, action.feature_list}; return Build::build_package(paths, build_config, status_db); @@ -368,6 +359,20 @@ namespace vcpkg::Install fs.remove_all(package_dir, ec); } + if (action.build_options.clean_downloads == Build::CleanDownloads::YES) + { + auto& fs = paths.get_filesystem(); + const fs::path download_dir = paths.downloads; + std::error_code ec; + for (auto& p : fs.get_files_non_recursive(download_dir)) + { + if (!fs.is_directory(p)) + { + fs.remove(p, VCPKG_LINE_INFO); + } + } + } + return {code, std::move(bcf)}; } @@ -464,14 +469,16 @@ namespace vcpkg::Install static constexpr StringLiteral OPTION_KEEP_GOING = "--keep-going"; static constexpr StringLiteral OPTION_XUNIT = "--x-xunit"; static constexpr StringLiteral OPTION_USE_ARIA2 = "--x-use-aria2"; + static constexpr StringLiteral OPTION_CLEAN_AFTER_BUILD = "--clean-after-build"; - static constexpr std::array<CommandSwitch, 6> INSTALL_SWITCHES = {{ + static constexpr std::array<CommandSwitch, 7> INSTALL_SWITCHES = {{ {OPTION_DRY_RUN, "Do not actually build or install"}, {OPTION_USE_HEAD_VERSION, "Install the libraries on the command line using the latest upstream sources"}, {OPTION_NO_DOWNLOADS, "Do not download new sources"}, {OPTION_RECURSE, "Allow removal of packages as part of installation"}, {OPTION_KEEP_GOING, "Continue installing packages on failure"}, {OPTION_USE_ARIA2, "Use aria2 to perform download tasks"}, + {OPTION_CLEAN_AFTER_BUILD, "Clean buildtrees, packages and downloads after building each package"}, }}; static constexpr std::array<CommandSetting, 1> INSTALL_SETTINGS = {{ {OPTION_XUNIT, "File to output results in XUnit format (Internal use)"}, @@ -532,7 +539,9 @@ namespace vcpkg::Install while (next != last) { auto match = *next; - library_targets[find_package_name].push_back(match[1]); + auto& targets = library_targets[find_package_name]; + if (std::find(targets.cbegin(), targets.cend(), match[1]) == targets.cend()) + targets.push_back(match[1]); ++next; } } @@ -615,11 +624,6 @@ namespace vcpkg::Install for (auto&& spec : specs) { Input::check_triplet(spec.package_spec.triplet(), paths); - if (!spec.features.empty() && !GlobalState::feature_packages) - { - Checks::exit_with_message( - VCPKG_LINE_INFO, "Feature packages are experimentally available under the --featurepackages flag."); - } } const bool dry_run = Util::Sets::contains(options.switches, OPTION_DRY_RUN); @@ -627,8 +631,11 @@ namespace vcpkg::Install const bool no_downloads = Util::Sets::contains(options.switches, (OPTION_NO_DOWNLOADS)); const bool is_recursive = Util::Sets::contains(options.switches, (OPTION_RECURSE)); const bool use_aria2 = Util::Sets::contains(options.switches, (OPTION_USE_ARIA2)); + const bool clean_after_build = Util::Sets::contains(options.switches, (OPTION_CLEAN_AFTER_BUILD)); const KeepGoing keep_going = to_keep_going(Util::Sets::contains(options.switches, OPTION_KEEP_GOING)); + auto& fs = paths.get_filesystem(); + // create the plan StatusParagraphs status_db = database_load_check(paths); @@ -638,37 +645,21 @@ namespace vcpkg::Install const Build::BuildPackageOptions install_plan_options = { Util::Enum::to_enum<Build::UseHeadVersion>(use_head_version), Util::Enum::to_enum<Build::AllowDownloads>(!no_downloads), - Build::CleanBuildtrees::NO, - Build::CleanPackages::NO, + clean_after_build ? Build::CleanBuildtrees::YES : Build::CleanBuildtrees::NO, + clean_after_build ? Build::CleanPackages::YES : Build::CleanPackages::NO, + clean_after_build ? Build::CleanDownloads::YES : Build::CleanDownloads::NO, download_tool, GlobalState::g_binary_caching ? Build::BinaryCaching::YES : Build::BinaryCaching::NO, Build::FailOnTombstone::NO, }; - auto all_ports = Paragraphs::load_all_ports(paths.get_filesystem(), paths.ports); - std::unordered_map<std::string, SourceControlFile> scf_map; - for (auto&& port : all_ports) - scf_map[port->core_paragraph->name] = std::move(*port); - MapPortFileProvider provider(scf_map); + //// Load ports from ports dirs + PathsPortFileProvider provider(paths, args.overlay_ports.get()); - // Note: action_plan will hold raw pointers to SourceControlFiles from this map + // Note: action_plan will hold raw pointers to SourceControlFileLocations from this map std::vector<AnyAction> action_plan = create_feature_install_plan(provider, FullPackageSpec::to_feature_specs(specs), status_db); - if (!GlobalState::feature_packages) - { - for (auto&& action : action_plan) - { - if (action.remove_action.has_value()) - { - Checks::exit_with_message( - VCPKG_LINE_INFO, - "The installation plan requires feature packages support. Please re-run the " - "command with --featurepackages."); - } - } - } - for (auto&& action : action_plan) { if (auto p_install = action.install_action.get()) @@ -717,7 +708,7 @@ namespace vcpkg::Install xunit_doc += summary.xunit_results(); xunit_doc += "</collection></assembly></assemblies>\n"; - paths.get_filesystem().write_contents(fs::u8path(it_xunit->second), xunit_doc); + fs.write_contents(fs::u8path(it_xunit->second), xunit_doc, VCPKG_LINE_INFO); } for (auto&& result : summary.results) diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 5ca2b056a..9dd520ed6 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -9,8 +9,10 @@ #include <vcpkg/base/strings.h> #include <vcpkg/base/system.process.h> +#if defined(_WIN32) #pragma comment(lib, "version") #pragma comment(lib, "winhttp") +#endif namespace vcpkg::Metrics { diff --git a/toolsrc/src/vcpkg/packagespecparseresult.cpp b/toolsrc/src/vcpkg/packagespecparseresult.cpp index c5254f7be..ef078ea28 100644 --- a/toolsrc/src/vcpkg/packagespecparseresult.cpp +++ b/toolsrc/src/vcpkg/packagespecparseresult.cpp @@ -19,8 +19,5 @@ namespace vcpkg } } - void to_string(std::string& out, PackageSpecParseResult p) - { - out.append(vcpkg::to_string(p).c_str()); - } + void to_string(std::string& out, PackageSpecParseResult p) { out.append(vcpkg::to_string(p).c_str()); } } diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp index 45f939afd..21ef2c4d9 100644 --- a/toolsrc/src/vcpkg/paragraphs.cpp +++ b/toolsrc/src/vcpkg/paragraphs.cpp @@ -1,9 +1,9 @@ #include "pch.h" #include <vcpkg/base/files.h> +#include <vcpkg/base/system.debug.h> #include <vcpkg/base/system.print.h> #include <vcpkg/base/util.h> -#include <vcpkg/globalstate.h> #include <vcpkg/paragraphparseresult.h> #include <vcpkg/paragraphs.h> @@ -211,17 +211,7 @@ namespace vcpkg::Paragraphs Expected<std::vector<std::unordered_map<std::string, std::string>>> pghs = get_paragraphs(fs, path / "CONTROL"); if (auto vector_pghs = pghs.get()) { - auto csf = SourceControlFile::parse_control_file(std::move(*vector_pghs)); - if (!GlobalState::feature_packages) - { - if (auto ptr = csf.get()) - { - Checks::check_exit(VCPKG_LINE_INFO, ptr->get() != nullptr); - ptr->get()->core_paragraph->default_features.clear(); - ptr->get()->feature_paragraphs.clear(); - } - } - return csf; + return SourceControlFile::parse_control_file(std::move(*vector_pghs)); } auto error_info = std::make_unique<ParseControlErrorInfo>(); error_info->name = path.filename().generic_u8string(); @@ -279,7 +269,7 @@ namespace vcpkg::Paragraphs auto results = try_load_all_ports(fs, ports_dir); if (!results.errors.empty()) { - if (GlobalState::debugging) + if (Debug::g_debugging) { print_error_message(results.errors); } diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index d6581c2b4..c760a034f 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -857,14 +857,15 @@ namespace vcpkg::PostBuildLint size_t perform_all_checks(const PackageSpec& spec, const VcpkgPaths& paths, const PreBuildInfo& pre_build_info, - const BuildInfo& build_info) + const BuildInfo& build_info, + const fs::path& port_dir) { System::print2("-- Performing post-build validation\n"); const size_t error_count = perform_all_checks_and_return_error_count(spec, paths, pre_build_info, build_info); if (error_count != 0) { - const fs::path portfile = paths.ports / spec.name() / "portfile.cmake"; + const fs::path portfile = port_dir / "portfile.cmake"; System::print2(System::Color::error, "Found ", error_count, diff --git a/toolsrc/src/vcpkg/remove.cpp b/toolsrc/src/vcpkg/remove.cpp index 685cdfdc3..a40b27bd7 100644 --- a/toolsrc/src/vcpkg/remove.cpp +++ b/toolsrc/src/vcpkg/remove.cpp @@ -111,7 +111,7 @@ namespace vcpkg::Remove } } - fs.remove(paths.listfile_path(ipv.core->package)); + fs.remove(paths.listfile_path(ipv.core->package), VCPKG_LINE_INFO); } for (auto&& spgh : spghs) @@ -229,7 +229,8 @@ namespace vcpkg::Remove Checks::exit_fail(VCPKG_LINE_INFO); } - Dependencies::PathsPortFileProvider provider(paths); + // Load ports from ports dirs + Dependencies::PathsPortFileProvider provider(paths, args.overlay_ports.get()); specs = Util::fmap(Update::find_outdated_packages(provider, status_db), [](auto&& outdated) { return outdated.spec; }); diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index b495c5f1d..9bc59cbe7 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -24,6 +24,7 @@ namespace vcpkg static const std::string SOURCE = "Source"; static const std::string SUPPORTS = "Supports"; static const std::string VERSION = "Version"; + static const std::string HOMEPAGE = "Homepage"; } static Span<const std::string> get_list_of_valid_fields() @@ -34,6 +35,7 @@ namespace vcpkg SourceParagraphFields::DESCRIPTION, SourceParagraphFields::MAINTAINER, SourceParagraphFields::BUILD_DEPENDS, + SourceParagraphFields::HOMEPAGE, }; return valid_fields; @@ -107,6 +109,7 @@ namespace vcpkg spgh->description = parser.optional_field(SourceParagraphFields::DESCRIPTION); spgh->maintainer = parser.optional_field(SourceParagraphFields::MAINTAINER); + spgh->homepage = parser.optional_field(SourceParagraphFields::HOMEPAGE); spgh->depends = expand_qualified_dependencies( parse_comma_list(parser.optional_field(SourceParagraphFields::BUILD_DEPENDS))); spgh->supports = parse_comma_list(parser.optional_field(SourceParagraphFields::SUPPORTS)); diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 7232971c7..4f4b23055 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -62,7 +62,7 @@ namespace vcpkg #if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) static const std::string XML_VERSION = "2"; static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml"; - static const std::regex XML_VERSION_REGEX {R"###(<tools[\s]+version="([^"]+)">)###"}; + static const std::regex XML_VERSION_REGEX{R"###(<tools[\s]+version="([^"]+)">)###"}; static const std::string XML = paths.get_filesystem().read_contents(XML_PATH).value_or_exit(VCPKG_LINE_INFO); std::smatch match_xml_version; const bool has_xml_version = std::regex_search(XML.cbegin(), XML.cend(), match_xml_version, XML_VERSION_REGEX); @@ -78,7 +78,7 @@ namespace vcpkg XML_VERSION, match_xml_version[1]); - const std::regex tool_regex {Strings::format(R"###(<tool[\s]+name="%s"[\s]+os="%s">)###", tool, OS_STRING)}; + const std::regex tool_regex{Strings::format(R"###(<tool[\s]+name="%s"[\s]+os="%s">)###", tool, OS_STRING)}; std::smatch match_tool_entry; const bool has_tool_entry = std::regex_search(XML.cbegin(), XML.cend(), match_tool_entry, tool_regex); if (!has_tool_entry) @@ -109,13 +109,13 @@ namespace vcpkg const fs::path tool_dir_path = paths.tools / tool_dir_name; const fs::path exe_path = tool_dir_path / exe_relative_path; - return ToolData {*version.get(), - exe_path, - url, - paths.downloads / archive_name.value_or(exe_relative_path).to_string(), - archive_name.has_value(), - tool_dir_path, - sha512}; + return ToolData{*version.get(), + exe_path, + url, + paths.downloads / archive_name.value_or(exe_relative_path).to_string(), + archive_name.has_value(), + tool_dir_path, + sha512}; #endif } @@ -131,7 +131,10 @@ namespace vcpkg virtual const std::string& exe_stem() const = 0; virtual std::array<int, 3> default_min_version() const = 0; - virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const {} + virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const + { + Util::unused(out_candidate_paths); + } virtual Optional<std::string> get_version(const fs::path& path_to_exe) const = 0; }; @@ -156,7 +159,7 @@ namespace vcpkg actual_version[2] >= expected_version[2]); if (!version_acceptable) continue; - return PathAndVersion {candidate, *version}; + return PathAndVersion{candidate, *version}; } return nullopt; @@ -406,6 +409,7 @@ git version 2.17.1.windows.2 virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const override { + Util::unused(out_candidate_paths); // TODO: Uncomment later // const std::vector<fs::path> from_path = Files::find_from_PATH("installerbase"); // candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); diff --git a/toolsrc/src/vcpkg/update.cpp b/toolsrc/src/vcpkg/update.cpp index 344192d59..6320bae5b 100644 --- a/toolsrc/src/vcpkg/update.cpp +++ b/toolsrc/src/vcpkg/update.cpp @@ -23,10 +23,10 @@ namespace vcpkg::Update for (auto&& ipv : installed_packages) { const auto& pgh = ipv.core; - auto maybe_scf = provider.get_control_file(pgh->package.spec.name()); - if (auto p_scf = maybe_scf.get()) + auto maybe_scfl = provider.get_control_file(pgh->package.spec.name()); + if (auto p_scfl = maybe_scfl.get()) { - auto&& port_version = p_scf->core_paragraph->version; + auto&& port_version = p_scfl->source_control_file->core_paragraph->version; auto&& installed_version = pgh->package.version; if (installed_version != port_version) { @@ -52,12 +52,12 @@ namespace vcpkg::Update void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - args.parse_arguments(COMMAND_STRUCTURE); + Util::unused(args.parse_arguments(COMMAND_STRUCTURE)); System::print2("Using local portfile versions. To update the local portfiles, use `git pull`.\n"); const StatusParagraphs status_db = database_load_check(paths); - Dependencies::PathsPortFileProvider provider(paths); + Dependencies::PathsPortFileProvider provider(paths, args.overlay_ports.get()); const auto outdated_packages = SortedVector<OutdatedPackage>(find_outdated_packages(provider, status_db), &OutdatedPackage::compare_by_name); diff --git a/toolsrc/src/vcpkg/userconfig.cpp b/toolsrc/src/vcpkg/userconfig.cpp index 4945fdaaa..a7c4e2765 100644 --- a/toolsrc/src/vcpkg/userconfig.cpp +++ b/toolsrc/src/vcpkg/userconfig.cpp @@ -39,10 +39,7 @@ namespace vcpkg #endif } - static fs::path get_config_path() - { - return get_user_dir() / "config"; - } + static fs::path get_config_path() { return get_user_dir() / "config"; } UserConfig UserConfig::try_read_data(const Files::Filesystem& fs) { diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index 8565c28f9..21bf4d028 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -45,6 +45,45 @@ namespace vcpkg option_field = new_setting; } + static void parse_multivalue(const std::string* arg_begin, + const std::string* arg_end, + const std::string& option_name, + std::unique_ptr<std::vector<std::string>>& option_field) + { + if (arg_begin == arg_end) + { + System::print2(System::Color::error, "Error: expected value after ", option_name, '\n'); + Metrics::g_metrics.lock()->track_property("error", "error option name"); + Help::print_usage(); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + if (!option_field) + { + option_field = std::make_unique<std::vector<std::string>>(); + } + option_field->emplace_back(*arg_begin); + } + + static void parse_cojoined_multivalue(std::string new_value, + const std::string& option_name, + std::unique_ptr<std::vector<std::string>>& option_field) + { + if (new_value.empty()) + { + System::print2(System::Color::error, "Error: expected value after ", option_name, '\n'); + Metrics::g_metrics.lock()->track_property("error", "error option name"); + Help::print_usage(); + Checks::exit_fail(VCPKG_LINE_INFO); + } + + if (!option_field) + { + option_field = std::make_unique<std::vector<std::string>>(); + } + option_field->emplace_back(std::move(new_value)); + } + VcpkgCmdArguments VcpkgCmdArguments::create_from_command_line(const int argc, const CommandLineCharType* const* const argv) { @@ -117,6 +156,13 @@ namespace vcpkg parse_value(arg_begin, arg_end, "--triplet", args.triplet); continue; } + if (Strings::starts_with(arg, "--overlay-ports=")) + { + parse_cojoined_multivalue(arg.substr(sizeof("--overlay-ports=") - 1), + "--overlay-ports", + args.overlay_ports); + continue; + } if (arg == "--debug") { parse_switch(true, "debug", args.debug); @@ -166,7 +212,21 @@ namespace vcpkg const auto eq_pos = arg.find('='); if (eq_pos != std::string::npos) { - args.optional_command_arguments.emplace(arg.substr(0, eq_pos), arg.substr(eq_pos + 1)); + const auto& key = arg.substr(0, eq_pos); + const auto& value = arg.substr(eq_pos + 1); + + auto it = args.optional_command_arguments.find(key); + if (args.optional_command_arguments.end() == it) + { + args.optional_command_arguments.emplace(key, std::vector<std::string> { value }); + } + else + { + if (auto* maybe_values = it->second.get()) + { + maybe_values->emplace_back(value); + } + } } else { @@ -264,7 +324,51 @@ namespace vcpkg } else { - output.settings.emplace(option.name, it->second.value_or_exit(VCPKG_LINE_INFO)); + const auto& value = it->second.value_or_exit(VCPKG_LINE_INFO); + if (value.front().empty()) + { + // Fail when not given a value, e.g.: "vcpkg install sqlite3 --additional-ports=" + System::printf( + System::Color::error, "Error: The option '%s' must be passed an argument.\n", option.name); + failed = true; + } + else + { + output.settings.emplace(option.name, value.front()); + options_copy.erase(it); + } + } + } + } + + for (auto&& option : command_structure.options.multisettings) + { + const auto it = options_copy.find(option.name); + if (it != options_copy.end()) + { + if (!it->second.has_value()) + { + // Not having a string value indicates it was passed like '--a' + System::printf( + System::Color::error, "Error: The option '%s' must be passed an argument.\n", option.name); + failed = true; + } + else + { + const auto& value = it->second.value_or_exit(VCPKG_LINE_INFO); + for (auto&& v : value) + { + if (v.empty()) + { + System::printf( + System::Color::error, "Error: The option '%s' must be passed an argument.\n", option.name); + failed = true; + } + else + { + output.multisettings[option.name].emplace_back(v); + } + } options_copy.erase(it); } } @@ -306,7 +410,14 @@ namespace vcpkg { System::printf(" %-40s %s\n", (option.name + "=..."), option.short_help_text); } + for (auto&& option : command_structure.options.multisettings) + { + System::printf(" %-40s %s\n", (option.name + "=..."), option.short_help_text); + } System::printf(" %-40s %s\n", "--triplet <t>", "Set the default triplet for unqualified packages"); + System::printf(" %-40s %s\n", + "--overlay-ports=<path>", + "Specify directories to be used when searching for ports"); System::printf(" %-40s %s\n", "--vcpkg-root <path>", "Specify the vcpkg directory to use instead of current directory or tool directory"); diff --git a/toolsrc/src/vcpkg/vcpkglib.cpp b/toolsrc/src/vcpkg/vcpkglib.cpp index c8e95dab1..2a52111a6 100644 --- a/toolsrc/src/vcpkg/vcpkglib.cpp +++ b/toolsrc/src/vcpkg/vcpkglib.cpp @@ -21,7 +21,7 @@ namespace vcpkg return StatusParagraphs(); } - fs.rename(vcpkg_dir_status_file_old, vcpkg_dir_status_file); + fs.rename(vcpkg_dir_status_file_old, vcpkg_dir_status_file, VCPKG_LINE_INFO); } auto pghs = Paragraphs::get_paragraphs(fs, vcpkg_dir_status_file).value_or_exit(VCPKG_LINE_INFO); @@ -72,15 +72,15 @@ namespace vcpkg } } - fs.write_contents(status_file_new, Strings::serialize(current_status_db)); + fs.write_contents(status_file_new, Strings::serialize(current_status_db), VCPKG_LINE_INFO); - fs.rename(status_file_new, status_file); + fs.rename(status_file_new, status_file, VCPKG_LINE_INFO); for (auto&& file : update_files) { if (!fs.is_regular_file(file)) continue; - fs.remove(file); + fs.remove(file, VCPKG_LINE_INFO); } return current_status_db; @@ -95,8 +95,8 @@ namespace vcpkg const auto tmp_update_filename = paths.vcpkg_dir_updates / "incomplete"; const auto update_filename = paths.vcpkg_dir_updates / Strings::format("%010d", my_update_id); - fs.write_contents(tmp_update_filename, Strings::serialize(p)); - fs.rename(tmp_update_filename, update_filename); + fs.write_contents(tmp_update_filename, Strings::serialize(p), VCPKG_LINE_INFO); + fs.rename(tmp_update_filename, update_filename, VCPKG_LINE_INFO); } static void upgrade_to_slash_terminated_sorted_format(Files::Filesystem& fs, @@ -165,8 +165,8 @@ namespace vcpkg // Replace the listfile on disk const fs::path updated_listfile_path = listfile_path.generic_string() + "_updated"; - fs.write_lines(updated_listfile_path, *lines); - fs.rename(updated_listfile_path, listfile_path); + fs.write_lines(updated_listfile_path, *lines, VCPKG_LINE_INFO); + fs.rename(updated_listfile_path, listfile_path, VCPKG_LINE_INFO); } std::vector<InstalledPackageView> get_installed_ports(const StatusParagraphs& status_db) diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 512bcfc35..562a18c9b 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -81,9 +81,6 @@ namespace vcpkg fs::path VcpkgPaths::package_dir(const PackageSpec& spec) const { return this->packages / spec.dir(); } - fs::path VcpkgPaths::port_dir(const PackageSpec& spec) const { return this->ports / spec.name(); } - fs::path VcpkgPaths::port_dir(const std::string& name) const { return this->ports / name; } - fs::path VcpkgPaths::build_info_file_path(const PackageSpec& spec) const { return this->package_dir(spec) / "BUILD_INFO"; diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj index 8edea2244..06d849a74 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj +++ b/toolsrc/vcpkg/vcpkg.vcxproj @@ -21,8 +21,8 @@ <PropertyGroup Label="Globals">
<ProjectGuid>{34671B80-54F9-46F5-8310-AC429C11D4FB}</ProjectGuid>
<RootNamespace>vcpkg</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- <PlatformToolset>v140</PlatformToolset>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index a64eb42fd..2a6853b8a 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -21,8 +21,8 @@ <PropertyGroup Label="Globals">
<ProjectGuid>{B98C92B7-2874-4537-9D46-D14E5C237F04}</ProjectGuid>
<RootNamespace>vcpkglib</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- <PlatformToolset>v140</PlatformToolset>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj index e533d0e15..2e689c7fc 100644 --- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj +++ b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj @@ -21,8 +21,8 @@ <PropertyGroup Label="Globals">
<ProjectGuid>{7D6FDEEB-B299-4A23-85EE-F67C4DED47BE}</ProjectGuid>
<RootNamespace>vcpkgmetricsuploader</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- <PlatformToolset>v140</PlatformToolset>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj index 4cda29461..a7517ec54 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj @@ -48,8 +48,8 @@ <ProjectGuid>{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>vcpkgtest</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- <PlatformToolset>v140</PlatformToolset>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -84,7 +84,7 @@ <ImportGroup Label="Shared">
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
</PropertyGroup>
|