Commit Graph

15 Commits

Author SHA1 Message Date
Kai Pastor
5a8ff0088a
[libxml2,libxslt] Revise dependency handling (#24935)
* Update mingw support expressions

* Update versions

* Use pkg-config for complete libgcrypt dependencies

* Remove crypto from default features

Align with CMake build system defaults.

* Drop unused liblzma dependency

* Update versions

* Skip installation of docs

* Update versions

* Restructure patches

* Update versions

* CI [skip actions]

* Revise libxml2 wrapper

* Omit CONFIG from find_package(LibXml2)

* Test libxml2 with, and fix for, CMake 3.7

* Update versions

* More libxml2 wrapper changes

* libxslt gcrypt variable name changes

* Install usage

* Trim portfile

* [openscap] Use vcpkg pkg-config database

* [openscap] Unbreak find_package(Threads)

* Update versions

* Update CI baseline

* REQUIRED is a literal

* Update versions

* Always load libxml2 config instead of find module [skip actions]

* [libxmlmm] Fix linking to libxml2

libxml2 needs iconv include dir on Windows.

* [libxmlmm] License field and processing

* [libxmlmm] Export unofficial CMake config

* [libxmlmm] Change target prefix, not global default

* Revert cmake-user changes

* Set LIBXML2_FOUND

* Update versions

* Fix xslt-config

* Update versions

* Adjust tidy-html5

* Update versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-07-06 14:30:42 -07:00
Kai Pastor
0707a17ecf
[liblzma] No debug postfix. Rewrite wrapper. (#22856)
* Restore upstream's DLL name

* Don't add debug postfix

* Decouple wrapper from config

* Don't inject Find module stuff into config

* Cleanup

* [skip actions] Trim lzmad and LibLZMA patching

* [skip actions] Fix CMAKE_DISABLE_FIND_PACKAGE_LibLZMA

* [skip actions] CI

* Update manifests

* Update versions

* Backfill LibLZMA::LibLZMA to CMake < 3.14

* Update versions

* Update versions
2022-02-28 10:25:31 -08:00
Kai Pastor
9f73bc1a0e
Fix target_link_libraries on repeated inclusion of wrappers (#19120)
* Fix repeated inclusion of wrappers

* x-add-version
2021-09-02 13:21:52 -07:00
Stefano Sinigardi
801f40c688
[OpenCV] update to v4.5.3 and to v3.4.15 (#18827)
* [OpenCV] update to v4.5.3 and to v3.4.15

* [OpenCV] update refs

* [libxml2] add missing find_dependency(Iconv)
[libiconv] update cmake wrapper

* [libiconv] fix hints

* [opencv4] do not require cudnn if cuda enabled

* [opencv] update refs

* [OpenCV] increase CI coverage even more

* [vcpkg-ci-opencv] trying to restore x64-uwp ci tests

* restore previous patches to avoid unnecessary modifications

* [OpenCV] fix refs

* [OpenCV] fix CMake Warning related to protobuf dependency

* [OpenCV] fix refs

* [libxml2] fix references

* [libxml2] restore previous cmake wrapper, new one is broken

* [libxml2] fix references

* bump versions

* update refs

* [libxml2] Update the format for vcpkg-cmake-wrapper.cmake

* Update versions/l-/libxml2.json

* [libxml2] update port version

* [libxml2] update refs

* [OpenCV] fix refs

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-08-13 13:57:28 -07:00
Alexander Neumann
c69096659f
[libxml2] fix wrapper (#19033) 2021-07-21 15:40:01 -07:00
Alexander Neumann
e43557e665
[libxml2] Update to 2.9.12 and use upstream CMakeLists.txt (#17945)
* vcpkg_fixup_pkgconfig for allgero5

* version stuff

* Update port

* version stuff

* add missing patch

* version stuff

* deactivate ICU linkage

* add missing 2

* fix include issue in dependend ports.

* fix include dirs in wrapper

* always install wrapper for corrections

* target also needs fixing.

* fix install of wrapper

* version stuff

* libxml define LIBXML_STATIC in the header in static builds

* libxslt build only one type of library to avoid link issues

* version stuff

* add cmake policy

* version stuff

* remove accidental cmake_minimum_required(VERSION)

* version stuff

* version stuff

* add feature tools to build tools

* version stuff

* fix version stuff

* add ws2_32 to the target which was missing.

* version stuff

* add liblzma and zlib to the target

* no need to adjust in config mode

* version stuff

* apply some of the CR suggestions

* version update

* remove icu dependency.

* version stuff

* setting uwp builds of libxml2 to fail. (icu supports:!uwp)

* add !uwp into supports due to getenv call

* version stuff

* baseline stuff

* Restore old version record for libxml2.

Co-authored-by: Robert Schumacher <ras0219@outlook.com>
2021-07-15 17:19:56 -07:00
bucurb
7338d7ec1a
[libxml2] Fix target (#18714)
* fix LibXml2 target dependencies

* updated version files
2021-07-01 09:49:04 -07:00
Alexander Neumann
3a26eb3dc4
[intl/gettext/fontconfig] update to native build system (#11776)
* [fontconfig] update fontconfig

* [libiconv] update to make

* [gettext] update to make

* [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig

* [fontconfig] make it work on windows

* Remove install of unofficial cmake config

* add function get_cmake_vars

* fine tuning.

* apply to make based ports.

* add log suffix on not windows platforms

* fix c&p error

* add previous LINK env

* setup env on windows and extract cpp flags correctly.

* update glib and libxml2

* fix windows regressions

* Apply suggestions from code review

* add windres wrapper to invoke RC.

* remove wrong fi

* fix libintl.

* try fixing uwp

* other things to update

* exiv2 fix

* libtool does not like -RTC1

* pass the /RTC<x> flag directly to the compiler

* trust cmake instead of adding extra flags

* fix expat

* fix iconv wrapper install

* change fontconfig intl linkage.

* add appcontainer back in which is required for UWP. Why is this not in the cmake flags?

* fix pkg-config in vcpkg_configure_make

* fix json-c pkg-config installation

* remove remnoved config

* comment out debug messages + bit of tuning

* finally fontconfig

* comment debug messages

* expat apply extra patches.

* Switch back to -E instead of -EP in cpp

* commit changes from fontconfig PR

* [expat] fix expat details

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* cleanup docs

* update osx pipeline so that fontconfig actually builds

* fix expat the lazy way by using a higher commit than release

* fix a barage of regressions due to the use of unofficial targets

* [expat] use a higher commit hash with a better stabilized cmake build

* forgot freexl regression

* more unofficial fixes

* fix downstream expat usage

* fix wxwidgets

* fix gcdm regression

* [vtk] fix the regression due to expat

* add uwp cl flags back in. Somehow those are not set by cmake

* add a few other configure options for full gettext build

* fix cmake regression

* fix a few regressions

* fix static gettext build

* fix gettext static

* fix libxml2 wrapper for cmake

* some more regressions fixes

* add conversion from somelib.lib to -lsomelib

* add a few option to libiconv.

* get logs from CI

* add missing ar-lib wrapper

* add missing ar-lib wrapper

* add fatal error to gettext

* remove uuid from the list of LIBS since it seems to not exist in CI?

* small but important regex correction

* fix regex and add debug message for libs

* remove error and only build libintl.

* add uuid dependency to fontconfig in qt5-base

* osx install gettext for autopoint

* fix io2d regression by saying the port is broken .....
(which it is; upstream needs to learn proper cmake)

* restore the old libxml2 wrapper with minor modifications

* fix xmlsec regression

* install wrapper correctly

* try actual fixing io2d

* improve iconv wrapper

* add latest changes from update_fontconfig PR

* Apply suggestions from code review

first set which don't need special attention

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply suggestions from code review

one more simple change

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* [x264] set env AS

* fix bugs due to refactor

* use subpath everywhere

* apply changes from CR

* fix fontconfig build.

* only change libs in static builds

* remove unnecessary lines 41 & 44

* remove flag transformation

* reintroduce the flag / to - transformation for MSVC

* trying to figure out autopoint issue.
using wrong (windows) find.exe instead of msys

* add correct working_dir to subpath

* escape stupid env paths.

* fix typo

* add findutils
remove debug messages

* add error if libtool chokes

* add file to msys

* pass lt_cv_deplibs_check_method=pass_all on windows
(couldn't get file.exe to work so that libtool correctly ids the passed libs)

* add bzip2 to msys

* reenable libtool check. Lets see if CI agrees

* unbreak linux
try to figure out where uuid should be on windows.

* add -L flag and help libtool ?

* try to get ci to find uuid.

* try to use cygpath

* update controls

* cleanup merge mistakes

* correct merge issues

* determine cmake vars if not done before.

* move adding of -l earlier

* more merge cleanup

* fix uwp builds by not transforming libs

* fix patches in io2d

* fix xz download error

* apply code review changes manually

* fix the typos left behind in CR

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2020-11-17 09:18:59 -08:00
nicole mazzuca
ef91134964
[cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers (#12196)
* fix drive-by error in vcpkg-cmake-wrappers

* rev port versions
2020-07-02 11:00:28 -07:00
nicole mazzuca
1d8f0acc9c
[vcpkg manifest] Manifest Implementation (#11757)
==== Changes Related to manifests ====

* Add the `manifests` feature flag
  * This only says whether we look for a `vcpkg.json` in the cwd, not
    whether we support parsing manifests (for ports, for example)
* Changes to the manifests RFC
  * `"authors"` -> `"maintainers"`
  * `--x-classic-mode` -> `-manifests` \in `vcpkg_feature_flags`
  * reserve `"core"` in addition to `"default"`, since that's already
    reserved for features
  * Add a small helper note about what identifiers must look like
  * `<license-string>`: SPDX v3.8 -> v3.9
  * `"feature"."description"` is allowed to be an array of strings as well
  * `"version"` -> `"version-string"` for forward-compat with versions
    RFC
* Add the `--feature-flags` option
* Add the ability to turn off feature flags via passing
  `-<feature-flag>` to `VCPKG_FEATURE_FLAGS` or `--feature-flags`
* Add CMake toolchain support for manifests
  * Requires either:
    * a feature flag of `manifests` in either `Env{VCPKG_FEATURE_FLAGS}`
      or `VCPKG_FEATURE_FLAGS`
    * Passing the `VCPKG_ENABLE_MANIFESTS` option
  * The toolchain will install your packages to
    `${VCPKG_MANIFEST_DIR}/vcpkg_installed`.
* Add MSBuild `vcpkg integrate install` support for manifests
  * Requires `VcpkgEnableManifest` to be true
* `vcpkg create` creates a port that has a `vcpkg.json` instead of a
  `CONTROL`
* argparse, abseil, 3fd, and avisynthplus ports switched to manifest
  from CONTROL
* Add support for `--x-manifest-root`, as well as code for finding it if
  not passed
* Add support for parsing manifests!
* Add a filesystem lock!

==== Important Changes which are somewhat unrelated to manifests ====

* Rename `logicexpression.{h,cpp}` to `platform-expression.{h,cpp}`
* Add `PlatformExpression` type which takes the place of the old logic
  expression
  * Split the parsing of platform expressions from checking whether
    they're true or not
  * Eagerly parse PlatformExpressions as opposed to leaving them as
    strings
* Add checking for feature flag consistency
  * i.e., if `-binarycaching` is passed, you shouldn't be passing
    `--binarysource`
* Add the `Json::Reader` type which, with the help of user-defined
  visitors, converts JSON to your internal type
* VcpkgArgParser: place the switch names into a constant as opposed to
  using magic constants
  * In general update the parsing code so that this ^ works
* Add `Port-Version` fields to CONTROL files
  * This replaces the existing practice of
    `Version: <my-version>-<port-version>`

==== Smaller changes ====
* small drive-by cleanups to some CMake
  * `${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}` ->
    `${CURRENT_INSTALLED_DIR}`
  * Remove `-analyze` when compiling with clang-cl, since that's not a
    supported flag (vcpkg's build system)
  * Add a message about which compiler is detected by vcpkg's build
    system machinery
* Fix `Expected::then`
* Convert `""` to `{}` for `std::string` and `fs::path`, to avoid a
  `strlen` (additionally, `.empty()` instead of `== ""`, and `.clear()`)
* Add `Strings::strto` which converts strings to numeric types
* Support built-in arrays and `StringView` for `Strings::join`
* Add `operator<` and friends to `StringView`
* Add `substr` to `StringView`
* SourceParagraphParser gets some new errors
2020-06-30 10:40:18 -07:00
Alexander Neumann
9f051a093f
[libxml2] Add iconv and charset linkage in vcpkg-cmake-wrapper on osx (#11072)
* [libxml2] Add iconv and charset linkage in vcpkg-cmake-wrapper on osx

* update baseline

* update baseline
2020-05-18 10:40:18 -07:00
Alexander Neumann
45d31c931a [libxml2] Apply fixes to the target of libxml2 (#9636) 2020-01-15 10:33:50 -08:00
myd7349
68a2b4c766 [libxml2] Update to 2.9.9 (#5193)
* [libxml2] Update to 2.9.9

Fix #5177

* [libxml2] Fix static build

* [libxml2] Modernize

* [libxml2] Use vcpkg_from_github

* [libxml2] Get version info from configure.ac

* [libxml2] Install xmlversion.h

* [libxml2] Improve port file

* [libxml2] Move version.h generation into CMakeLists.txt

* [libxml2] Fix misspelled version header

* [libxml2] Add UWP support
2019-03-15 15:29:08 -07:00
Robert Schumacher
1f7d155b5f [libiconv][libxml2] Fix libxml2 on Linux and OSX 2018-04-04 17:57:54 -07:00
Robert Schumacher
9f9778ccff [many ports] Improve behavior on Linux and general cleanup 2018-03-11 23:42:54 -07:00