diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-06-02 15:04:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-02 15:04:11 -0700 |
| commit | ad7a22732938a6df5abf7f04dbdbe3fee15af296 (patch) | |
| tree | 03b214b051202edca7db4397eccae38b82778f5e /ports/osg/CONTROL | |
| parent | f5676127ee28ade462b01e6f969689fc8dece3ae (diff) | |
| download | vcpkg-ad7a22732938a6df5abf7f04dbdbe3fee15af296.tar.gz vcpkg-ad7a22732938a6df5abf7f04dbdbe3fee15af296.zip | |
[osg] Fix conflict when asio and boost-asio are installed. (#11715)
When asio and boost-asio are installed, osg's build scripts would choose the standalone version of asio, but uses features specific to boost-asio. This patch forces the port to always use boost-asio, as the original CONTROL file indicated was the intent.
Also fixed transitive dependencies not being declared that just happened to get installed because boost-asio is a dependency.
Diffstat (limited to 'ports/osg/CONTROL')
| -rw-r--r-- | ports/osg/CONTROL | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL index ce46f95eb..598ec59b1 100644 --- a/ports/osg/CONTROL +++ b/ports/osg/CONTROL @@ -1,8 +1,8 @@ Source: osg -Version: 3.6.4-2 +Version: 3.6.4-3 Homepage: https://github.com/openscenegraph/OpenSceneGraph Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. -Build-Depends: zlib, fontconfig, boost-asio (!windows), freeglut (windows), expat (windows), openimageio (osx) +Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx) Feature: collada Description: Support for Collada (.dae) files |