44 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
Phoebe
0b4db02b9b
[assimp] Fix cmake config name and add cmake version (#14554)
* [assimp] Fix cmake cofig name and add cmake version

* [ogre] Update 'Assimp' to 'assimp
2020-11-16 10:28:39 -08:00
Alexander Neumann
aa0ffba768
[qt5] Update to 5.15.1 (#13477)
* update everything. Let ci test if just updating is enough

* fix some minor version details.

* remove upstream patch

* add zstdd patch and do not remove zlib since it is required for bootstrapping

* add mqtt hash

* webengine hash

* add fixup pkgconfig to assimp

* add assimp to qt-3d (still requires zlib fix)

* setup pkg-config for qt

* fix psql detection in configure

* fix build details

* fix assimp library nameing

* -rpath option is not available for static builds

* move config log somewhere where CI can catch it.

* move logs only if they exists

* append bzip2 qt-3d

* break qt3d again to get logs

* retry qt3d

* remove qt-3d failure. everything ok now

* add assistent patch for qt5-tools not building qthelp

* remove unnecessary qt5-webengine patches

* Remove PSQL_TYPES

* [qt5-3d] remove irrxml as a assimp dep

* remove unnecessary patch

* fix qt-3d on windows

* fix qt5-3d linux

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-10-17 02:10:11 -07:00
Jack·Boos·Yu
fa5477d723
[assimp] Fix missing find dependency utfcpp (#14061) 2020-10-15 12:35:50 -07:00
Jack·Boos·Yu
cebe051841
[utfcpp] Use vcpkg_*_cmake and add features (#13521) 2020-10-13 14:46:28 -07:00
ras0219
501e44e02c
[qt5-location] Rename vendored libs to avoid conflicts (#13451)
* [qt5-location] Rename vendored libs to avoid conflicts

* [qt5-location] Use upstream patch

* [qt5-location] Replace / in patch url with %2F

* Update ports/qt5-location/CONTROL

* [assimp][irrxml] Remove outdated version of irrxml; redirect assimp at newer irrlicht

* [assimp] Apply skipped patch irrlicht.patch

Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-09-26 05:10:38 -07:00
ras0219
f6df03b4a8
[assimp][irrxml][kubazip][poly2tri][polyclipping] Extract vendored dependencies (#13264)
* [assimp] Fix -config.cmake files

* [assimp] Fix linux build and provide backwards-compatible alias

* [assimp][irrxml][kubazip][poly2tri][polyclipping] Extract vendored dependencies

* [assimp] Use find_dependency(); add ZLIB dependency

* [polyclipping] Do not suffix upstream binaries

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
2020-09-09 20:40:15 -07:00
Robert Schumacher
08c951fef9
[many ports] Upgrades to 2020.02.08 (#9986)
* [many ports] Upgrades to 2020.02.08

* Undo asio asmjit libimobiledevice mlpack mongo-c-driver oniguruma openmvg openvdb pcl

* Update ci baseline file

Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2020-02-10 16:08:57 -08:00
Phoebe
73c3e33c4a [minizip assimp] export minizip cmake targets and fix minizip dependency in assimp (#9075)
* [minizip assimp] export minizip cmake targets and fix minizip dependency in assimp

* Update CMakeList.txt

* Update obsolete functions
2019-11-25 15:54:49 -08:00
Bradley Austin Davis
01ab11a6f5 [assimp] Fix cmake package config (#8665) 2019-10-18 14:08:24 -07:00
NancyLi1013
94b7f9a6a8 [assimp] Update the version (#8381) 2019-09-29 23:10:45 -07:00
NancyLi1013
39ae95f5a9 [assimp] Update the version to 5.0.0 (#8370) 2019-09-27 11:17:08 -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
João Maia
b03f62e0eb [assimp] Fix install assimp when passing --head (#6887)
Instead of using hardcoded `assimp-4.1` folder, check directories with pattern `assimp-*` and select the first one. This fixes `vcpkg install vcpkg --head`, since the latest version creates a folder named `assimp-5.0` instead.
2019-06-13 14:19:57 -07:00
JackBoosY
d605091f75 [assimp]Fix lrrXML library dependencies. (#6593)
* [assimp]Fix lrrXML library dependencies.

* [assimp]Use FindZLIB.cmake instead of setting the zlib path.

* [assimp]Delete useless path.

* [assimp]Reserve macros to enable irrlich dependencies in the future.
2019-06-01 00:11:06 -07:00
Stefano Sinigardi
5898891125 [openexr,openimageio,suitesparse,theia] updates for non-win32 (#6371)
* [openexr,openimageio,suitesparse,theia] updates for non-win32

* [theia] use only valid cmake symbols

* [suitesparse] Fix build

* [lapack] still not properly integrating with other ports

* [lapack] intercept cmake module calls and substitute them with our defs

* [suitesparse,clapack] fixes for proper integration

* [ceres,clapack] bump CONTROL

* [suitesparse] remove unnecessary defs

* [clapack] improve wrapper logic

* [WIN32] remove wrong symbol

* [clapack] fix wrapper integration

* [Accelerate] use best framework when available

* [clapack] separate config from wrapper

* [clapack] fix paths and filenames

* [mlpack,armadillo,clapack] improve library handling

* [mlpack] remove unnecessary cmake option

* [clp,coinutils,osi,liblemon] dependencies of openmvg, improve compatibility with non-win32

* [openmvg] fix for case-sensitive filesystems

* [clp,coinutils,osi] simplify CMakeLists removing many unnecessary steps

* [sophus] Force rebuild

* [theia] fixes for linux, part1

* [io2d] remove broken sintax

* [fontconfig] bump version to remove CI cached failure

* [theia] fixes for linux, part2

* [theia] remove unnecessary empty folders and comments from portfile

* [theia] use correct build type removing forced vars in cmakelists.txt

* [openmvg] add missing suitesparse target detection

* [sophus] fix Suitesparse dependency

* [sophus,openmvg] use suitesparse lowercase for module compatibility on case-sensitive filesystems

* [suitesparse] fixes for case-sensitive filesystems

* [openmvg] use correct Eigen3 name for case-sensitive filesystems

* [sophus] trigger rebuild

* [shogun] use modern vcpkg style

* [shogun] add missing cmake system processor symbol
2019-05-31 15:48:17 -07:00
Robert Schumacher
223d5d82ac
[many ports] Updates 2019.05.07 (#6338)
* [many ports] Updates 2019.05.07

* Undo assimp and gdcm2 changes since they caused regressions
2019-05-08 17:51:44 -07:00
Victor Romero
050e71d01d
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [alac,benchmark,capnproto] Fix  check_linkage call

* [fastlz] Fix SHA512

* [coroutine] Fix dynamic build

* [folly] Find double-conversion

* [gamma] Use vcpkg_from_github

* [librsync] Enable static builds

* [netcdf-cxx4] Fix SHA512

* [octomap] Fix static build

* [tidy-html5] Fix static build

* [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime

* [folly] Use ras0219's fix for link paths

* [octomap] Fix exported targets

* [uvatlas] Set tool download SHA512

* [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32

* [suitesparse] osx fix

* [gtkmm] Call vcpkg_check_linkage after including vcpkg functions

* [duktape] Resolve conflicts

* [duktape] FIxed typo in Python paths

* [wangle] Find zlib

* [openssl-uwp] Fix SHA512

* [glib] Allow static builds on non-Windows

* [suitesparse] Fix build on Windows

* [multiple ports] Bump CONTROL version

* [multiple ports] Fix description indent

* [directxtk] Fix CONTROL file

* [bde,duktape,qpid-proton] Build packages with python2 installed

* [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS

* [gdal,live555,uriparser] Fix regressions

* [live555] Update to 2019.04.24
2019-05-02 22:57:43 -07:00
markdegreef
2cb95c67a3 [assimp] fix linux build (#5632) 2019-03-13 11:56:39 -07:00
Lassi
45d21e1254 [assimp] added remove debug/share (#5323)
* added remove debug/share

* removed explicit OFF for framework option

* use VCPKG_LIBRARY_LINKAGE to define if using ASSIMP_BUILD_SHARED_LIBS
2019-02-19 12:37:18 -08:00
Robert Schumacher
ece1e7a67a [assimp] Requires rapidjson 2018-10-25 10:28:08 -07:00
Robert Schumacher
dbef253962 [assimp] Fix release/debug library issue. Fixes #4026. 2018-08-08 10:11:51 -07:00
Robert Schumacher
9491c60743 [assimp] Fixup: add missing patchfile 2017-12-21 03:46:39 -08:00
Robert Schumacher
ac32306cd2 [assimp] Fix unitialized variable issue. 2017-12-21 03:15:23 -08:00
Mark Garcia
621d9afe7b Upgrade assimp to v4.1.0 (#2364)
* [assimp] Update to v4.1.0 and remove code patch which is fixed in new version

* [assimp] Fix vcpkg_fixup_cmake_targets argument

* [assimp] Fix formatting
2017-12-13 03:38:33 -08:00
Vlad Kolesnikov
30f7421602 Adding OpenSSL support to FFMPEG, fixed Assmimp UWP build (#2018)
* Enable ffmpeg to build using openssl for HTTPS/TLS support

* [ffmpeg] Add contract versions to libpath

* Updated FFMPEG to 3.3.3; Fixed unistd.h issue in ffmpeg build

* merge fix

* merge fix

* fix merge

* removed extra files

* Assimp UWP build fix

* [assimp] Bump version

* [ffmpeg] Implement openssl support through features.

* [opencv] remove ffmpeg depenency

OpenCV has own prebuilt ffmpeg library

* Fix version, package name is not a part of it

* Add support build option to PCL port

Add support build options (pcap, qt) to PCL port.

* Update VTK to 8.0.1

Update VTK to 8.0.1.

* [vcpkg] Enable pkg[*] as alias for all features.

* Using CP_UTF8 macro instead of magic numbers.

* [vcpkg] Add optional Abi field to BinaryParagraph for future use.

* [double-conversion] Fix --head builds

* [vcpkg] --head should only apply to USER_REQUESTED packages.

* [vcpkg] Fix bug where packages with uninstalled features appear to be uninstalled.

* Update Catch to 1.11.0

* Fix proxy usage in Win7 (powershell 2.0)

* [findVSInstances] Data lines are now placed within <sol><eol> tags. Text outside these tags is ignored

This means we can print text in powershell now and it won't break vcpkg.

* [fetchDependency] Now also returns output in the form <sol>data<eol>

* [git] Update to 2.15.0 (was 2.14.3)

* [bootstrap-vcpkg] Added better diagnostics in case of MSBuild failure.

* [poco] build with MySQL support (#2088)

* [poco] build with MySQL support

Set proper variables to enable MySQL support if libmysql port is installed

* [poco] Move Mysql support to a feature. Enable CMake config files.

* help assimp find vcpkg's copy of zlib so it does not build its own

* [assimp] Bump revision

* [assimp] Fix assimp overwriting CMAKE_PREFIX_PATH.

* [boost] Handle spaces in vcpkg path.

* [vcpkg] Fix use of features in undocumented build command

* Update to v1.2.0. Remove man pages

* [opencv] Remove ffmpeg from dependencies -- it is not currently possible to use an external ffmpeg with opencv.

Add features for cuda and vtk.

* Enable OpenGL support for GUI

Enable OpenGL support for GUI.

* [protobuf] Add feature packages for zlib

ZLib based features like Gzip streams.

* [llvm] Require Python3

* [blaze] Fix remaining stray _INVALID_ROOT_

* Add option to enable Qt GUI support

Add option to enable Qt GUI support.

* Sorting CMake options for maintainability

Sorting CMake options based on grouped of CMake-GUI  for
maintainability.

* VTK: implement features (#2071)

* [vtk/portfile] add OpenVR option

* [vtk/control] add OpenVR feature

* [vtk/portfile] Add OpenVR feature to portfile

* [vtk/CONTROL] add features

* [vtk/portfile] implement features

* [vtk/CONTROL] fix syntax

* [vtk/CONTROL] fix case

* [vtk/portfile] fix case

* [vtk/CONTROL] fix syntax

* [vtk/CONTROL] fix syntax

* [vtk/portfile] fix module name

* [vtk] Bump version

* [uwebsockets] Remove boost from dependency list to follow upstream's official README

* [libharu] Fix DLLIMPORT macro replacement

* Update CHANGELOG and bump version to v0.0.95

* Fix date in CHANGELOG.md

* [apr] Update to 1.6.3

* Enable C++11 features

Enable C++11 features.

* Enable Microsoft Media Foundation support for Video I/O

Enable Microsoft Media Foundation support for Video I/O.

* [double-conversion] Fix regression introduced in vcpkg_fixup_cmake_targets.

* [vcpkg] Refactor argument parsing to use common code paths.

* [vcpkg] Improve `vcpkg help` -- now has per-command help!

* [vcpkg-help-export-ifw] Add settings description

* [opencv] Disable MSMF in UWP due to an upstream bug

* [vcpkg_download_distfile] Now downloads in a temp dir and rename to the target location

* [vcpkg_find_acquire_program] Use vcpkg_download_distfile()

* Remove vcpkg_acquire_depot_tools

* [downloads] Don't show progress by default

* [vcpkg_acquire_msys] Use vcpkg_download_distfile()

* vcpkg_from_github] Use vcpkg_download_distfile()

* [vcpkg_from_bitbucket] Use vcpkg_download_distfile()

* [ports.cmake] Use vcpkg_download_distfile()

* [antlr] upgrade to antlr4.7

* [antlr4] bump version to 4.7

* Use download-at-temp-and-rename pattern in powershell too

* Print error message when there is a syntax error in triplet file

As it is now vcpkg fails silently (actually, it outputs two empty lines).

* [fdk-aac] init

* [fetchDependendy.ps1] Remove obsolete comment

* [fetchDependency.ps1] Improve error message on hash mismatch

* [vswhere] Update to 2.2.11 (was 2.2.7)

* libaiff

* Append W

* [libaiff] fix uninitialized buffer

* Add the flint2 library (#1988)

* Add the "flint2" library.

* FIX: update library name

* FIX: only set MSVC version to VC14

* FIX: use static linkage

* DOC: display notification to the user

* [flint/CONTROL] add gettimeofday dependency

* [flint/portfile] move up linkage

* [flint/portfile] attempt to override the CRT linkage

* Add arblib (#1991)

* Fix rename libraries of FLANN

Fix rename libraries of FLANN.

* Fix line endings

* [cmake] Update to 3.9.5 (was 3.9.4)

* Porting ITK

* Sourcing from GitHub, using a master version with vcpkg patch

* Update CHANGELOG and bump version to v0.0.96

* [fftw] update to 3.3.7

* [dlib] update to 19.7 and use vcpkg_from_github

* fix issue 2111

* Revert "Updated libsigcpp to version 2.99.9"

This reverts commit 079ef9785ad539e1484f876577913a7269021288.

* Added glibmm and giomm.

* Added atkmm.

* Added pangomm.

* Added gtkmm

* Use unicode

* [glibmm] Add missing dependency: libsigcpp
2017-11-04 14:54:12 -07:00
Robert Schumacher
0a4b09d9c5 [assimp] Fix assimp overwriting CMAKE_PREFIX_PATH. 2017-11-01 01:56:06 -07:00
Alexander Karatarakis
7435624eec [assimp] Bump revision 2017-11-01 01:47:53 -07:00
Jim McGrath
e663b69a1d help assimp find vcpkg's copy of zlib so it does not build its own 2017-11-01 01:46:57 -07:00
kypp
bef18205d7 [assimp] update to version 4.0.1 2017-10-18 09:39:38 +02:00
kypp
71d516b6dd [assimp] fix static linkage 2017-10-18 09:39:08 +02: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
Robert Schumacher
a3e607c8f1 [assimp] Fix non-const-accepting WordIterator::operator!= 2017-08-24 02:55:25 -07:00
jasjuang
4c7f0d0c59 upgrade assimp to 4.0.0, fix cmake error for down stream project 2017-07-19 18:12:19 -07:00
Alexander Karatarakis
e8b46b89d0 [assimp] Extract variable SOURCE_PATH 2016-12-07 15:19:16 -08:00
Alexander Karatarakis
1808d461b0 triplet is now automatically included before portfiles.
Also remove trailing whitespaces from portfiles
2016-11-08 14:25:47 -08:00
Alexander Karatarakis
71594b6bef Remove portfile branching of vcpkg_copy_pdbs() 2016-10-31 12:34:04 -07:00
Alexander Karatarakis
9142d7d0bf [assimp] Only vcpkg_copy_pdbs() in dynamic build 2016-10-26 12:03:27 -07:00
Alexander Karatarakis
3ead5123f7 Merge pull request #168 from barcharcraz/assimp
make assimp copy pdb files
2016-10-17 12:30:59 -07:00
Charles Barto
be03c5dd4e modified assimp portfile 2016-10-16 18:49:12 -04:00
Robert Schumacher
b1fe038a83 Remove use of vcpkg_build_cmake() across all portfiles. Fixes #123 2016-10-06 15:29:37 -07:00
charlie barto
5979d83b5b fixed version 2016-10-05 19:01:15 -04:00
charlie barto
529b3f82f8 added assimp 2016-10-05 19:00:17 -04:00