Commit Graph

10 Commits

Author SHA1 Message Date
Zac Walker
f3eeb27624
[osg libraw openexr jasper] Dont block arm64-osx (#25535)
* Dont block arm64-osx

* Update version

* Updated versions

* supports fixups

* Update versions

* supports fixups

* supports fixups
2022-07-05 12:52:55 -07:00
Zac Walker
6d994a670d
[QT] arm64-windows build (#25418)
* QT arm64-windows build (WIP)

* Updated versions

* Undo changes made to graphviz in error

* Only remove OpenGL for ARM

* Update version database

* Update version database

* updated libs not compatible with uwp+arm

* Update version database

* Enable QT in CI

* qt5-base not compat

* Update ports/qtapplicationmanager/vcpkg.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/qt5-imageformats/vcpkg.json

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Updated versions

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2022-06-30 13:01:24 -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
Jason Beverage
bb584d35bb
[osg] Added OPENGL_PROFILE option to osg port as a triplet variable. (#24108)
* Updated osg port to be able to set the OPENGL_PROFILE setting via
a triplet variable.

* Format osg/ports/vcpkg.json

* Added osg port version 12
2022-04-14 08:24:41 -07:00
Billy O'Neal
70ebc32424
[osg] Disable conditional plugins. (#21634)
Resolves nightly CI failure:
```
       "D:\buildtrees\osg\x86-windows-dbg\install.vcxproj" (default target) (1) ->
       "D:\buildtrees\osg\x86-windows-dbg\ALL_BUILD.vcxproj" (default target) (3) ->
       "D:\buildtrees\osg\x86-windows-dbg\src\osgPlugins\OpenCASCADE\osgdb_opencascade.vcxproj" (default target) (54) ->
       (ClCompile target) ->
         D:\buildtrees\osg\src\raph-3.6.5-0028e69d98.clean\src\osgPlugins\OpenCASCADE\ReaderWriterOpenCASCADE.cpp(214,49): error C2039: 'Nodes': is not a member of 'Poly_Triangulation' [D:\buildtrees\osg\x86-windows-dbg\src\osgPlugins\OpenCASCADE\osgdb_opencascade.vcxproj]
```

DICOM disabled because there's a check for dcmtk which isn't a dependency of osg[plugins]

Inventor disabled because there's a check for this library.

Opencascade disabled because it's broken.

All others disabled because they were behind some kind of if (XXX_found) in src\osgPlugins\CMakeLists.tx, except, Quicktime left alone because that's part of MacOS?
2021-11-23 15:48:35 -08:00
autoantwort
e7e328cf9d
[many ports] call vcpkg_fixup_pkgconfig() (#20953)
* [many ports] call vcpkg_fixup_pkgconfig()

The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files

* Update port-version for armadillo and polyclipping.

* Update version database.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-10-27 15:19:28 -07: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
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986)
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
2021-09-09 01:24:04 -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
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00