Commit Graph

30 Commits

Author SHA1 Message Date
pezcode
b9ca38893e
[magnum-plugins] Update head features and bundled dependency (#21307)
* [magnum-plugins] Update head features and bundled dependency

* [magnum-plugins] Format vcpkg.json

* [magnum-plugins] Use vcpkg_extract_source_archive

* [magnum-plugins] Formatting

* [magnum-plugins] Replace deprecated functions

* [magnum-plugins] add zstd dependency to basisimageconverter and basisimporter

* [magnum-plugins] Update version
2021-11-18 20:13:14 -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
Jonathan Hale
8655bfd4b3
[corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435)
* [magnum/-plugins] Remove obsolete patches that no longer apply

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade] Make feature to flag translation consistent to fix warning

Consistent with magnum & magnum-plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix warning message for dlls without matching pdbs always displayed

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix the baseline version

* Revert the changes in vcpkg_copy_pdbs.cmake

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-09-02 13:24:33 -07:00
Jonathan Hale
70610f4494
[magnum,-plugins] Fix deprecated use of vcpkg_check_features (#17016)
Signed-off-by: Squareys <squareys@googlemail.com>
2021-04-29 13:49:04 -07:00
Francisco Facioni
37df512335
[magnum/magnum-plugins] fix all magnum dependencies being built (#16657) 2021-03-16 11:51:57 -07:00
Jonathan Hale
e7377f7992
[magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (#16245)
* [magnum] Correctly deploy shaderconverter and sceneconverter plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Only remove plugin lib dirs for Windows platforms

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Clean up deletion of plugin libs and clarify in comment

Signed-off-by: Squareys <squareys@googlemail.com>

* Update versions

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-02-18 13:02:27 -08:00
Jonathan Hale
795588570a
[magnum,magnum-plugins] Add vulkan and shaderconverter features (#15163)
* [magnum,magnum-plugins] Add vulkan and shaderconverter features

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Add warning for features unavailable in non-head version

Signed-off-by: Squareys <squareys@googlemail.com>

* update version record

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-01-26 15:03:54 -08:00
Jack·Boos·Yu
c0d7b3970c
[magnum-plugins] Fix file conflict with stb (#12458) 2020-07-20 19:47:16 -07:00
Jonathan Hale
5e40afca0d
[corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (#12211)
* [magnum] Improve maintainability of feature to cmake flag conversion

* [magnum] Ignore features not supported on current platform

Allows `vcpkg install magnum[*]` on any platform.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add cglcontext and windowlesscglapplication features

* docs: Update valid VCPKG_CMAKE_SYSTEM_NAME values

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace deprecated basisu with archive download

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add meshoptimizersceneconverter feature

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Also use vcpkg_check_features

Analog to magnum port.

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Add initial port

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace meshoptimizer download with feature dependency

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum-*] Fix license installation command

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Use vcpkg_fixup_cmake_targets

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-07-14 08:38:18 -07:00
Jonathan Hale
edfce3b455
[magnum/magnum-plugins] Fix patches for --head builds (#10158)
* [magnum] Update patches for --head builds

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Remove obsolete patch

Since basisu port has been updated, we can now use it without patching
the magnum-plugins code for compatibility.

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade] Remove obsolete warning and flag

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Rename patches to reflect order of application

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade/magnum/magnum-plugins] Update port versions

Signed-off-by: Squareys <squareys@googlemail.com>
2020-03-27 20:37:33 -07:00
Jonathan Hale
a3ab4500a4 [magnum-plugins] Fix basisimporter/basisimageconverter features (#8939)
* [magnum-plugins] Patch FindBasisUniversal to find prebuilt basisu

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Patch BasisImporter to use slightly outdated basisu

jherico's fork which the vcpkg port is based on does not integrate
54304fa014
yet, which renamed a parameter.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Only apply FindBasisUniversal patch on release

The change is integrated upstream for --head builds already.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Download large patch from GitHub history
2019-11-25 10:31:55 -08:00
Jonathan Hale
3b868ac769 Update magnum ports to new version (#8742)
* [corrade/magnum-*] Remove obsolete patches

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade/magnum-*] Update to 2019.10

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add new features

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-integration] Add new features

Signed-off-by: Squareys <squareys@googlemail.com>
2019-10-25 13:05:28 -07:00
Stefano Sinigardi
726c111481 [vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
2019-10-07 10:35:13 -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
pravic
18b029a5e3 [WIP] Add a Homepage URL entry for vcpkg ports (#2933)
* [vcpkg] Add "Homepage" field to the CONTROL files.
2019-06-15 16:54:47 -07:00
Phil Christensen
d962dc7d65 [vcpkg] Add optional 'Homepage' field to CONTROL (#6844)
* [control file] Add optional 'Homepage' tag

This allows a 'Homepage' tag to be added to a port in order to support
changes such as PR #2933.  It currently does not do anything with it.

* [docs]

Add Homepage to the control file documentation

* move urls from descriptions to homepage field.
2019-06-10 16:35:22 -07:00
Jonathan Hale
6c6516621f [corrade,magnum,-integration,-extras,-plugins] Update Magnum to v2019.01 (#5312)
* [corrade] Update to v2019.01

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Update to v2019.01, remove shapes and glutapplication features

These features were deprecated in earlier versions and now removed.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-(extras,plugins,integration)] Update to v2019.01, add imgui feat.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Improve dependencies to corrade

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add faad2audioimporter

 - faad2 is currently not in vcpkg, hence commented out
 - The commented out empty line is required to have vcpkg parse the file
   without issues

Signed-off-by: Squareys <squareys@googlemail.com>
2019-02-11 13:49:12 -08:00
Jonathan Hale
aba5a4abec [corrade/magnum/-extras/-integration/-plugins] Update to 2018.10 (#4556)
Signed-off-by: Squareys <squareys@googlemail.com>
2018-10-25 15:26:05 -07:00
Squareys
eee5939689 [magnum,-plugins,-integration,-extras] Update to v2018.04
Signed-off-by: Squareys <squareys@googlemail.com>
2018-05-02 15:02:39 +02:00
Squareys
3338ab613c [magnum,-plugins] Also install headers for dynamically built plugins
While before there was no use for linking the plugins directly or using
them as libraries in some other way when built dynamically, there now are
intra-dependencies between plugins which to be detected, require the
headers to be installed.

Additionally, the folders lib/magnum and debug/lib/magnum-d are no longer
empty, as we put the plugin deploy scripts there. Removing them is
therefore superfluous.

(Prepares upcoming release/head build)

Signed-off-by: Squareys <squareys@googlemail.com>
2018-05-02 13:42:51 +02:00
Jonathan Hale
3a3fa5cd8f [magnum] Properly deploy plugins (#3191)
* [magnum] Properly deploy magnum plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add tinygltfimporter feature

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum][magnum-plugins] Add features: trade and any*

Prepares upcoming move of those sublibraries and allows building --head
immediately.
For current release this only adds some unused cmake flags that will be
ignored.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add gl feature, cleanup dependencies, mark upcoming features

And sort features alphabetically.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Prepare renaming of static flag for --head installs

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add two missing feature dependencies

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Enable magnum[any*] features by default

Signed-off-by: Squareys <squareys@googlemail.com>
2018-04-18 19:33:12 -07:00
Jonathan Hale
0822a28059 [corrade,magnum,-plugins,-extras,-integration] Update to latest and support feature packages (#2687)
[corrade,magnum,-plugins,-extras,-integration] Update to latest and support feature packages
2018-02-16 21:25:30 -08:00
Joel Clay
0e6e2c9658 Update magnum, magnum-plugins and corrade to latest 2018-01-10 20:47:42 -05:00
Alexander Karatarakis
cb239b92c0 Fix several port hashes due to github tar.gz change
It looks like github changed the version (or the generally the way)
they do tars, causing some hash mismatches. This fixes the affected
ports.
2017-09-12 13:32:26 -07:00
Alexander Karatarakis
26516fe485 vcpkg_configure_cmake (and _meson) now embed debug symbols within static libs (/Z7) 2017-09-09 00:12:54 -07:00
sigman
bffa100a43 [magnum][magnum-plugins] Fixed plugins location, static plugins build
Static libray linkage should work now, including plugins.
2017-06-22 13:30:08 +03:00
sigman
7b9275f1b3 [corrade][magnum][magnum-plugins] Updated to upstream, enabled more features in [magnum]
Removed plugin location defines. Fixed tools search path in FindCorrade, FindMagnum cmake modules.
2017-06-15 21:48:51 +03:00
sigman
27db5c14bb [magnum-plugins] Patch for missing include
vs2017 regression
2017-06-10 17:48:40 +03:00
Robert Schumacher
8cbadbffdc [corrade][magnum-plugins][magnum] Use vcpkg_from_github() 2017-06-09 20:38:25 -07:00
sigman
1b76105200 [Magnum-plugins] Import plugins for the magnum opengl library
Added magnum-plugins library with the reasonable defaults and minimal dependencies .
2017-06-09 15:17:01 +03:00