19 Commits

Author SHA1 Message Date
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
Alexander Neumann
96f4487c77 [Qt] Update to 5.12.4 (#7667)
* update to 5.12.4
* removed port qt5-modularscripts and split it functionality into more functions into qt5-base
* added qt_port_hashes.cmake for simpler upgrade.
* added optional VCPKG_QT_HOST_MKSPEC and VCPKG_QT_TARGET_MKSPEC to select QTs build mkspecs from a triplet
* qt_<config>.conf are now copied from the build dir instead from the port dir
* fixed freetype dependencies.
* cleanup of vcpkg_qmake scripts. No strange/unclear replacements anymore.
* introduced vcpkg_buildpath_length_warning
* changed directory layout of the qt5 installation executables and mkspecs a bit.
2019-09-12 10:07:21 -07:00
JackBoosY
800fd63cf3 [qt5]Fix build failure in linux (#7230) 2019-07-17 11:39:54 -07:00
Stefano Sinigardi
47d206e149 [many ports] improvements for linux/wsl (#6730)
* [many ports] improve compatibility with WSL and mixed case filesystems

* [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there

* [libharu] add compatibility with non-win32 platforms

* [geogram] fix openblas on linux
[clapack] better integration with linux environment
[visit-struct] put cmake config file in the expected folder
[geogram] remove trailing underscore to enable compatibility with OpenBLAS

* [openblas] playing with underscore, without success

* [openblas/lapack] fix library integration

* [clapack] improve target handling in cmake module

* [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs

* [clapack,openblas] improve libraries integration

* [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags

* [suitesparse] improve integration with new lapack/openblas mechanism

* [suitesparse] add no underscore postfix also for linux

* [ceres] fix integration with newer openblas/lapack configs

* [aws-c-event-stream] fix regression

* [systemc] fix regression

* [libwebp,geogram] trigger rebuild

* [libwebp,pthread4w] fix regressions

* [glbinding] fix cmake module installation

* [globjects] disentangle unnecessary dependency from qt5

* [jasper] remove broken and unnecessary patches

* [libwebp] fix regression

* [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files

* [clapack] correctly find dlls

* [clapack] use a generic blas as dependency

* [fizz,g2o] restore expected version

* fix mistake

* [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports

* [libressl,openssl] do not try to build one if the other is already installed

* [itk] update ref and patch to avoid regression

* [libressl,openssl] implement full strategy to fix CI

* [libwebp] disable components that are broken on macOS

* [ogre] enable macOS build

* [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169

* [ogre] add missing install command

* [ffmpeg] enable wrapper for cmake module

* [ffmpeg] add avresample module finder

* [ffmpeg] improve module detection and exported symbols

* [ffmpeg] add variables to cache

* [thrift] remove unnecessary build option

* [allegro5] fix shared/static inversion

* [protobuf] cleanup

* [libressl] cleanup

* [moos-core] cleanup

* commented features must not be separated from other features, otherwise vcpkg complains

* [itk] fix regression

* [shogun,itk] fix regressions

* [ogre] fix regression

* [opusfile] add compatibility with non-win32

* [itk] fix regression

* [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile

* add missing dependencies

* [ismrmrd] fix regression

* [ffmpeg] trigger rebuild

* [clapack,openblas,libogg] fix regressions on macOS

* [libtins] fix regression

* force rebuild windows regressions, unable to reproduce locally

* [mosquitto] enable non-win32 builds

* [json-dto] force rebuild, unable to reproduce regression locally

* [many ports] uniform naming and path length requests

* fix regression

* fix regression

* [ffmpeg] fixes for downstream projects

* clean up - thanks to reviewers

* trigger rebuild of regressions on macOS

* trigger rebuild of regressions on macOS - part2

* Add core back

* Use VCPKG_CONCURRENCY

* Add core back to suitesparse

* Add core back to curl

* Add core back to magnum

* Add core back to magnum

* Add core back to magnum

* Add core back to cgal
2019-06-20 19:11:54 -07:00
Igor Kostenko
5ef4940c2c crossplatform add to path (#6961) 2019-06-19 12:04:53 -07:00
Lennart Trunk
38aeee774a [qt5] update to 5.12.3 (#6127)
* update CONTROL files and version variable

* fix qt5 linkage in debug

* revert target_link_libraries to set_property

* revert mqtt to 5.12.1 since 5.12.3 is not released yet

* update mqtt to 5.12.3

* update hashes

* remove unnecessary patch

* fix qmldevtools debug linkage for qt5-tools
2019-05-08 15:15:26 -07:00
João Maia
5314524f44 [qt5] Fix scripts on debug/release-only builds (#6259)
* Fix qt5-base portfile

qt5-release.conf was not copied in release mode

* Fix vcpkg_configure_qmake.cmake in debug-only builds

* Add VCPKG_BUILD_TYPE support to qt_modular_library.cmake and vcpkg_build_qmake.cmake
2019-04-30 09:29:41 -07:00
João Maia
d299ad6107 [qt5] Build qt5 release/debug targets according to VCPKG_BUILD_TYPE (#6215) 2019-04-25 14:30:39 -07:00
Maurice Kalinowski
3d2db597ce [qt5-mqtt] new port Qtmqtt (#5736) (#5737)
* [qt5-modularscripts] Split build steps

When building modules not available from the vendor download side, the
build process stays the same. Create two functions, one for accessing
the sources, the other for compilation.

* [qtmqtt] Add new port (#5736)
2019-03-22 01:08:50 -07:00
Sean Warren
f409536f5e [qt5] Fix mac build (#5624)
* [qt5] Fix mac build

* [qt5] Disable parallel build on mac

* [qt5] Fix qmake find on mac

* [qt5] Update find jom for mac

* [qt5] Fix invocation of build command

* [qt5-base] Rebuild packages for #5624

* [harfbuzz] Remove disabled assert (failing due to -Werror)

* [qt5] Bump control version

* [qt5] Disable harfbuzz on mac

* [qt5-base] Disable harfbuzz on mac
2019-03-14 06:33:47 -07:00
Lennart Trunk
473e803451 [qt5] Update to 5.12.1 and add some missing modules (#5293)
* Update qt5-base to 5.12.1

* update qt5-declarative to 5.12.1

* update qt5-modularscripts for 5.12.1

* update qt5-3d to 5.12.1

* update qt5-activeqt to 5.12.1

* add qt5-connectivity

* update qt5-charts to 5.12.1

* update qt5-datavis3d to 5.12.1

* update qt5-gamepad to 5.12.1

* update qt5-graphicaleffects to 5.12.1

* update qt5-imageformats to 5.12.1

* add qt5-location

* update qt5-multimedia to 5.12.1

* update qt5-networkauth to 5.12.1

* add qt5-purchasing

* update qt5-quickcontrols to 5.12.1

* update qt5-quickcontrols2 to 5.12.1

* add qt5-remoteobjects

* update qt5-script to 5.12.1

* update qt5-scxml to 5.12.1

* add qt5-sensors

* update qt5-serialport to 5.12.1

* update qt5-speech to 5.12.1

* update qt5-svg to 5.12.1

* update qt5-tools to 5.12.1

* update qt5-virtualkeyboard to 5.12.1

* add qt5-webchannel

* update qt5-websockets to 5.12.1

* update qt5-winextras to 5.12.1

* update qt5-xmlpatterns to 5.12.1

* update framework port to 5.12.1 and include the new modules

* fix building qt5-base on linux

* [qt5] Remove non-alphanumerical ASCII chars from dependencies
2019-02-22 14:57:40 -08:00
Lennart Trunk
13ec61a842 [qt5] update to QT5.12 (#4991)
* update qt5-base to 5.12

* update modules to 5.12 (qt5-declarative and dependents don't work yet)

* fix qt5-declarative for 5.12 and some hashes.

* add qt5-declarative as dependency for qt5-graphicaleffects
2019-01-16 14:54:59 -08:00
Alexander Neumann
4aba36cd38 Qt version bump 5.11.2 (#4629)
* Qt 5.11.2 version bump

* removed unecessary qt patch

* fix wrong hash for qt5-networkauth
2018-11-07 14:49:47 -08:00
Robert Colton
473d63c4ed Qt 5.11 and static build fixes (#4164)
* fix da qt5

* fix qt config duplication

* [qt5-base] Use vcpkg_extract_source_archive_ex
[sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA

* [qt5-*] Update sub-portfiles

* qt5-base WIP

* [qt5] Fix Could not find qmlcachegen.exe

* [qt5-activeqt] Fix SHA512

* [qt5-base] Fix static builds

* [qt5-base] Bump control version

* [qt5-base] Restore removal of qmake dependencies

* [qt5-base] Partially revert #3280

* [qt5-base][vcpkg_build_qmake] Fix Qt5Bootstrap.lib issues
2018-10-22 10:49:16 -07:00
alexsmn
5a67a5fa29 Add qt5-activeqt library. (#3347) 2018-05-31 10:11:57 -07:00
Robert Schumacher
ba47c71551 [qt5] Remove absolute paths from .prl files 2018-03-28 09:37:08 -07:00
yosagi
ef9d50ecb3 Handle qt subpackage executable paths in cmake config files (#2844)
* Handle qt subpackage executable paths in cmake config files

* [qt5-modularscripts] Bump version to include changes to tool deployment
2018-02-22 05:31:28 -08:00
Robert Schumacher
b47b4346f8 [vcpkg-build-qmake][vcpkg-configure-qmake] Collapse config-specific versions. 2018-01-18 07:36:54 -08:00
Barath Kannan
ca9ff199d6 append hyphen to qt5 module names 2018-01-18 10:02:56 +11:00