Commit Graph

21 Commits

Author SHA1 Message Date
Chuck Walbourn
5d2a0a9814
Update xbox supports expressions for failing ports with copyleft licenses ()
* Xbox triplets should not support ports with only copyleft licenses

* Reverted ports that build with xbox currently

* Fix conflict and rebase

* Update baseline

* Update baseline
2023-06-15 14:49:00 -07:00
Yury Bura
eb11dbb245
[libxml2] add more features ()
* [libxml2] move hardcoded external dependencies (iconv, lzma, zlib) to features, disable legacy flag by default

* add version

* [libxml2] add ftp and http options

* overwrite version

* [libxml2] restore formatting, remove ftp from defaults

* overwrite version

* [libxml2] remove hhtp from default-features

* overwrite version

* [libxml2] add network future dependent on platform

* [libspatialite][pdal][spatialite-tools] define libxml2[http] dependency explicitly

* update versions

* [libspatialite] update version

* add version

* Revert "[libxml2] add network future dependent on platform"

* overwrite version
2023-03-22 16:20:43 -07:00
Kai Pastor
3e35cb0a15
[scripts|nmake] Add jom option, add language control ()
* Add CL_LANGUAGE option

* Add PREFER_JOM option

* Append install target to targets, not options

* Update vcpkg_install_nmake

* Re-enable nmake UWP builds for C projects

* Use PREFER_JOM

* Update documentation

* Update versions

* Add license fields

* Update versions
2022-11-02 11:32:43 -07:00
Kai Pastor
a4f322c567
[proj4] Update to 8.1.1, revise features and dependencies ()
* Update to 8.1.1, cleanup patches

* Patch and use pc file installation from upstream

* Simplify dependency fixup

* Remove obsolete VCPKG_BUILD_SHARED_LIBS

* Revise feature and dependency interface

* Update versions

* Use all libs from proj.pc for gdal

* Set CMP0012 for dependency control

* Update versions

* Update versions

* Fix missing user32.lib when using libcrypto

* Update versions

* Fix missing user32.lib when using libcrypto

* Update versions
2021-12-09 18:18:18 -08:00
Kai Pastor
4c9b301c9e
[spatialite-tools] Revise and update to 5.0.1 ()
* Revise portfile and patch

* Install pc file for windows

* Update versions

* Remove readosm failure from CI baseline

* Revise dependencies based on #include, use pkgconfig

* Revise portfile

* Update to 5.0.1

* Update versions

* Fix release-only nmake build

* Update versions
2021-12-06 17:58:47 -08:00
Kai Pastor
94b2a07762
[libspatialite] Use pkgconfig for nmake and autotools ()
* Enable CI for libspatialite:x64-windows-static-md

* Use pkgconfig for nmake

* Use pkgconfig for autotools; fix mingw

* Install pc file for windows

* Add feature interface, make GPLv2+ features optional

* spatialite-tools need libspatialite[rttopo]

* Update versions
2021-11-18 21:36:42 -08:00
Billy O'Neal
b295670e4b
Bulk convert control files. ()
```
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
Ilya Arzhannikov
f754353b74
Spatialite-tools remove cflags from vcpkg_configure_make options ()
* remove CFLAGS from options

* x-add-version spatialite-tools

Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com>
2021-04-07 13:08:42 -07:00
Long Huan
4ed2cfd1a3
[vcpkg baseline][spatialite-tools] fix linux osx build falied ()
* fix linux osx build falied

* Update ci.baseline.txt

* update baseline

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-01-19 21:40:57 -08:00
Long Huan
8fda0d2956
[spatialite-tools]update to 5.0.0 () 2020-12-22 23:21:14 -08:00
Long Huan
05e79e9377
[libspatialite] Update 5.0.0 ()
* update to 5.0.0

* update

* update

* fix static build failed

* remove fix-latin-literals.patch

* Update portfile.cmake
2020-12-21 08:56:24 -08:00
Long Huan
629acdf9d1
[Proj4] Update to 7.2.0 ()
* update proj4 to 7.2.0

* fix cmake find

* add tiff,curl feature

* fix depends

* Update fix-proj4-targets-cmake.patch

* fix

* remove tiff and curl when static build

* fix windows static build error

* Update ports/proj4/portfile.cmake

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

* change port version

* use find_dependency instead of find_package

* Update fix-proj4-targets-cmake.patch

* Update fix-proj4-targets-cmake.patch

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-12-01 13:59:39 -08:00
Alexander Neumann
3a26eb3dc4
[intl/gettext/fontconfig] update to native build system ()
* [fontconfig] update fontconfig

* [libiconv] update to make

* [gettext] update to make

* [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig

* [fontconfig] make it work on windows

* Remove install of unofficial cmake config

* add function get_cmake_vars

* fine tuning.

* apply to make based ports.

* add log suffix on not windows platforms

* fix c&p error

* add previous LINK env

* setup env on windows and extract cpp flags correctly.

* update glib and libxml2

* fix windows regressions

* Apply suggestions from code review

* add windres wrapper to invoke RC.

* remove wrong fi

* fix libintl.

* try fixing uwp

* other things to update

* exiv2 fix

* libtool does not like -RTC1

* pass the /RTC<x> flag directly to the compiler

* trust cmake instead of adding extra flags

* fix expat

* fix iconv wrapper install

* change fontconfig intl linkage.

* add appcontainer back in which is required for UWP. Why is this not in the cmake flags?

* fix pkg-config in vcpkg_configure_make

* fix json-c pkg-config installation

* remove remnoved config

* comment out debug messages + bit of tuning

* finally fontconfig

* comment debug messages

* expat apply extra patches.

* Switch back to -E instead of -EP in cpp

* commit changes from fontconfig PR

* [expat] fix expat details

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* cleanup docs

* update osx pipeline so that fontconfig actually builds

* fix expat the lazy way by using a higher commit than release

* fix a barage of regressions due to the use of unofficial targets

* [expat] use a higher commit hash with a better stabilized cmake build

* forgot freexl regression

* more unofficial fixes

* fix downstream expat usage

* fix wxwidgets

* fix gcdm regression

* [vtk] fix the regression due to expat

* add uwp cl flags back in. Somehow those are not set by cmake

* add a few other configure options for full gettext build

* fix cmake regression

* fix a few regressions

* fix static gettext build

* fix gettext static

* fix libxml2 wrapper for cmake

* some more regressions fixes

* add conversion from somelib.lib to -lsomelib

* add a few option to libiconv.

* get logs from CI

* add missing ar-lib wrapper

* add missing ar-lib wrapper

* add fatal error to gettext

* remove uuid from the list of LIBS since it seems to not exist in CI?

* small but important regex correction

* fix regex and add debug message for libs

* remove error and only build libintl.

* add uuid dependency to fontconfig in qt5-base

* osx install gettext for autopoint

* fix io2d regression by saying the port is broken .....
(which it is; upstream needs to learn proper cmake)

* restore the old libxml2 wrapper with minor modifications

* fix xmlsec regression

* install wrapper correctly

* try actual fixing io2d

* improve iconv wrapper

* add latest changes from update_fontconfig PR

* Apply suggestions from code review

first set which don't need special attention

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply suggestions from code review

one more simple change

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* [x264] set env AS

* fix bugs due to refactor

* use subpath everywhere

* apply changes from CR

* fix fontconfig build.

* only change libs in static builds

* remove unnecessary lines 41 & 44

* remove flag transformation

* reintroduce the flag / to - transformation for MSVC

* trying to figure out autopoint issue.
using wrong (windows) find.exe instead of msys

* add correct working_dir to subpath

* escape stupid env paths.

* fix typo

* add findutils
remove debug messages

* add error if libtool chokes

* add file to msys

* pass lt_cv_deplibs_check_method=pass_all on windows
(couldn't get file.exe to work so that libtool correctly ids the passed libs)

* add bzip2 to msys

* reenable libtool check. Lets see if CI agrees

* unbreak linux
try to figure out where uuid should be on windows.

* add -L flag and help libtool ?

* try to get ci to find uuid.

* try to use cygpath

* update controls

* cleanup merge mistakes

* correct merge issues

* determine cmake vars if not done before.

* move adding of -l earlier

* more merge cleanup

* fix uwp builds by not transforming libs

* fix patches in io2d

* fix xz download error

* apply code review changes manually

* fix the typos left behind in CR

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
2020-11-17 09:18:59 -08:00
Oskari Timperi
b5f00aefc9
[geos] Update to 3.8.1 () 2020-08-31 17:45:58 -07:00
NancyLi1013
d6285bc24b
[expat] Update the version to 2.2.9 (add support for uwp) ()
* [expat] Update the version to 2.2.9(support uwp)

* [readosm] Fix expat.lib cannot be found

* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt

* [apr-util,io2d,skia] Fix expat cannot be found and also update expat

* [many ports] Add supports and fix the regressions

* Fix new regressions

* Fix typo

* [io2d] Update expat patch

* [io2d,libkml,skia] Fix expat cannot find and also fix typo

* [expat] Remove usage

* [libkml,vtk] Update expat patch and fix static build

* [wxwidgets] Fix static build caused by expat cannot found

* Update as review suggestion

* Add Port-Version

* Remove evpp:x64-osx=fail from ci.baseline.txt

* [wxwidgest] Remove unnecessary spaces

* [itk] Fix expat cannot be found

* fix cmake test port

* [wxwidgets] Update Port-Version

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-08-17 08:33:44 -07:00
JackBoosY
75dd38cd8a [proj4] Upgrade version to 6.1.1 and remove patches. ()
* [proj4]Upgrade version to 6.1.1 and remove useless patches.

* [libgeotiff]Fix build errors using proj4 6.1.1.

* [libspatialite]Fix build errors using proj4 6.1.1.

* [gdal]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [spatialite-tools]Fix build errors using proj4 6.1.1.

* [libgeotiff]Re-fix build errors using proj4 6.1.1.

* [vtk]Fix build errors using proj4 6.1.1.

* [proj4]Fix find sqlite binary failure.

* [proj4]Disable build tools when building proj4 in arm/uwp.

* [sqlite3/libgeotiff]Fix libdl library linkage. Re-fix use proj issue.

* add back dl libs

* [gdal]Fix dependent port proj library name.

* [proj4]Set Windows library name to "proj" and revert fix-proj-name changes.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [liblas]Fix build errors using proj4 6.1.1.

* [proj4]Fix feature database on triplet arm/uwp.

* [gdal]Remove useless flag PROJ_STATIC.

* [proj4]Fix build error on x64-windows-static.

* [liblas]Use find_library to get proj4/sqlite3 libraries.

* [proj4]Fix sqlite dependency.

* [proj4]Fix arm/uwp dependency.

* [proj4]Fix linux build: configure error.

* [proj4]Disable export proj4 namespace.

* [liblas]Delete proj dependency.

* [libspatialite]Fix linux build.

* [libspatialite]Fix linux command.

* [libspatialite]Fix configure error.

* [proj4]fix static cmake tools path.

* [libgeotiff]Set configure options to 1/0 to avoid the "if" comparison failure in config.cmake.
[proj4]Revert changes about namespace.
[liblas]Remove FindPROJ4.cmake and FindGeoTIFF.cmake from the source.

* [vtk]Fix using latest proj4 issue.

* [proj4]Delete missing patch.
2019-10-17 17:15:52 -07:00
Stefano Sinigardi
726c111481 [vcpkg] fatal_error when patch fails to apply ()
vcpkg will now fail on failure to apply patches except when using `--head`.
2019-10-07 10:35:13 -07:00
pravic
18b029a5e3 [WIP] Add a Homepage URL entry for vcpkg ports ()
* [vcpkg] Add "Homepage" field to the CONTROL files.
2019-06-15 16:54:47 -07:00
Mateusz Loskot
793019b9cd [GEOS] Generate debug library names with d suffix ()
* [GEOS] Generate debug library names with `d` suffix

Currently geos.lib name is used for both, debug and optimised
GEOS libraries. This leads to situation when:
```
find_library(GEOS_LIBRARY_DEBUG NAMES geos)
find_library(GEOS_LIBRARY_RELEASE NAMES geos)
```

finds the same library for both
```
GEOS_LIBRARY_DEBUG=D:/vcpkg/installed/x64-windows/debug/lib/geos.lib
GEOS_LIBRARY_RELEASE=D:/vcpkg/installed/x64-windows/debug/lib/geos.lib
```

This is minimal patch that works around the problem.

Next, complete fix should be submitted to GEOS upstream,
preferably using exported targets.

* [libspatialite] Add missing geos suffixes in static builds
2018-05-01 01:14:18 -07:00
Hiroshi Miura
caff8094f7 [spatialite-tools] fix download url
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2018-02-25 10:21:13 +09:00
alex85k
c6ac9bd7f0 [spatialite-tools] initial port (spatialite.exe and other tools) 2017-10-04 20:38:57 +05:00