Billy O'Neal
68b7fec22e
Update VMs for July 2022 Patch Tuesday, and to Ubuntu 22.04. ( #25785 )
...
* Update Ubuntu to 22.04.
* Add libxtst-dev from https://github.com/microsoft/vcpkg/pull/24934
* Add standard prereqs.
* Update some package references for Ubuntu 22.04.
* [cuda] Update to search in /usr/bin as used on Ubuntu 22.04.
* [cudnn] Add where ubuntu 22.04 puts it.
* Add update-nvidia-cudnn calls.
* Update powershell to 7.2.5
* Re-add NCCL installation from CUDA official sources.
* Update pools.
2022-07-15 21:11:16 -07:00
Stefano Sinigardi
e79aaaaf3c
[CUDA, CUDNN] fix support clause ( #23900 )
...
* [CUDA, CUDNN] fix support clause
* [cuda] use version key
* [opencv2] format manifest
* fix references
* Update vcpkg.json
* Update vcpkg.json
* Update version database
* Update version database.
* fix feature descriptions
* fix references
* add missing licenses
* fix references
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-04-05 11:50:48 -07:00
Stefano Sinigardi
401578455f
[OpenCV] upgrade to v4.5.5 ( #22801 )
...
* [OpenCV4] update to v4.5.5
* [OpenCV] bump version
* [gstreamer] fix build for opencv
* fix references
* [vcpkg-tool-meson] fix nuget packaging
* fix references
* [gstreamer] fix references
* [ogre] update vcpkg tools
* fix references
* [OpenCV4] fixes from CI runs
* fix references
* [OpenCV4] force python module also in debug builds
* fix references
* [harfbuzz] fix cmake config
* harfbuzz fixes
* fix references
* [OpenCV4] remove unnecessary lines from patches
* fix references
* fix references
* [harfbuzz] bump version
* [harfbuzz] fix for single config builds
* fix references
* freetype fixes
* fix references
* fix ogre references
* fix references, again
* python when building static windows opencv libraries is unsupported
* fix references
* fix
* refs
* use required when necessary
* fix references
* do not use config for hdf5, use internal module
* fix references
* use proper spelling for freetype config cmake
* fix references
* [OpenCV] restore versions after merge
* fix references
* [leptonica] fix building
* fix references
* do not require package in optional features
* £fix references
* fix python feat
* update version
* update version
* [ffmpeg] remove opengl feat on arm64-windows
* format manifest
* fix references
* fix cuda/nvidia features compatibility matrix
* fix manifest
* fix
* fix
* fix references
* fix references, again
* move CONTROL to manifest
* [gstreamer] bump versions
* fix references
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2022-02-23 11:57:13 -08: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
