Commit Graph

16 Commits

Author SHA1 Message Date
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