Commit Graph

38 Commits

Author SHA1 Message Date
Paul Levy
0945e17e79
[osgEarth] Update port to osgEarth 3.7 (#41322)
Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com>
2024-10-17 22:28:00 -07:00
Jakub Melka
11884e49a8
[blend2d] update port to 2024-06-28 (#39730)
Co-authored-by: Kai Pastor <dg0yt@darc.de>
2024-07-10 10:01:55 -04:00
Dennis
561d171d79
[grpc/protobuf] Update grpc to 1.60.0 and update protobuf to 3.25.1 (#35781)
Resolves https://github.com/microsoft/vcpkg/issues/35566

This pr includes https://github.com/microsoft/vcpkg/pull/31159 and
https://github.com/microsoft/vcpkg/pull/35399

Ports changed in this pr:

Most of these changes stem from the fact that protobuf now depends on
abseil and requires c++14 while ports consume protobuf using
`target_link_libraries(lib ${Protobuf_LIBRARIES})` instead of
`target_link_libraries(lib PUBLIC protobuf::libprotobuf)`.

* **abseil** Updated to 03/04/2024 to address MSVC build issue in
openvino
* **arcus** Updated to 4.13.2
* **braft** Patched to use `find_package(Protobuf` instead of custom
FindProtobuf module. also link with `PUBLIC protobuf::libprotobuf)`.
* **brpc** Patch several `target_link_library` calls to include `PUBLIC`
instead of nothing. Patch some warnings that are treated as errors by
some OSX compiler. Patch usage of changed protobuf features most
importantly removal of `SetLogHandler`, tbd whether this patch is
acceptable with upstream.
* **cld3** Use CONFIG to find protobuf to propagate dependent abseil
libs and cxx14 correctly.
* **ecal** Use CONFIG to find protobuf. Use PUBLIC when linking it.
* **gamenetworkingsockets** Add `-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=on`
for protobuf.
* **gz-transport12** Update to fix usage of removed protobuf features.
* **ignition-msgs1/5/6** Remove protobuf version check which is confused
by the duplicate versioning scheme (v25.1 vs. 3.25.1 vs 4.x). Why are we
even maintaining this no longer maintained major version of this port? I
would welcome a more strict policy on removing ports/adding them to
ci.baseline.txt
* **ignition-transport4/8/9** Same as above + cherry-pick a protobuf
deprecation patch.
* **libprotobuf-mutator** Cherry-pick two commits to address altered
protobuf functionality. Add CONFIG and PUBLIC to protobuf handling in
CMake.
* **marble** Explicitly set protobuf to not found since it is not part
of the vcpkg.json but is made available transitively but another
dependency.
* **mysql-connector-cpp** Several CMake changes and removal of
protobuf::SetLogHandler patch.
* **openvino** Find protobuf using CONFIG
* **osgearth** Link libraries using PUBLIC and link with
protobuf::libprotobuf instead of Protobuf_LIBRARIES
* **paraview** Find protobuf using CONFIG and remove version check
* **pulsar-client-cpp** Add protobuf linkage to PULSAR_OBJECT_LIB.
Simplify protoc patch. Remove -Werror.
* **shogun** Update and patch as much as possible. Users are required to
override bitsery version to 4.x to use shogun since it does not support
5.x provided by vcpkg. Therefore add shogun to ci.baseline.txt.
* **srpc** Update and fix static crt linkage. Patch protobuf linkage and
remove hardcoded `-std=c++11` flag. Protobuf requires c++14 and CMake
does not recognize the hardcoded c++11 flag and will therefore not add a
c++14 flag when the compiler uses c++14 by default.
* **upb** Update to align version with protobuf/grpc and use new github
repo. Patch usual CMake mess (they do not support CMake officially)
which should probably be `unofficial-upbConfig.cmake` but I didn't dig
into downstream implications so I kept it at `upbConfig.cmake` as
before.
* **utf8-range** Update to allign version with protobuf.
2024-06-21 13:39:50 -07:00
Chuck Walbourn
5d2a0a9814
Update xbox supports expressions for failing ports with copyleft licenses (#31770)
* Xbox triplets should not support ports with only copyleft licenses

* Reverted ports that build with xbox currently

* Fix conflict and rebase

* Update baseline

* Update baseline
2023-06-15 14:49:00 -07:00
Connor Broyles
a4c3f116fa
[osgearth] Update to version 3.4 (#31569)
* [osgearth] Update to version 3.4

* Fix patch indentation

* Add missing dependency

* Fix tool installation
2023-05-24 12:14:06 -07:00
Benjamin Oldenburg
a92f44a98c
[glew] Only set the base address on x86 (32bit) (#31084) 2023-05-01 11:46:50 -07:00
Kai Pastor
e8e206e64f
[osgearth] Fix core installation (#31125)
* [osgearth] Test core

* [osgearth] Fix core

* Require C++11

* Finish PR
2023-04-26 17:08:20 -07:00
Connor Broyles
edf51f5f25
[blend2d|osgearth] Allow blend2d and osgearth[blend2d] on ARM (#29141)
* [blend2d] Allow on non-Windows ARM platforms

* [osgearth] Allow blend2d feature on ARM
2023-02-03 12:39:12 -08:00
Connor Broyles
4941494d49
[osgearth] Fix find_path regression (#27672)
* [osgearth] Fix find_path regression

* Update version

* Run x-add-version
2022-11-07 15:37:32 -08:00
Connor Broyles
13d47a6d82
[osgearth] Plugin installation fixes (#27156)
* [osgearth] Fix plugin exporting

This change has the same effects and reasoning as the prior fix to the osg port.

* Update version

* Update port
2022-10-12 01:25:54 -07:00
Connor Broyles
5d6bbf3da3
[osgearth] Fix naming of target and exported variables (#26258)
* [osgearth] Fix target name and match exported variables

* Fix version SHA
2022-08-10 11:36:23 -07:00
Connor Broyles
5e77198e98
[osgearth] Fix errors that occur in the osgearth config file on some platforms (#26024)
* Fix target export in osgearth config

* Update port

* Update ports/osgearth/fix-osgearth-config.patch

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2022-08-04 15:48:49 -07:00
plevy
35fb7a05a7
[osgearth] Update osgEarth to release 3.3 (#24886)
* Updated portfile and patches for the osgEarth 3.3 release

* Updated portfile and patches for the osgEarth 3.3 release

* Update version database

* Update vcpkg.json

* added license

* re-formatted

* re-formmatted again

* update port

* Update version database

* Update versions/baseline.json

upstream osgearth changed, set port back to 0

Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>

* updated version

* Update portfile.cmake

added cleanup

* updated version

* Update find-package.patch

fix Blosc

* Update find-package.patch

fix Blosc again

* version update

* Removed optional dependencies and submodule downloads

* update version

* Remove downloaded imgui in case it was not cleaned, better comments, and only download imgui if tools enabled

* updated version

* Update versions/o-/osgearth.json

* Update versions/o-/osgearth.json

Co-authored-by: Paul Levy <plevy@pelicanmapping.com>
Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-07-06 14:45:30 -07:00
Kai Pastor
0d27810d17
[osg] Cleanup, export unofficial config (#24720)
* Revise portfile

* Plugins are a default feature; fix disabling

* Remove line continuations from pc file

vcpkg_fixup_pkgconfig cannot handle it.

* Control nvtt plugin via feature

* Control dae plugin, not find_package

* Control fontconfig via feature

Use CMake's (3.14) find module for which vcpkg provides a wrapper.
OSG links to Fontconfig::Fontconfig.
OSG default is to use Fontconfig except for ios and android.

* Control freetype via feature

Use CMake's find module for which vcpkg provides a wrapper.
OSG links to FREETYPE_LIBRARIES.

* Control RestHttpDevice via feature

Only this plugin needs boost.

* Drop unused liblas dependency

* Drop unused coin dependency

Coin was meant to be used for the inventor plugin,
but this plugin is disabled.

* Control sdl1 via feature

* Enable apps on linux

* Disable apps and docs for debug

* Drop example application patch

* Use option, not patch, to disable DLL versioning

* Fix osg plugin PDB installation

* Prefer <Pkg>_LIBRARIES for linking

<Pkg>_LIBRARIES carries debug+release config and transitive usage requirements.

* Curl patches are obsolete now.

We leverage CURL_LIBRARIES via link-libraries.patch.

* Add unofficial config export

* Use toolchain's windows version

Fixes mingw build.

* Avoid extra dependency lookups

* Silence warnings about plugin control variables

* Define OSG_LIBRARY_STATIC

* Revise copying of plugins

* Control OpenEXR via feature

Unblock uwp.

* Allow jasper without opengl

* [osgearth] Remove obsolete geos patching

The build uses exported geos config.

* [osgearth] Serialize linking to avoid OOM errors

* [osgearth] Fix minor portfile issues

* [osgearth] Prefer <Pkg>_LIBRARIES for linking

<Pkg>_LIBRARIES carries debug+release config and transitive usage requirements.

* [osgearth] Use unofficial osg config

* [osgearth] Fix lib installation dir

* [osgearth] Revise OSGEARTH_LIBRARY_STATIC

* [osgearth] Revise find_package patching

* [osgearth] Revise copying of plugins

* [osgearth] Disable tools for debug variant

* [osgearth] Control Blend2D via feature

* Update versions

* Fix plugin lookup

* Update versions

* CR request

* Update versions

* [osgearth] Remove tools from default features

* Update versions
2022-06-20 13:49:37 -07:00
Kai Pastor
99346bb692
[libwebp] Update, cleanup (#23864)
* Update to v1.2.2

* Fix libwebpmux Windows name breakage

The pc file relies on the original output name:
No 'lib' prefix for MSVC. No 'liblib' prefix for mingw.

* Minor portfile updates

* Don't self-depend on default features

* Fix the libwebpmux feature

* Fix internal tool dependencies

* Drop Xrandr patch (fixed in freeglut)

* Drop X11 patch (fixed in freeglut)

* Cleanup CMake config patch, no extra case hacks

* Adjust webp lib names in skia, qt5-imageformats

* Adjust downstream WEBP cmake usage

* Debug qtimageformats [skip actions]

* [tiff] Drive-by fix for CMake warning

* Drop non-standard debug postfix

* Update indentation

* Update port versions

* Update versions

* Revert qtimageformat debug change

* Fixup qt5-imageformats change

* Update versions
2022-04-13 11:26:56 -07:00
ZeeWanderer
f0cb4229c6
[osgearth] port patch (#23786)
* [osgearth] port patch

* [osgearth] update versions
2022-03-28 13:35:15 -07:00
Billy O'Neal
d31efec576
[osgearth] Change blend2d dependency to use the blend2d target (#21977)
* [osgearth] Change blend2d dependency to use the blend2d target and add missing dependency.

* Add quotes around 'dynamic', as requested by dg0yt

* Use CONFIG for blend2d, and combine with make-all-find-packages-required patch, as requested by @JackBoosY.
2021-12-13 17:21:14 -08:00
Ankur Verma
a5b659160a
Squashed (#20449)
Co-authored-by: Ankur Verma <ankurv@microsoft.com>
2021-12-02 19:40:02 -08:00
chausner
22d7c8b375
[Many ports] Remove/fix unused patch files (#20620)
* Remove/fix unused patch files

* Bump port versions

* Update git-tree hash

* Fix corrupt patch

* Update git-tree hash

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-10-18 14:25:31 -07:00
plevy
124239f751
[osgearth ] update osgearth to 3.2 and updated patches (#20160)
* initial update for osgearth 3.2 and updated patches

* Adding output from ./vcpkg x-add-version --all

* update version

* update version

* delete Remark

* update version

Co-authored-by: Paul Levy <plevy@pelicanmapping.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
2021-09-27 19:39:25 -07:00
Ankur Verma
c21792bd04
[osgearth] Fix undefined references due to openjp2 and xml2 (#17993)
* Fix osgearth

* Fix linking

* Update version files

Co-authored-by: Ankur Verma <ankurv@microsoft.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-06-09 15:27:43 -07:00
ankurverma85
5a10163c44
[osgearth] Fix x64-windows-static-md (#15375)
* osgearth:x64-windows-static-md fixes

* Try to build for x64-windows-static-md

* Fix builds

* Indent and combine blocks

* overwrite version

* merge with master and update version

* revert incorrect version changes

* [osgearth] Improve portfile.cmake, add feature tools

* update version record

* disable fontconfig on windows

* update version

* [osgearth] Fix dependencies

* [osgearth] Re-fix dependencies

* [osgearth] Fix the sequence of linking osg

* [osgearth] Fix dependency osg

* update version record

* Fix osgearth:x64-linux

* x64-windows-static-md fixes

* Fix x64-linux

* Build fixes

* Update x-add-version

Co-authored-by: ankurv <ankurv@microsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-03-25 13:28:42 -07:00
Jack·Boos·Yu
f53d9799c3
[vcpkg baseline][osgearth] Fix and add dependency tinyxml (#15900)
* [osgearth] Fix and add dependency tinyxml

* update version record
2021-01-27 14:24:07 -08:00
Billy O'Neal
bedeaa639c
[osgearth] Make all find_packages required in effort to make this port less "flaky", and turn on in CI. (#15777) 2021-01-21 08:58:11 -08:00
NancyLi1013
ce5d30cb96
[osgearth/rocksdb] Update to latest release (#14976) 2020-12-17 11:53:17 -08:00
Jack·Boos·Yu
37c412ae07
[osg] Fix feature plugin (#13942) 2020-10-12 09:28:49 -07:00
ankurverma85
acd2f59e93
[osgearth] update to latest to fix build issue with latest geos (#13385)
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-10-01 21:32:32 -07:00
JonLiu1993
cd6c4e19fa
[osgearth] update to 3.0 (#12531)
* [osgearth] update to 3.0

* delete controlfile

* fixjsonfile

* Update ports/osgearth/portfile.cmake

* fixJsonfile

* deletejsonfile

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2020-07-31 11:35:04 -07:00
Jack·Boos·Yu
b12256a4af
[osg] Add feature examples and plugins, fix configure options (#10082)
* [osg] Add feature examples and plugins, fix configure options

* [osg] Add feature tools, packages and docs

* [osgearth] Set dependency to osg[plugins]

* [osgearth] bump version

* [osg] Fix dependency

* [osg] Remove feature plugins dependency nvtt

* [osg] Remove empty folder

* [osg] Fix dependency sdl and liblas

* [osg] Fix install issue

* [osg] Fix dependency nvtt

* [osg] Re-fix dependency nvtt

* [osg] Fix judgment when selecting nvtt

* [osg] Create tools folder based on conditions

* [osg] Fix typo

* update baseline

* re-trigger ci test

* re-trigger ci test
2020-04-16 13:49:55 -07:00
Long Huan
4b81f7f08f Fix osgearth rocksdb plugin build falied 2019-08-15 13:27:14 +08:00
Robert Schumacher
33af90d42a
[many ports] Updates 2019.05.19 (#6524) 2019-05-21 21:00:24 -07:00
Victor Romero
050e71d01d
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [alac,benchmark,capnproto] Fix  check_linkage call

* [fastlz] Fix SHA512

* [coroutine] Fix dynamic build

* [folly] Find double-conversion

* [gamma] Use vcpkg_from_github

* [librsync] Enable static builds

* [netcdf-cxx4] Fix SHA512

* [octomap] Fix static build

* [tidy-html5] Fix static build

* [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime

* [folly] Use ras0219's fix for link paths

* [octomap] Fix exported targets

* [uvatlas] Set tool download SHA512

* [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32

* [suitesparse] osx fix

* [gtkmm] Call vcpkg_check_linkage after including vcpkg functions

* [duktape] Resolve conflicts

* [duktape] FIxed typo in Python paths

* [wangle] Find zlib

* [openssl-uwp] Fix SHA512

* [glib] Allow static builds on non-Windows

* [suitesparse] Fix build on Windows

* [multiple ports] Bump CONTROL version

* [multiple ports] Fix description indent

* [directxtk] Fix CONTROL file

* [bde,duktape,qpid-proton] Build packages with python2 installed

* [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [gdal,live555,uriparser] Fix regressions

* [live555] Update to 2019.04.24
2019-05-02 22:57:43 -07:00
Phil Christensen
e76fa8ee73 [osgearth] bump version in control file 2018-12-06 16:26:43 -08:00
plevy
89de5f705e
Update to release version 2.10
Update to release version 2.10
2018-12-06 11:27:31 -05:00
Jiri Appl
3d2b540173 Enable Windows ARM32 build of OpenSSL LTS (#4525)
* Enable Windows ARM32 build of OpenSSL

* [openssl-windows] Bump control version

* [vtk] Fix hardcoded install paths

* [osgearth] Backport VS2017u8 fix
2018-10-25 11:47:58 -07:00
plevy
a1f0dcd02b [osgearth] Update osgPlugins folder to 3.6.2 (#3920)
* Update osgPlugins folder to 3.6.2

Update osgPlugins folder to 3.6.2 to stay in sync with osg package.

* [osgearth] Detect osgplugins version automatically
2018-07-17 15:47:24 -07:00
Tom Henoch
c873b2fddc Update osgEarth (#3878) 2018-07-10 11:40:13 -07:00
Mike Howard
438af21f07 osgearth port (#3257)
* created port for osgearth

* [osgearth] Slight simplification. Block DLL linking against static CRT
2018-05-19 18:12:48 -07:00