From cf696f92e1e8e16057cc8cfcce6f5d809e608663 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 1 Feb 2021 15:33:03 +0100 Subject: [PATCH 01/58] add a single config community triplet based on x64-windows --- scripts/azure-pipelines/azure-pipelines.yml | 6 ++++++ scripts/azure-pipelines/test-modified-ports.ps1 | 2 +- triplets/community/x64-windows-release.cmake | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 triplets/community/x64-windows-release.cmake diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 7fce6a5c19e115..6f2b8e7f73a1a0 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -76,6 +76,12 @@ stages: jobName: x64_windows_static_md poolName: $(windows-pool) + - template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-release + jobName: x64_windows_release + poolName: $(windows-pool) + - template: windows/azure-pipelines.yml parameters: triplet: x64-uwp diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 9ca814cca92366..b441f4e6055400 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -140,7 +140,7 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` # Install them so the CI succeeds: if ($Triplet -in @('x64-uwp', 'arm64-windows', 'arm-uwp')) { .\vcpkg.exe install protobuf:x86-windows boost-build:x86-windows sqlite3:x86-windows yasm-tool:x86-windows ampl-mp:x86-windows @commonArgs -} elseif ($Triplet -in @('x64-windows', 'x64-windows-static', 'x64-windows-static-md')) { +} elseif ($Triplet -in @('x64-windows', 'x64-windows-static', 'x64-windows-static-md', 'x64-windows-release')) { .\vcpkg.exe install yasm-tool:x86-windows @commonArgs } diff --git a/triplets/community/x64-windows-release.cmake b/triplets/community/x64-windows-release.cmake new file mode 100644 index 00000000000000..f6c40253a080c7 --- /dev/null +++ b/triplets/community/x64-windows-release.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) +set(VCPKG_BUILD_TYPE release) From 5f27a5b748ef1dc66463560062245fdc229b2c46 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 1 Feb 2021 15:51:07 +0100 Subject: [PATCH 02/58] add a failed port, otherwise mechanism does not support empty list --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7a2d1b00b21969..4f40ff53101f89 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -24,6 +24,7 @@ ## x64-windows ## x64-windows-static ## x64-windows-static-md +## x64-windows-release ## x86-windows ## @@ -1770,3 +1771,5 @@ unicorn:x64-windows-static-md=fail v8:x64-windows-static-md=fail yato:x64-windows-static-md=fail zyre:x64-windows-static-md=fail + +harfbuzz:x64-windows-release=fail From 4cc30670e5dfc3444aff9d1e943a2a2447118e2e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 2 Feb 2021 10:53:28 +0100 Subject: [PATCH 03/58] add failures to baseline --- scripts/ci.baseline.txt | 133 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4f40ff53101f89..11796f5a2072ab 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -73,6 +73,7 @@ catch-classic:x64-uwp = skip catch-classic:x64-windows = skip catch-classic:x64-windows-static = skip catch-classic:x64-windows-static-md=skip +catch-classic:x64-windows-release=skip catch-classic:x86-windows = skip ccd:arm-uwp=fail ccd:x64-uwp=fail @@ -91,6 +92,7 @@ charls:x64-uwp=skip charls:x64-windows=skip charls:x64-windows-static=skip charls:x64-windows-static-md=skip +charls:x64-windows-release=skip charls:x86-windows=skip chartdir:arm64-windows=fail chartdir:arm-uwp=fail @@ -118,6 +120,7 @@ cmcstl2:x64-uwp = skip cmcstl2:x64-windows = skip cmcstl2:x64-windows-static = skip cmcstl2:x64-windows-static-md=skip +cmcstl2:x64-windows-release=skip cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail @@ -172,6 +175,7 @@ dbghelp:x64-osx=fail dbghelp:x64-uwp=skip dbghelp:x64-windows-static=skip dbghelp:x64-windows-static-md=skip +dbghelp:x64-windows-release=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip dcmtk:arm-uwp=fail @@ -216,6 +220,7 @@ duckx:x64-uwp = skip duckx:x64-windows = skip duckx:x64-windows-static = skip duckx:x64-windows-static-md=skip +duckx:x64-windows-release=skip duckx:x86-windows = skip duilib:arm-uwp=fail duilib:x64-linux=fail @@ -250,6 +255,7 @@ ecm:x64-uwp = skip ecm:x64-windows = skip ecm:x64-windows-static = skip ecm:x64-windows-static-md=skip +ecm:x64-windows-release=skip ecm:x86-windows = skip ecsutil:arm64-windows=fail ecsutil:arm-uwp=fail @@ -310,6 +316,7 @@ fluidlite:x64-osx=skip fluidlite:x64-uwp=skip fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip +fluidlite:x64-windows-release=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip fmem:arm-uwp=fail @@ -358,6 +365,7 @@ geos:x64-uwp=fail # extremely slow may take several hours to download geotrans:x64-linux = skip geotrans:x64-windows = skip +geotrans:x64-windows-release = skip geotrans:x86-windows = skip getopt:arm-uwp=fail getopt:x64-uwp=fail @@ -379,6 +387,7 @@ gherkin-c:x64-uwp = skip gherkin-c:x64-windows = skip gherkin-c:x64-windows-static = skip gherkin-c:x64-windows-static-md=skip +gherkin-c:x64-windows-release=skip gherkin-c:x86-windows = skip gl3w:arm64-windows=fail gl3w:arm-uwp=fail @@ -463,6 +472,8 @@ ijg-libjpeg:x64-osx = skip ijg-libjpeg:x64-uwp = skip ijg-libjpeg:x64-windows = skip ijg-libjpeg:x64-windows-static = skip +ijg-libjpeg:x64-windows-static-md=skip +ijg-libjpeg:x64-windows-release=skip ijg-libjpeg:x86-windows = skip intel-ipsec:arm64-windows=fail intel-ipsec:arm-uwp=fail @@ -639,6 +650,7 @@ libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip +libmariadb:x64-windows-release=skip libmariadb:x86-windows = skip # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) libmesh:arm64-windows=skip @@ -647,6 +659,7 @@ libmesh:x64-uwp=skip libmesh:x64-windows=skip libmesh:x64-windows-static=skip libmesh:x64-windows-static-md=skip +libmesh:x64-windows-release=skip libmesh:x86-windows=skip libmesh:x64-osx=skip libmesh:x64-linux=skip @@ -694,6 +707,7 @@ libpng-apng:x64-uwp = skip libpng-apng:x64-windows = skip libpng-apng:x64-windows-static = skip libpng-apng:x64-windows-static-md=skip +libpng-apng:x64-windows-release=skip libpng-apng:x86-windows = skip libpq:arm-uwp=fail libpq:x64-uwp=fail @@ -702,6 +716,7 @@ libqcow:arm-uwp=skip libqcow:x64-uwp=skip libqcow:x64-windows-static=skip libqcow:x64-windows-static-md=skip +libqcow:x64-windows-release=skip libqcow:x64-osx=skip libqcow:x64-windows=skip libqcow:x64-linux=skip @@ -718,6 +733,7 @@ boringssl:x64-uwp = skip boringssl:x64-windows = skip boringssl:x64-windows-static = skip boringssl:x64-windows-static-md=skip +boringssl:x64-windows-release=skip boringssl:x86-windows = skip libressl:arm64-windows = skip libressl:arm-uwp = skip @@ -727,6 +743,7 @@ libressl:x64-uwp = skip libressl:x64-windows = skip libressl:x64-windows-static = skip libressl:x64-windows-static-md=skip +libressl:x64-windows-release=skip libressl:x86-windows = skip libsamplerate:x64-osx=fail libsoundio:arm64-windows=fail @@ -788,6 +805,7 @@ libvmdk:x86-windows=skip libvmdk:x64-windows=skip libvmdk:x64-windows-static=skip libvmdk:x64-windows-static-md=skip +libvmdk:x64-windows-release=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip @@ -836,6 +854,7 @@ luajit:x64-uwp = skip luajit:x64-windows = skip luajit:x64-windows-static = skip luajit:x64-windows-static-md=skip +luajit:x64-windows-release=skip luajit:x86-windows = skip luasocket:x64-linux=fail luasocket:x64-osx=fail @@ -866,6 +885,7 @@ mecab:x64-uwp = skip mecab:x64-windows = skip mecab:x64-windows-static = skip mecab:x64-windows-static-md=skip +mecab:x64-windows-release=skip mecab:x86-windows = skip memorymodule:arm-uwp=fail memorymodule:x64-linux=fail @@ -915,6 +935,7 @@ microsoft-signalr:x64-uwp=skip microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip microsoft-signalr:x64-windows-static-md=skip +microsoft-signalr:x64-windows-release=skip microsoft-signalr:x86-windows=skip mman:x64-linux=fail mman:x64-osx=fail @@ -929,6 +950,7 @@ mmloader:x86-windows=fail mmx:x64-windows=skip mmx:x64-windows-static=skip mmx:x64-windows-static-md=skip +mmx:x64-windows-release=skip mmx:x86-windows=skip mmx:x64-linux=skip mmx:x64-osx=skip @@ -961,6 +983,7 @@ mozjpeg:x64-uwp = skip mozjpeg:x64-windows = skip mozjpeg:x64-windows-static = skip mozjpeg:x64-windows-static-md=skip +mozjpeg:x64-windows-release=skip mozjpeg:x86-windows = skip # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 @@ -968,6 +991,7 @@ mpir:x86-windows=skip mpir:x64-windows=skip mpir:x64-windows-static=skip mpir:x64-windows-static-md=skip +mpir:x64-windows-release=skip mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip @@ -1010,6 +1034,7 @@ nethost:arm-uwp=fail nettle:x64-windows-static=skip nettle:x64-windows-static-md=skip nettle:x64-windows=skip +nettle:x64-windows-release=skip ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail @@ -1046,6 +1071,7 @@ ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip ogdf:x64-windows-static-md=skip +ogdf:x64-windows-release=skip ogdf:x86-windows = skip ogre:x64-osx=fail # Conflicts with ogre @@ -1057,6 +1083,7 @@ ogre-next:x64-uwp = skip ogre-next:x64-windows = skip ogre-next:x64-windows-static = skip ogre-next:x64-windows-static-md=skip +ogre-next:x64-windows-release=skip ogre-next:x86-windows = skip ois:arm64-windows=fail ois:arm-uwp=fail @@ -1100,6 +1127,7 @@ opencv2:x64-uwp = skip opencv2:x64-windows = skip opencv2:x64-windows-static = skip opencv2:x64-windows-static-md=skip +opencv2:x64-windows-release=skip opencv2:x86-windows = skip opencv3:arm64-windows = skip opencv3:arm-uwp = skip @@ -1109,6 +1137,7 @@ opencv3:x64-uwp = skip opencv3:x64-windows = skip opencv3:x64-windows-static = skip opencv3:x64-windows-static-md=skip +opencv3:x64-windows-release=skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail @@ -1165,6 +1194,7 @@ optional-bare:x64-uwp = skip optional-bare:x64-windows = skip optional-bare:x64-windows-static = skip optional-bare:x64-windows-static-md=skip +optional-bare:x64-windows-release=skip optional-bare:x86-windows = skip opusfile:arm-uwp=fail opusfile:x64-uwp=fail @@ -1266,6 +1296,7 @@ qt5-canvas3d:x64-osx=skip qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip +qt5-canvas3d:x64-windows-release=skip qt5-canvas3d:x86-windows=skip qt5-macextras:x64-linux=fail qt5-macextras:x64-windows=fail @@ -1289,6 +1320,7 @@ qt5-webengine:x64-osx=fail # fatal error C1189: #error: This file was generated by an older version of protoc which is # Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg. qt5-webengine:x64-windows=skip +qt5-webengine:x64-windows-release=skip qt5-webengine:x86-windows=skip # Static builds of qt5-webengine are not supported by the port itself qt5-webengine:x64-windows-static=skip @@ -1319,6 +1351,7 @@ range-v3-vs2015:x64-uwp = skip range-v3-vs2015:x64-windows = skip range-v3-vs2015:x64-windows-static = skip range-v3-vs2015:x64-windows-static-md=skip +range-v3-vs2015:x64-windows-release=skip range-v3-vs2015:x86-windows = skip rapidstring:arm64-windows=fail rapidstring:arm-uwp=fail @@ -1351,6 +1384,7 @@ rest-rpc:x86-windows=skip rest-rpc:x64-windows=skip rest-rpc:x64-windows-static=skip rest-rpc:x64-windows-static-md=skip +rest-rpc:x64-windows-release=skip rest-rpc:x64-uwp=skip rest-rpc:arm-uwp=skip rest-rpc:arm64-windows=skip @@ -1439,6 +1473,7 @@ shogun:x64-uwp = skip shogun:x64-windows = skip shogun:x64-windows-static = skip shogun:x64-windows-static-md=skip +shogun:x64-windows-release=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail @@ -1466,6 +1501,7 @@ soil:x64-windows=skip soil:x86-windows=skip soil:x64-windows-static=skip soil:x64-windows-static-md=skip +soil:x64-windows-release=skip soil:x64-linux=skip soil:x64-osx=skip soil2:arm-uwp=fail @@ -1540,6 +1576,7 @@ theia:x64-uwp = skip theia:x64-windows = skip theia:x64-windows-static = skip theia:x64-windows-static-md=skip +theia:x64-windows-release=skip theia:x86-windows = skip thor:x64-linux=fail thor:x64-osx=fail @@ -1629,6 +1666,7 @@ vxl:x64-uwp = skip vxl:x64-windows = skip vxl:x64-windows-static = skip vxl:x64-windows-static-md=skip +vxl:x64-windows-release=skip vxl:x86-windows = skip wampcc:arm64-windows=fail wildmidi:x64-osx=fail @@ -1642,6 +1680,7 @@ winpcap:x64-uwp = skip winpcap:x64-windows = skip winpcap:x64-windows-static = skip winpcap:x64-windows-static-md=skip +winpcap:x64-windows-release=skip winpcap:x86-windows = skip winreg:x64-linux=fail winreg:x64-osx=fail @@ -1684,6 +1723,7 @@ xmsh:x64-osx=skip xmsh:x64-uwp=skip xmsh:x64-windows-static=skip xmsh:x64-windows-static-md=skip +xmsh:x64-windows-release=skip xmsh:x64-windows=skip xmsh:x86-windows=skip yajl:arm-uwp=fail @@ -1725,6 +1765,7 @@ ctp:x64-uwp=skip ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x64-windows-static-md=skip +ctp:x64-windows-release=skip ctp:x86-windows=skip protozero:arm-uwp=fail protozero:x64-uwp=fail @@ -1734,6 +1775,7 @@ clapack:x64-linux=skip clapack:x64-osx=skip clapack:x64-windows-static=skip clapack:x64-windows-static-md=skip +clapack:x64-windows-release=skip clapack:x64-windows=skip clapack:x86-windows=skip clapack:x64-uwp=skip @@ -1772,4 +1814,93 @@ v8:x64-windows-static-md=fail yato:x64-windows-static-md=fail zyre:x64-windows-static-md=fail -harfbuzz:x64-windows-release=fail +v8:x64-windows-release=fail +libmodplug:x64-windows-release=fail +isal:x64-windows-release=fail +azure-kinect-sensor-sdk:x64-windows-release=fail +fluidsynth:x64-windows-release=fail +libodb:x64-windows-release=fail +mdnsresponder:x64-windows-release=fail +readosm:x64-windows-release=fail +gsoap:x64-windows-release=fail +libepoxy:x64-windows-release=fail +portmidi:x64-windows-release=fail +dlfcn-win32:x64-windows-release=fail +unicorn:x64-windows-release=fail +libfreenect2:x64-windows-release=fail +fribidi:x64-windows-release=fail +pfring:x64-windows-release=fail +live555:x64-windows-release=fail +libdshowcapture:x64-windows-release=fail +wavpack:x64-windows-release=fail +cppcms:x64-windows-release=fail +optional-lite:x64-windows-release=fail +x265:x64-windows-release=fail +vulkan:x64-windows-release=fail +range-v3:x64-windows-release=fail +oatpp-libressl:x64-windows-release=fail +fann:x64-windows-release=fail +pangolin:x64-windows-release=fail +libwebsockets:x64-windows-release=fail +qpid-proton:x64-windows-release=fail +tomlplusplus:x64-windows-release=fail +crashpad:x64-windows-release=fail +sentencepiece:x64-windows-release=fail +atkmm:x64-windows-release=fail +dav1d:x64-windows-release=fail +graphene:x64-windows-release=fail +sfml:x64-windows-release=fail +librttopo:x64-windows-release=fail +farmhash:x64-windows-release=fail +intel-ipsec:x64-windows-release=fail +fastcgi:x64-windows-release=fail +tfhe:x64-windows-release=fail +libcrafter:x64-windows-release=fail +x264:x64-windows-release=fail +chromium-base:x64-windows-release=fail +opencascade:x64-windows-release=fail +usd:x64-windows-release=fail +libbf:x64-windows-release=fail +celero:x64-windows-release=fail +coolprop:x64-windows-release=fail +ccfits:x64-windows-release=fail +numactl:x64-windows-release=fail +spdk-isal:x64-windows-release=fail +turbobase64:x64-windows-release=fail +openmesh:x64-windows-release=fail +libudns:x64-windows-release=fail +directxsdk:x64-windows-release=fail +wildmidi:x64-windows-release=fail +tmxparser:x64-windows-release=fail +pmdk:x64-windows-release=fail +alembic:x64-windows-release=fail +nanorange:x64-windows-release=fail +protobuf-c:x64-windows-release=fail +ade:x64-windows-release=fail +python2:x64-windows-release=fail +munit:x64-windows-release=fail +libmysql:x64-windows-release=fail +crashrpt:x64-windows-release=fail +moos-essential:x64-windows-release=fail +openni2:x64-windows-release=fail +zkpp:x64-windows-release=fail +luasocket:x64-windows-release=fail +opentracing:x64-windows-release=fail +antlr4:x64-windows-release=fail +freerdp:x64-windows-release=fail +mesa:x64-windows-release=fail +libevhtp:x64-windows-release=fail +armadillo:x64-windows-release=fail +unrar:x64-windows-release=fail +intel-mkl:x64-windows-release=fail +gdal:x64-windows-release=fail +dxut:x64-windows-release=fail +quickfix:x64-windows-release=fail +libmagic:x64-windows-release=fail +duilib:x64-windows-release=fail +rtlsdr:x64-windows-release=fail +libgpod:x64-windows-release=fail +signalrclient:x64-windows-release=fail +keystone:x64-windows-release=fail +libgo:x64-windows-release=fail +freetype-gl:x64-windows=fail From bcbe7b2d99c16766aeec669bf8616938aeb1b0c2 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 2 Feb 2021 11:08:56 +0100 Subject: [PATCH 04/58] remove duplicate entry --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 11796f5a2072ab..c39bab14bf3b23 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1791,7 +1791,6 @@ chromium-base:x64-windows-static-md=fail clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail gmp:x64-windows-static-md=fail -ijg-libjpeg:x64-windows-static-md=fail keystone:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libgo:x64-windows-static-md=fail From b920a7c014e31465bd4daefed156a7dba896950b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 2 Feb 2021 12:38:12 +0100 Subject: [PATCH 05/58] second round of failures added to baseline --- scripts/ci.baseline.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1616d99d1730da..3ec048c2d488f1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1898,4 +1898,8 @@ libgpod:x64-windows-release=fail signalrclient:x64-windows-release=fail keystone:x64-windows-release=fail libgo:x64-windows-release=fail -freetype-gl:x64-windows=fail +freetype-gl:x64-windows-release=fail +pangomm:x64-windows-release=fail +qca:x64-windows-release=fail +qt5-wayland:x64-windows-release=fail +qt5-x11extras:x64-windows-release=fail From f3e52b23ed3882aebade64cf8b1c3a85e7f8ec1e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 2 Feb 2021 12:54:06 +0100 Subject: [PATCH 06/58] third round of regressions added to CI --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3ec048c2d488f1..f32a1560fb6628 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1903,3 +1903,4 @@ pangomm:x64-windows-release=fail qca:x64-windows-release=fail qt5-wayland:x64-windows-release=fail qt5-x11extras:x64-windows-release=fail +skia:x64-windows-release=fail From 7ee42d3bb002fd08d2f1e6fac16e363d2c097d6d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 2 Feb 2021 16:08:44 +0100 Subject: [PATCH 07/58] [ade] fix single-config builds --- ports/ade/CONTROL | 3 ++- ports/ade/portfile.cmake | 7 +------ scripts/ci.baseline.txt | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ports/ade/CONTROL b/ports/ade/CONTROL index fd8286ecd9584b..2837ebad3cb1c0 100644 --- a/ports/ade/CONTROL +++ b/ports/ade/CONTROL @@ -1,3 +1,4 @@ Source: ade Version: 0.1.1f -Description: ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution. \ No newline at end of file +Port-Version: 1 +Description: ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution. diff --git a/ports/ade/portfile.cmake b/ports/ade/portfile.cmake index c5becf7eb342cf..7af58d539a71e6 100644 --- a/ports/ade/portfile.cmake +++ b/ports/ade/portfile.cmake @@ -15,12 +15,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(COPY ${CURRENT_PACKAGES_DIR}/debug/share/ade/adeTargets-debug.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ade/) - -file(READ ${CURRENT_PACKAGES_DIR}/share/ade/adeTargets-debug.cmake ADE_TARGET_DEBUG) -string(REPLACE "/lib/" - "/debug/lib/" ADE_TARGET_DEBUG "${ADE_TARGET_DEBUG}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/ade/adeTargets-debug.cmake "${ADE_TARGET_DEBUG}") +vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f32a1560fb6628..1c43dc3ef3eed3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1871,7 +1871,6 @@ pmdk:x64-windows-release=fail alembic:x64-windows-release=fail nanorange:x64-windows-release=fail protobuf-c:x64-windows-release=fail -ade:x64-windows-release=fail python2:x64-windows-release=fail munit:x64-windows-release=fail libmysql:x64-windows-release=fail From d53a4d1a8b823ce42b3ddfb23b15389bce397b96 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 2 Feb 2021 16:10:54 +0100 Subject: [PATCH 08/58] [ade] update refs --- versions/a-/ade.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/ade.json b/versions/a-/ade.json index be6e3c310a1aa2..734019c3c36e71 100644 --- a/versions/a-/ade.json +++ b/versions/a-/ade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91083eb87a39190e6c0296d72931a8d39edcc7cd", + "version-string": "0.1.1f", + "port-version": 1 + }, { "git-tree": "e767fb59fbab737caf770f1aec618a17b503c321", "version-string": "0.1.1f", diff --git a/versions/baseline.json b/versions/baseline.json index 91fb31ba24120b..ea5af0c1e6f374 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -26,7 +26,7 @@ }, "ade": { "baseline": "0.1.1f", - "port-version": 0 + "port-version": 1 }, "aixlog": { "baseline": "1.4.0", From bda098d90ce30cb587baecebf69d5cfea07b2e7a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 12 Jul 2021 10:56:18 +0200 Subject: [PATCH 09/58] remove duplicate entries --- scripts/ci.baseline.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index da3406821caad8..eb271e677a7899 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1816,10 +1816,6 @@ usbmuxd:x64-windows-static-md=fail v8:x64-windows-static-md=fail yato:x64-windows-static-md=fail zyre:x64-windows-static-md=fail -usbmuxd:x64-windows-static-md=fail - -workflow:x64-uwp=fail -workflow:arm-uwp=fail # wangle triggers an internal compiler error # https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1269468 From d605f5e281deeb0045981e31a8cf848403b04a20 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Sat, 11 Sep 2021 19:14:49 +0200 Subject: [PATCH 10/58] [unix2dos] restore eol in script file --- .../azure-pipelines/test-modified-ports.ps1 | 274 +++++++++--------- 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 6d3cc10fc59543..b7d5036b518d65 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -1,137 +1,137 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# - -<# -.SYNOPSIS -Runs the 'Test Modified Ports' part of the vcpkg CI system for all platforms. - -.PARAMETER Triplet -The triplet to test. - -.PARAMETER WorkingRoot -The location used as scratch space for 'installed', 'packages', and 'buildtrees' vcpkg directories. - -.PARAMETER ArtifactStagingDirectory -The Azure Pipelines artifacts directory. If not supplied, defaults to the current directory. - -.PARAMETER ArchivesRoot -Equivalent to '-BinarySourceStub "files,$ArchivesRoot"' - -.PARAMETER BinarySourceStub -The type and parameters of the binary source. Shared across runs of this script. If -this parameter is not set, binary caching will not be used. Example: "files,W:\" - -.PARAMETER BuildReason -The reason Azure Pipelines is running this script (controls in which mode Binary Caching is used). -If BinarySourceStub is not set, this parameter has no effect. If BinarySourceStub is set and this is -not, binary caching will default to read-write mode. - -.PARAMETER PassingIsPassing -Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used -when using vcpkg to test a prerelease MSVC++ compiler) -#> - -[CmdletBinding(DefaultParameterSetName="ArchivesRoot")] -Param( - [Parameter(Mandatory = $true)] - [ValidateNotNullOrEmpty()] - [string]$Triplet, - [Parameter(Mandatory = $true)] - [ValidateNotNullOrEmpty()] - $WorkingRoot, - [ValidateNotNullOrEmpty()] - $ArtifactStagingDirectory = '.', - [Parameter(ParameterSetName='ArchivesRoot')] - $ArchivesRoot = $null, - [Parameter(ParameterSetName='BinarySourceStub')] - $BinarySourceStub = $null, - $BuildReason = $null, - [switch] - $PassingIsPassing = $false -) - -if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { - Write-Error "Incorrect triplet '$Triplet', please supply a valid triplet." - throw -} - -if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { - if ((-Not [string]::IsNullOrWhiteSpace($BinarySourceStub))) { - Write-Error "Only one binary caching setting may be used." - throw - } - - $BinarySourceStub = "files,$ArchivesRoot" -} - -$env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads' -$buildtreesRoot = Join-Path $WorkingRoot 'buildtrees' -$installRoot = Join-Path $WorkingRoot 'installed' -$packagesRoot = Join-Path $WorkingRoot 'packages' - -$commonArgs = @( - "--x-buildtrees-root=$buildtreesRoot", - "--x-install-root=$installRoot", - "--x-packages-root=$packagesRoot", - "--overlay-ports=scripts/test_ports" -) - -$skipFailures = $false -if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { - $commonArgs += @('--no-binarycaching') -} else { - $commonArgs += @('--binarycaching') - $binaryCachingMode = 'readwrite' - if ([string]::IsNullOrWhiteSpace($BuildReason)) { - Write-Host 'Build reason not specified, defaulting to using binary caching in read write mode.' - } - elseif ($BuildReason -eq 'PullRequest') { - Write-Host 'Build reason was Pull Request, using binary caching in read write mode, skipping failures.' - $skipFailures = $true - } - else { - Write-Host "Build reason was $BuildReason, using binary caching in write only mode." - $binaryCachingMode = 'write' - } - - $commonArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") -} - -if ($Triplet -eq 'x64-linux') { - $env:HOME = '/home/agent' - $executableExtension = [string]::Empty -} -elseif ($Triplet -eq 'x64-osx') { - $executableExtension = [string]::Empty -} -else { - $executableExtension = '.exe' -} - -$xmlResults = Join-Path $ArtifactStagingDirectory 'xml-results' -mkdir $xmlResults -$xmlFile = Join-Path $xmlResults "$Triplet.xml" - -$failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' - -& "./vcpkg$executableExtension" x-ci-clean @commonArgs -$skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` - -Triplet $Triplet ` - -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` - -SkipFailures:$skipFailures - -if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) -{ - # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. - # The workaround is to pass the skip list as host-excludes as well. - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs -} -else -{ - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs -} -& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` - -triplet $Triplet ` - -baselineFile .\scripts\ci.baseline.txt ` - -passingIsPassing:$PassingIsPassing +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Runs the 'Test Modified Ports' part of the vcpkg CI system for all platforms. + +.PARAMETER Triplet +The triplet to test. + +.PARAMETER WorkingRoot +The location used as scratch space for 'installed', 'packages', and 'buildtrees' vcpkg directories. + +.PARAMETER ArtifactStagingDirectory +The Azure Pipelines artifacts directory. If not supplied, defaults to the current directory. + +.PARAMETER ArchivesRoot +Equivalent to '-BinarySourceStub "files,$ArchivesRoot"' + +.PARAMETER BinarySourceStub +The type and parameters of the binary source. Shared across runs of this script. If +this parameter is not set, binary caching will not be used. Example: "files,W:\" + +.PARAMETER BuildReason +The reason Azure Pipelines is running this script (controls in which mode Binary Caching is used). +If BinarySourceStub is not set, this parameter has no effect. If BinarySourceStub is set and this is +not, binary caching will default to read-write mode. + +.PARAMETER PassingIsPassing +Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used +when using vcpkg to test a prerelease MSVC++ compiler) +#> + +[CmdletBinding(DefaultParameterSetName="ArchivesRoot")] +Param( + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string]$Triplet, + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + $WorkingRoot, + [ValidateNotNullOrEmpty()] + $ArtifactStagingDirectory = '.', + [Parameter(ParameterSetName='ArchivesRoot')] + $ArchivesRoot = $null, + [Parameter(ParameterSetName='BinarySourceStub')] + $BinarySourceStub = $null, + $BuildReason = $null, + [switch] + $PassingIsPassing = $false +) + +if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { + Write-Error "Incorrect triplet '$Triplet', please supply a valid triplet." + throw +} + +if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { + if ((-Not [string]::IsNullOrWhiteSpace($BinarySourceStub))) { + Write-Error "Only one binary caching setting may be used." + throw + } + + $BinarySourceStub = "files,$ArchivesRoot" +} + +$env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads' +$buildtreesRoot = Join-Path $WorkingRoot 'buildtrees' +$installRoot = Join-Path $WorkingRoot 'installed' +$packagesRoot = Join-Path $WorkingRoot 'packages' + +$commonArgs = @( + "--x-buildtrees-root=$buildtreesRoot", + "--x-install-root=$installRoot", + "--x-packages-root=$packagesRoot", + "--overlay-ports=scripts/test_ports" +) + +$skipFailures = $false +if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { + $commonArgs += @('--no-binarycaching') +} else { + $commonArgs += @('--binarycaching') + $binaryCachingMode = 'readwrite' + if ([string]::IsNullOrWhiteSpace($BuildReason)) { + Write-Host 'Build reason not specified, defaulting to using binary caching in read write mode.' + } + elseif ($BuildReason -eq 'PullRequest') { + Write-Host 'Build reason was Pull Request, using binary caching in read write mode, skipping failures.' + $skipFailures = $true + } + else { + Write-Host "Build reason was $BuildReason, using binary caching in write only mode." + $binaryCachingMode = 'write' + } + + $commonArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") +} + +if ($Triplet -eq 'x64-linux') { + $env:HOME = '/home/agent' + $executableExtension = [string]::Empty +} +elseif ($Triplet -eq 'x64-osx') { + $executableExtension = [string]::Empty +} +else { + $executableExtension = '.exe' +} + +$xmlResults = Join-Path $ArtifactStagingDirectory 'xml-results' +mkdir $xmlResults +$xmlFile = Join-Path $xmlResults "$Triplet.xml" + +$failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' + +& "./vcpkg$executableExtension" x-ci-clean @commonArgs +$skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` + -Triplet $Triplet ` + -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` + -SkipFailures:$skipFailures + +if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) +{ + # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. + # The workaround is to pass the skip list as host-excludes as well. + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs +} +else +{ + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs +} +& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` + -triplet $Triplet ` + -baselineFile .\scripts\ci.baseline.txt ` + -passingIsPassing:$PassingIsPassing From 90044be6103233389c9c5ddae04df39a2ce7bf2b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Sun, 12 Sep 2021 08:43:24 +0200 Subject: [PATCH 11/58] add even more ports now failing in singleConfig... --- scripts/ci.baseline.txt | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8f3804ac7ebb18..dd39ce1069d052 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1758,7 +1758,6 @@ chromium-base:x64-windows-static-md=fail clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail gmp:x64-windows-static-md=fail -ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libgo:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail @@ -1889,3 +1888,23 @@ qca:x64-windows-release=fail qt5-wayland:x64-windows-release=fail qt5-x11extras:x64-windows-release=fail skia:x64-windows-release=fail +jasper:x64-windows-release=fail +libwebp:x64-windows-release=fail +chartdir:x64-windows-release=fail +butteraugli:x64-windows-release=fail +tiff:x64-windows-release=fail +libmupdf:x64-windows-release=fail +libffi:x64-windows-release=fail +halide:x64-windows-release=fail +wangle:x64-windows-release=fail +detours:x64-windows-release=fail +poissonrecon:x64-windows-release=fail +libhsplasma:x64-windows-release=fail +irrlicht:x64-windows-release=fail +libbacktrace:x64-windows-release=fail +easyhook:x64-windows-release=fail +libe57:x64-windows-release=fail +nana:x64-windows-release=fail +dlib:x64-windows-release=fail +qtbase:x64-windows-release=fail +lodepng-c:x64-windows-release=fail From ba82eea0c996d98cd98ccdf00214ccf0f4d55234 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 13:01:34 +0200 Subject: [PATCH 12/58] [libjpeg-turbo] remove unnecessary check --- ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake | 3 --- ports/libjpeg-turbo/vcpkg.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake index 22f0ab92e50dea..0c1a883c0383f8 100644 --- a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake +++ b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake @@ -1,9 +1,6 @@ find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_DEBUG NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) -if(NOT JPEG_INCLUDE_DIR OR NOT JPEG_LIBRARY_RELEASE OR (NOT JPEG_LIBRARY_DEBUG AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib")) - message(FATAL_ERROR "Broken installation of vcpkg port libjpeg-turbo") -endif() if(CMAKE_VERSION VERSION_LESS 3.12) include(SelectLibraryConfigurations) select_library_configurations(JPEG) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 4e59d2b69abefa..e38c8e3d63a3d0 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.0.6", - "port-version": 2, + "port-version": 3, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "features": { From 134d8f4994a21bdbcd24c9b6831b33c3117f005a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 13:02:11 +0200 Subject: [PATCH 13/58] [libjpeg-turbo] fix references --- versions/baseline.json | 2 +- versions/l-/libjpeg-turbo.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 476e25956d073d..7def9327c973bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3378,7 +3378,7 @@ }, "libjpeg-turbo": { "baseline": "2.0.6", - "port-version": 2 + "port-version": 3 }, "libjuice": { "baseline": "0.8.4", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 5314666f427224..ff59d87d90a951 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f10cf90b5807f4b4b98cc82786236002e85b9ac", + "version": "2.0.6", + "port-version": 3 + }, { "git-tree": "48423df98f8715a1f33c2abdfcfc0c0bf5cc5f92", "version": "2.0.6", From 2e842451ae385dcde0c25d168188cc5672d47207 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 13:04:05 +0200 Subject: [PATCH 14/58] [baseline] restore check for ports that were added recently --- scripts/ci.baseline.txt | 42 +++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dd39ce1069d052..d1afea54fac885 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1888,23 +1888,25 @@ qca:x64-windows-release=fail qt5-wayland:x64-windows-release=fail qt5-x11extras:x64-windows-release=fail skia:x64-windows-release=fail -jasper:x64-windows-release=fail -libwebp:x64-windows-release=fail -chartdir:x64-windows-release=fail -butteraugli:x64-windows-release=fail -tiff:x64-windows-release=fail -libmupdf:x64-windows-release=fail -libffi:x64-windows-release=fail -halide:x64-windows-release=fail -wangle:x64-windows-release=fail -detours:x64-windows-release=fail -poissonrecon:x64-windows-release=fail -libhsplasma:x64-windows-release=fail -irrlicht:x64-windows-release=fail -libbacktrace:x64-windows-release=fail -easyhook:x64-windows-release=fail -libe57:x64-windows-release=fail -nana:x64-windows-release=fail -dlib:x64-windows-release=fail -qtbase:x64-windows-release=fail -lodepng-c:x64-windows-release=fail + +### +#jasper:x64-windows-release=fail +#libwebp:x64-windows-release=fail +#chartdir:x64-windows-release=fail +#butteraugli:x64-windows-release=fail +#tiff:x64-windows-release=fail +#libmupdf:x64-windows-release=fail +#libffi:x64-windows-release=fail +#halide:x64-windows-release=fail +#wangle:x64-windows-release=fail +#detours:x64-windows-release=fail +#poissonrecon:x64-windows-release=fail +#libhsplasma:x64-windows-release=fail +#irrlicht:x64-windows-release=fail +#libbacktrace:x64-windows-release=fail +#easyhook:x64-windows-release=fail +#libe57:x64-windows-release=fail +#nana:x64-windows-release=fail +#dlib:x64-windows-release=fail +#qtbase:x64-windows-release=fail +#lodepng-c:x64-windows-release=fail From 8680ebd5bcdcbbf7a95f09e555c2615968912dcc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 16:53:37 +0200 Subject: [PATCH 15/58] [libmodplug] enable single config triplets --- ports/libmodplug/portfile.cmake | 14 +++++++++----- ports/libmodplug/vcpkg.json | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 5df935579492b4..9f59d5b977221a 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -4,7 +4,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(STATIC_PATCH "001-automagically-define-modplug-static.patch") endif() -vcpkg_from_github(ARCHIVE +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Konstanty/libmodplug REF ${MODPLUG_HASH} @@ -28,10 +28,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_TARGET_IS_WINDOWS) else() set(BIN_NAME modplug.dll) endif() - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/bin/${BIN_NAME}) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/debug/bin/${BIN_NAME}) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/bin/${BIN_NAME}) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/debug/bin/${BIN_NAME}) + endif() vcpkg_copy_pdbs() endif() diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index 854e034e1835ea..d5c841955434f3 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodplug", "version-string": "0.8.9.0", - "port-version": 8, + "port-version": 9, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", "supports": "!uwp" From 97d7285fab57d98f37b25f15563a8d08c8e95103 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 16:53:57 +0200 Subject: [PATCH 16/58] [tensorflow-common] enable single config triplets --- ports/tensorflow-common/tensorflow-common.cmake | 10 +++++++++- ports/tensorflow-common/vcpkg.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 403f32c6cb8f0e..931680ea4c0f15 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -125,7 +125,15 @@ else() endif() endif() -foreach(BUILD_TYPE dbg rel) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND PORT_BUILD_CONFIGS "dbg") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + list(APPEND PORT_BUILD_CONFIGS "rel") +endif() + +foreach(BUILD_TYPE IN LISTS PORT_BUILD_CONFIGS) # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks set(STATIC_ONLY_PATCHES) set(WINDOWS_ONLY_PATCHES) diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index b0dfa7959bea25..51d3fa8558abcd 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow-common", "version-semver": "2.4.1", - "port-version": 4, + "port-version": 5, "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } From 8e2de7a54f9a5d172ea7a24e26fbcfe1edbd785b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 16:54:07 +0200 Subject: [PATCH 17/58] update baseline --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d1afea54fac885..99d56d958ab937 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1795,7 +1795,6 @@ dimcli:x64-windows-static=fail cppgraphqlgen:x64-osx=fail v8:x64-windows-release=fail -libmodplug:x64-windows-release=fail isal:x64-windows-release=fail azure-kinect-sensor-sdk:x64-windows-release=fail fluidsynth:x64-windows-release=fail From cfa103346c4536795bdbe830f8830c5fe88fdf5d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 16:54:19 +0200 Subject: [PATCH 18/58] fix references --- versions/baseline.json | 4 ++-- versions/l-/libmodplug.json | 5 +++++ versions/t-/tensorflow-common.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 7def9327c973bd..91fdf7f062c444 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3462,7 +3462,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 8 + "port-version": 9 }, "libmorton": { "baseline": "0.2", @@ -6318,7 +6318,7 @@ }, "tensorflow-common": { "baseline": "2.4.1", - "port-version": 4 + "port-version": 5 }, "tensorpipe": { "baseline": "2021-04-26", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index e32694d51a6f22..0dd5c600f2ab29 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd30ddae17b581e2c1341d8b42603120569e37f8", + "version-string": "0.8.9.0", + "port-version": 9 + }, { "git-tree": "b6798791f0c306dcc5a5b9a445b618046dc7e097", "version-string": "0.8.9.0", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index 59c201491da010..64c4ee8a9ad0a7 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc7a6afb5d9c2d1d67524c652b9d01dec63437d1", + "version-semver": "2.4.1", + "port-version": 5 + }, { "git-tree": "3d84b641f07ef269a213e0382e719a0c338f4ed7", "version-semver": "2.4.1", From f8f216e49e6e111419772e9db7e1028d254258cc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 15 Sep 2021 09:47:51 +0200 Subject: [PATCH 19/58] remove wrong check for single config triplets --- ports/zlib/vcpkg-cmake-wrapper.cmake | 3 --- ports/zlib/vcpkg.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/zlib/vcpkg-cmake-wrapper.cmake b/ports/zlib/vcpkg-cmake-wrapper.cmake index 5060c550257696..499fa84520cb45 100644 --- a/ports/zlib/vcpkg-cmake-wrapper.cmake +++ b/ports/zlib/vcpkg-cmake-wrapper.cmake @@ -2,9 +2,6 @@ set(ZLIB_ROOT "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}") find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${ZLIB_ROOT}/include" NO_DEFAULT_PATH) find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${ZLIB_ROOT}/lib" NO_DEFAULT_PATH) find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${ZLIB_ROOT}/debug/lib" NO_DEFAULT_PATH) -if(NOT ZLIB_INCLUDE_DIR OR NOT ZLIB_LIBRARY_RELEASE OR (NOT ZLIB_LIBRARY_DEBUG AND EXISTS "${ZLIB_ROOT}/debug/lib")) - message("Broken installation of vcpkg port zlib") -endif() if(CMAKE_VERSION VERSION_LESS 3.4) include(SelectLibraryConfigurations) select_library_configurations(ZLIB) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index fd85f6b122ec1f..a302a974e6bd29 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zlib", "version-string": "1.2.11", - "port-version": 12, + "port-version": 13, "description": "A compression library", "homepage": "https://www.zlib.net/" } From d3f4ac84dccfa3a3f0d749b12c4510dead2e6dbf Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 15 Sep 2021 09:48:18 +0200 Subject: [PATCH 20/58] fix references --- versions/baseline.json | 2 +- versions/z-/zlib.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 91fdf7f062c444..72973e7e61af54 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7034,7 +7034,7 @@ }, "zlib": { "baseline": "1.2.11", - "port-version": 12 + "port-version": 13 }, "zlib-ng": { "baseline": "2.0.3", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 41bec9d225ec37..27afb91eec752f 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "825b980d49908eee6047201c61049889f5dfc1f2", + "version-string": "1.2.11", + "port-version": 13 + }, { "git-tree": "89dce3592d1a0a275009278b14bd85fd817b4ad9", "version-string": "1.2.11", From 71ed32aa4c44eb967fc0983547edf83c82350884 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 20 Sep 2021 22:44:01 +0200 Subject: [PATCH 21/58] [ogre] fix single config builds --- ports/ogre-next/portfile.cmake | 4 ++-- ports/ogre-next/vcpkg.json | 2 +- ports/ogre/portfile.cmake | 6 +++--- ports/ogre/vcpkg.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 02f147ab85b963..3c38326447b512 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -90,7 +90,7 @@ endif() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) @@ -98,7 +98,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index a729f0bfd84319..7a41899efd87fa 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre-next", "version-string": "2019-10-20", - "port-version": 2, + "port-version": 3, "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "dependencies": [ diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index c14da2fac93b22..25a44bef2228a1 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 java OGRE_BUILD_COMPONENT_JAVA python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + csharp OGRE_BUILD_COMPONENT_CSHARP overlay OGRE_BUILD_COMPONENT_OVERLAY zziplib OGRE_CONFIG_ENABLE_ZIP strict OGRE_RESOURCEMANAGER_STRICT @@ -99,7 +99,7 @@ endif() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) @@ -107,7 +107,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index d084653e719bfb..279c70699b6298 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 5, + "port-version": 6, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [ From e4b79eba6f3f4a1029cf6e57528578ecdc25766d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 20 Sep 2021 22:44:36 +0200 Subject: [PATCH 22/58] [ogre] fix references --- versions/baseline.json | 4 ++-- versions/o-/ogre-next.json | 5 +++++ versions/o-/ogre.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 559c336e62f4d3..e9f5cf3347892b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4662,11 +4662,11 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 5 + "port-version": 6 }, "ogre-next": { "baseline": "2019-10-20", - "port-version": 2 + "port-version": 3 }, "ois": { "baseline": "1.5", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 88181a1f30e37c..4be1ea0342945a 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "457080b04371353bccb20a026d9796a1f4d697c0", + "version-string": "2019-10-20", + "port-version": 3 + }, { "git-tree": "8d2e2e06d0b21779df8bd6579387805dc06ca6ff", "version-string": "2019-10-20", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 5dd8f1b76d14f4..8bd0871b669908 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "483fa8a5804bf15f26fbd9c505c7f3b23d30f551", + "version-string": "1.12.9", + "port-version": 6 + }, { "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb", "version-string": "1.12.9", From 39c00de725c902eb16ef65cbb794a05fee922d51 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 08:38:27 +0200 Subject: [PATCH 23/58] [untested] force x64-windows-release as host triplet when testing x64-windows-release in CI --- scripts/azure-pipelines/test-modified-ports.ps1 | 14 ++++++++++++-- .../azure-pipelines/windows/azure-pipelines.yml | 9 +++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 8212509d0134b2..15f7efcb1a5d7e 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -37,6 +37,8 @@ Param( [Parameter(Mandatory = $true)] [ValidateNotNullOrEmpty()] [string]$Triplet, + [Parameter(Mandatory = $false)] + [string]$HostTriplet, [Parameter(Mandatory = $true)] [ValidateNotNullOrEmpty()] $WorkingRoot, @@ -56,6 +58,14 @@ if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/communi throw } +if (-Not $null -eq $HostTriplet) { + if (-Not ((Test-Path "triplets/$HostTriplet.cmake") -or (Test-Path "triplets/community/$HostTriplet.cmake"))) { + Write-Error "Incorrect host triplet '$HostTriplet', please supply a valid triplet." + throw + } + $cli_extra_argument = " --host-triplet=$HostTriplet " +} + if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { if ((-Not [string]::IsNullOrWhiteSpace($BinarySourceStub))) { Write-Error "Only one binary caching setting may be used." @@ -130,11 +140,11 @@ if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) { # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. # The workaround is to pass the skip list as host-excludes as well. - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs + & "./vcpkg$executableExtension" ci $Triplet $cli_extra_argument--x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs } else { - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs + & "./vcpkg$executableExtension" ci $Triplet $cli_extra_argument --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs } if ($LASTEXITCODE -ne 0) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index b88a5f12036372..31844348e632ad 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -36,11 +36,20 @@ jobs: displayName: 'Clean downloads' - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' + condition: ne('${{ parameters.triplet }}', 'x64-windows-release') inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true + - task: PowerShell@2 + displayName: '*** Test Modified Ports and Prepare Test Logs ***' + condition: eq('${{ parameters.triplet }}', 'x64-windows-release') + inputs: + failOnStderr: true + filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' + arguments: '-Triplet ${{ parameters.triplet }} --HostTriplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + pwsh: true - task: PowerShell@2 displayName: 'Validate version files' condition: eq('${{ parameters.triplet }}', 'x86-windows') From 9126eaee90df1fad28bac417d3dec2e3df9b3f5f Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 08:48:06 +0200 Subject: [PATCH 24/58] fix --- scripts/azure-pipelines/windows/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 31844348e632ad..cf0ab6947614a2 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -48,7 +48,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet ${{ parameters.triplet }} --HostTriplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet ${{ parameters.triplet }} -HostTriplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - task: PowerShell@2 displayName: 'Validate version files' From 831de2fe04283ec865e3798fe1fd5a8abc085762 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 09:19:48 +0200 Subject: [PATCH 25/58] [x264] fix for single config --- ports/x264/portfile.cmake | 14 +++++++++----- ports/x264/vcpkg.json | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index abd2f1d558a41f..f192ce08a487fe 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( REF 303c484ec828ed0d8bfe743500e70314d026c3bd SHA512 faf210a3f9543028ed882c8348b243dd7ae6638e7b3ef43bec1326b717f23370f57c13d0ddb5e1ae94411088a2e33031a137b68ae9f64c18f8f33f601a0da54d HEAD_REF master - PATCHES + PATCHES "uwp-cflags.patch" ) @@ -61,17 +61,21 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_TARGET_IS_WINDOWS) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc") if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") endif() - set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") - if(EXISTS "${pcfile}") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") + if(EXISTS "${pcfile}") vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") + endif() endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) + endif() elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") # force U_STATIC_IMPLEMENTATION macro file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS) diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 128d8ccf410125..41aa4b91809fab 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x264", "version-string": "157-303c484ec828ed0", - "port-version": 15, + "port-version": 16, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://github.com/mirror/x264", "supports": "!arm", From a07eaad39693b7d6a7fa1397ff2965c94fb0ef9c Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 09:20:08 +0200 Subject: [PATCH 26/58] [x264] update refs --- versions/baseline.json | 2 +- versions/x-/x264.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 250a682882f2d1..f5f6dd1404cbfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6962,7 +6962,7 @@ }, "x264": { "baseline": "157-303c484ec828ed0", - "port-version": 15 + "port-version": 16 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index d129da3b53d5ad..566c437552ae5c 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "779878583150a74a872f17137a4b3a3db56d77ec", + "version-string": "157-303c484ec828ed0", + "port-version": 16 + }, { "git-tree": "e766671c5f64574235784ce45b1668daf4cb9b44", "version-string": "157-303c484ec828ed0", From 036c9700ec6468fc746826d87803e0b6c89e9634 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 10:47:16 +0200 Subject: [PATCH 27/58] [libffi] enable single config builds --- ports/libffi/portfile.cmake | 21 +++++++++++---------- ports/libffi/vcpkg.json | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index ba5d4d88cef156..2983a1f06e6bb8 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -29,26 +29,27 @@ set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") set(toolexeclibdir "\${libdir}") set(includedir "\${prefix}/include") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) -endif() +configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" @ONLY) + # debug -set(prefix "${CURRENT_INSTALLED_DIR}/debug") -set(exec_prefix "\${prefix}") -set(libdir "\${prefix}/lib") -set(toolexeclibdir "\${libdir}") -set(includedir "\${prefix}/../include") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(prefix "${CURRENT_INSTALLED_DIR}/debug") + set(exec_prefix "\${prefix}") + set(libdir "\${prefix}/lib") + set(toolexeclibdir "\${libdir}") + set(includedir "\${prefix}/../include") configure_file("${SOURCE_PATH}/libffi.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" @ONLY) endif() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" "-lffi" "-llibffi") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" "-lffi" "-llibffi") + endif() endif() vcpkg_fixup_pkgconfig() diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 80481cdb7ab012..f246820d673116 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libffi", "version": "3.4.2", - "port-version": 1, + "port-version": 2, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi" } From d13d9434891a1a1e57aeec9950d70c4a6d205061 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 10:47:31 +0200 Subject: [PATCH 28/58] [libffi] update refs --- versions/baseline.json | 2 +- versions/l-/libffi.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index f5f6dd1404cbfa..246204bd7975d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3302,7 +3302,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 1 + "port-version": 2 }, "libfido2": { "baseline": "1.7.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index 52f85d99dbdd82..d59dc34c4e7418 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37322191498457b40a53ab2405e8b9e1793d1e74", + "version": "3.4.2", + "port-version": 2 + }, { "git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456", "version": "3.4.2", From 1139792a5ad9835b26b3356357f42935061e426a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 12:01:35 +0200 Subject: [PATCH 29/58] remove cli broken arguments --- scripts/azure-pipelines/test-modified-ports.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 15f7efcb1a5d7e..899d819c75eba3 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -63,7 +63,7 @@ if (-Not $null -eq $HostTriplet) { Write-Error "Incorrect host triplet '$HostTriplet', please supply a valid triplet." throw } - $cli_extra_argument = " --host-triplet=$HostTriplet " + #$cli_extra_argument = " --host-triplet=$HostTriplet " } if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { From a54c9506026fd3a2b35ee9798de374d60a9cfaef Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:39:18 +0200 Subject: [PATCH 30/58] [calceph] enable single-config builds --- ports/calceph/portfile.cmake | 10 ++++++---- ports/calceph/vcpkg.json | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/calceph/portfile.cmake b/ports/calceph/portfile.cmake index 42acc5e59a4f13..e09f94c05c42ab 100755 --- a/ports/calceph/portfile.cmake +++ b/ports/calceph/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_extract_source_archive_ex( ) if (VCPKG_TARGET_IS_WINDOWS) - + vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -29,7 +29,9 @@ if (VCPKG_TARGET_IS_WINDOWS) ) file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/include/calceph.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() file(REMOVE_RECURSE "${CURRENT_INSTALLED_DIR}/calceph") else() # Build in UNIX @@ -40,10 +42,10 @@ else() # Build in UNIX --enable-fortran=no --enable-thread=yes ) - + vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - + endif() file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME readme.rst) diff --git a/ports/calceph/vcpkg.json b/ports/calceph/vcpkg.json index 72c91d1d9a79d8..a12b93bb54a8cb 100755 --- a/ports/calceph/vcpkg.json +++ b/ports/calceph/vcpkg.json @@ -1,6 +1,7 @@ { "name": "calceph", "version": "3.5.0", + "port-version": 1, "description": "C library to access the binary planetary ephemeris files.", "homepage": "https://www.imcce.fr/inpop/calceph/", "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", From 38c1a652697e0d2d56d4d35b17b3d3590364d70e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:39:43 +0200 Subject: [PATCH 31/58] [calceph] fix references --- versions/baseline.json | 2 +- versions/c-/calceph.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 246204bd7975d2..ef7e5113d2c8db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1186,7 +1186,7 @@ }, "calceph": { "baseline": "3.5.0", - "port-version": 0 + "port-version": 1 }, "camport3": { "baseline": "1.5.3", diff --git a/versions/c-/calceph.json b/versions/c-/calceph.json index d415cc1bda3926..94c64459b355af 100644 --- a/versions/c-/calceph.json +++ b/versions/c-/calceph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48bd1ecc8648d44291fbaf0a11f5f12aa017c077", + "version": "3.5.0", + "port-version": 1 + }, { "git-tree": "d2665db7558ef66aa086f95b155e61b15bd56848", "version": "3.5.0", From 1eddc656aad4675cbcab09bb898b8ad61f9d39bc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:42:36 +0200 Subject: [PATCH 32/58] [kf5config] enable single-config builds --- ports/kf5config/portfile.cmake | 10 ++++++---- ports/kf5config/vcpkg.json | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index ddd842766235f4..ac307259dfc6fc 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -12,7 +12,7 @@ file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: fals vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) @@ -26,7 +26,9 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) file (GLOB EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${EXES}) + if(${EXES}) + file(REMOVE ${EXES}) + endif() else() file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5) @@ -40,8 +42,8 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../data") vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index cccf3ac82a1c84..251e98e26c3fd7 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5config", "version": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ From d085beea3a3363b0dbb799351558e3c6018529cf Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:43:22 +0200 Subject: [PATCH 33/58] [kf5config] fix references --- versions/baseline.json | 2 +- versions/k-/kf5config.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index ef7e5113d2c8db..75ed6684d3b848 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2970,7 +2970,7 @@ }, "kf5config": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5configwidgets": { "baseline": "5.84.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 13e4c607d6a530..303bd0294f5b6a 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4c6ce14f9c2a83e1c676f16e0f2c17a2198a450", + "version": "5.84.0", + "port-version": 3 + }, { "git-tree": "f36f1f5a124bd2f3123e0dfd9f4d350f1f69e757", "version": "5.84.0", From 735154732d880e5dd73c0d914628c0ab40c2c987 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:47:04 +0200 Subject: [PATCH 34/58] [detours] enable single-config builds --- ports/detours/portfile.cmake | 8 +++++--- ports/detours/vcpkg.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake index 9b57b1326dda59..4b22e2acc53b94 100644 --- a/ports/detours/portfile.cmake +++ b/ports/detours/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( REF v4.0.1 SHA512 0a9c21b8222329add2de190d2e94d99195dfa55de5a914b75d380ffe0fb787b12e016d0723ca821001af0168fd1643ffd2455298bf3de5fdc155b3393a3ccc87 HEAD_REF master - PATCHES + PATCHES find-jmp-bounds-arm64.patch ) @@ -20,7 +20,9 @@ vcpkg_build_nmake( ) file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib.${VCPKG_TARGET_ARCHITECTURE}Release/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib.${VCPKG_TARGET_ARCHITECTURE}Debug/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/include DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME detours) +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib.${VCPKG_TARGET_ARCHITECTURE}Debug/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +endif() +file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME detours) file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/detours/vcpkg.json b/ports/detours/vcpkg.json index 2813febbd9d93d..269215381c0937 100644 --- a/ports/detours/vcpkg.json +++ b/ports/detours/vcpkg.json @@ -1,7 +1,7 @@ { "name": "detours", "version-string": "4.0.1", - "port-version": 3, + "port-version": 4, "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", "homepage": "https://github.com/microsoft/Detours" } From 2a5aa85db24d0078c0bb6b776bbb3ad98a1b4811 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:47:20 +0200 Subject: [PATCH 35/58] [detours] fix references --- versions/baseline.json | 2 +- versions/d-/detours.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 75ed6684d3b848..5db30a07f04274 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1750,7 +1750,7 @@ }, "detours": { "baseline": "4.0.1", - "port-version": 3 + "port-version": 4 }, "devicenameresolver": { "baseline": "2016-06-26-0850d88fa6", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index 4dafbf79116062..b3a405054cd6f3 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5861103bcfabe1c56b992ada5a1c4f05f3077a8", + "version-string": "4.0.1", + "port-version": 4 + }, { "git-tree": "c2b285f4028fc968bc2b4b04f7c3be5a9070d9df", "version-string": "4.0.1", From d406015c8ffce688befd6989a9515d0f6fad51f1 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:57:14 +0200 Subject: [PATCH 36/58] [kf5*] enable single-config builds --- ports/kf5holidays/portfile.cmake | 9 ++++++--- ports/kf5holidays/vcpkg.json | 2 +- ports/kf5plotting/portfile.cmake | 6 ++++-- ports/kf5plotting/vcpkg.json | 2 +- ports/kf5solid/portfile.cmake | 6 ++++-- ports/kf5solid/vcpkg.json | 2 +- ports/libbacktrace/vcpkg.json | 1 + scripts/ci.baseline.txt | 24 ++---------------------- 8 files changed, 20 insertions(+), 32 deletions(-) diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index ee0ae5f4462832..9a66e93b7f743f 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -12,7 +12,7 @@ file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: fals vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) @@ -21,7 +21,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Holidays) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -29,7 +29,10 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qml ${CURRENT_PACKAGES_DIR}/debug/qml ) +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qml ${CURRENT_PACKAGES_DIR}/debug/qml ) +endif() + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qml ${CURRENT_PACKAGES_DIR}/qml ) file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 1993091f78c0be..5392592b6e5eaf 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5holidays", "version": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index f2d8ac8778252c..0728ed32a17216 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -12,7 +12,7 @@ file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: fals vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) @@ -21,7 +21,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Plotting) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins) +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins) +endif() file(RENAME ${CURRENT_PACKAGES_DIR}/lib/plugins ${CURRENT_PACKAGES_DIR}/plugins) file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 7513e48fe48a50..fe765cb80a1218 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5plotting", "version": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 9474f1c001b37d..ad355c248750a1 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -38,7 +38,7 @@ file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: fals vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_TESTING=OFF ) @@ -58,7 +58,9 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml") file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index c825d05b8df875..3657786fdc793e 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5solid", "version-semver": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/ports/libbacktrace/vcpkg.json b/ports/libbacktrace/vcpkg.json index 7b6b32b53b710d..ec58bfeab93aad 100644 --- a/ports/libbacktrace/vcpkg.json +++ b/ports/libbacktrace/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libbacktrace", "version-date": "2021-03-14", + "port-version": 1, "description": "The libbacktrace library may be linked into a program or library and used to produce symbolic backtraces.", "homepage": "https://github.com/ianlancetaylor/libbacktrace" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6bc94dc4d955c3..32f30df0406a20 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1885,25 +1885,5 @@ qca:x64-windows-release=fail qt5-wayland:x64-windows-release=fail qt5-x11extras:x64-windows-release=fail skia:x64-windows-release=fail - -### -#jasper:x64-windows-release=fail -#libwebp:x64-windows-release=fail -#chartdir:x64-windows-release=fail -#butteraugli:x64-windows-release=fail -#tiff:x64-windows-release=fail -#libmupdf:x64-windows-release=fail -#libffi:x64-windows-release=fail -#halide:x64-windows-release=fail -#wangle:x64-windows-release=fail -#detours:x64-windows-release=fail -#poissonrecon:x64-windows-release=fail -#libhsplasma:x64-windows-release=fail -#irrlicht:x64-windows-release=fail -#libbacktrace:x64-windows-release=fail -#easyhook:x64-windows-release=fail -#libe57:x64-windows-release=fail -#nana:x64-windows-release=fail -#dlib:x64-windows-release=fail -#qtbase:x64-windows-release=fail -#lodepng-c:x64-windows-release=fail +easyhook:x64-windows-release=fail +libbacktrace:x64-windows-release=fail From a5ba53aa38d1c73810ffdd5d0fcaec62274aa327 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 14:57:32 +0200 Subject: [PATCH 37/58] [kf5*] fix references --- versions/baseline.json | 8 ++++---- versions/k-/kf5holidays.json | 5 +++++ versions/k-/kf5plotting.json | 5 +++++ versions/k-/kf5solid.json | 5 +++++ versions/l-/libbacktrace.json | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 5db30a07f04274..8871ba61536718 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2998,7 +2998,7 @@ }, "kf5holidays": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5i18n": { "baseline": "5.84.0", @@ -3026,7 +3026,7 @@ }, "kf5plotting": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5service": { "baseline": "5.84.0", @@ -3034,7 +3034,7 @@ }, "kf5solid": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5sonnet": { "baseline": "5.84.0", @@ -3198,7 +3198,7 @@ }, "libbacktrace": { "baseline": "2021-03-14", - "port-version": 0 + "port-version": 1 }, "libbf": { "baseline": "1.0.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index d79071a556b961..759fe9c1ee9d44 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2996cd0ca97642ee06e27d9c9e2a7f7580244e6", + "version": "5.84.0", + "port-version": 3 + }, { "git-tree": "d8b6fefbcb219e7f1de19ffc4b30bc8fd199abc0", "version": "5.84.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 65073a0b340794..208023ea4344aa 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e98ed8c3e35392f7983dd0174d922d92b11acae", + "version": "5.84.0", + "port-version": 3 + }, { "git-tree": "866d1f84848c54a924a542fc101895588ff895b0", "version": "5.84.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index 332603a1b8a377..397b2663bad615 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5751481e96fd7a624ea7edcee330d4af3c2cf12", + "version-semver": "5.84.0", + "port-version": 3 + }, { "git-tree": "f0a82387f00cd2a61e6f1751bb1c94c9d706fddb", "version-semver": "5.84.0", diff --git a/versions/l-/libbacktrace.json b/versions/l-/libbacktrace.json index 252be58df8d087..001a31890859ab 100644 --- a/versions/l-/libbacktrace.json +++ b/versions/l-/libbacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a58a5d37a98b80856dca2a3f7aa643cb00361710", + "version-date": "2021-03-14", + "port-version": 1 + }, { "git-tree": "8772967fbaa6b8840266c0d04a6daccc78b44c3d", "version-date": "2021-03-14", From d5780070511ec80455f2cc6980757d9f723aab59 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 15:15:40 +0200 Subject: [PATCH 38/58] fix --- ports/kf5config/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index ac307259dfc6fc..7a9738d5d48324 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -26,7 +26,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) file (GLOB EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - if(${EXES}) + if(NOT "${EXES}" STREQUAL "") file(REMOVE ${EXES}) endif() else() From 0141dec4b134442cc607d46804f4fc2ba380ac4a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 15:16:04 +0200 Subject: [PATCH 39/58] kf5config fix reference --- versions/k-/kf5config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 303bd0294f5b6a..aefcbcfe531086 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e4c6ce14f9c2a83e1c676f16e0f2c17a2198a450", + "git-tree": "fa2a9cc66358dc97f87c0c7b1954844bd8733ead", "version": "5.84.0", "port-version": 3 }, From a6ce8dcfb9efb40d1b134ddce600a2c794f541cc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 21 Sep 2021 15:38:23 +0200 Subject: [PATCH 40/58] trying again to force host triplet in CI --- scripts/azure-pipelines/test-modified-ports.ps1 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 899d819c75eba3..017821573119f7 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -59,11 +59,12 @@ if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/communi } if (-Not $null -eq $HostTriplet) { - if (-Not ((Test-Path "triplets/$HostTriplet.cmake") -or (Test-Path "triplets/community/$HostTriplet.cmake"))) { - Write-Error "Incorrect host triplet '$HostTriplet', please supply a valid triplet." - throw - } - #$cli_extra_argument = " --host-triplet=$HostTriplet " + if (-Not ((Test-Path "triplets/$HostTriplet.cmake") -or (Test-Path "triplets/community/$HostTriplet.cmake"))) { + Write-Error "Incorrect host triplet '$HostTriplet', please supply a valid triplet." + throw + } + #$cli_extra_argument = " --host-triplet=$HostTriplet " + $env:VCPKG_DEFAULT_HOST_TRIPLET = $HostTriplet } if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { From dba242295eab3379c933d6667df34669dbfe7b7d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 22 Sep 2021 08:25:02 +0200 Subject: [PATCH 41/58] [boost] fix for single-config builds --- .../user-config.jam | 47 ++++++++++++------- ports/boost-modular-build-helper/vcpkg.json | 2 +- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index afd1d7dc6ac06c..c6764c94f49b35 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -25,9 +25,12 @@ else if "@PORT@" = "boost-python" { using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_RELEASE@" ; - using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_DEBUG@" : on ; using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_RELEASE@" ; - using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_DEBUG@" : on ; + if "@VCPKG_BUILD_TYPE@" != "release" + { + using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_DEBUG@" : on ; + using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_DEBUG@" : on ; + } } if "@PORT@" = "boost-mpi" @@ -45,40 +48,48 @@ if "@VCPKG_PLATFORM_TOOLSET@" != "external" lib advapi32 ; lib icuuc : : "@CURRENT_INSTALLED_DIR@/lib/icuuc.lib" release : : advapi32 ; - lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" debug : : advapi32 ; - lib icuin : : "@CURRENT_INSTALLED_DIR@/lib/icuin.lib" release : : ; - lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" debug : : ; - lib icudt : : "@CURRENT_INSTALLED_DIR@/lib/icudt.lib" release : : ; - lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" debug : : ; + + if "@VCPKG_BUILD_TYPE@" != "release" + { + lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" debug : : advapi32 ; + lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" debug : : ; + lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" debug : : ; + } } else { if "@CMAKE_SYSTEM_NAME@" = "Windows" # We are hopelessly stuck inside boost-modular-build-helper, only this works { lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuuc : : icuucd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - lib icuin : : icuin "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuin : : icuind "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - lib icudt : : icudt "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icudt : : icudtd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + if "@VCPKG_BUILD_TYPE@" != "release" + { + lib icuuc : : icuucd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + lib icuin : : icuind "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + lib icudt : : icudtd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } } else { lib dl ; lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : dl ; - lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : dl ; - lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + if "@VCPKG_BUILD_TYPE@" != "release" + { + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : dl ; + lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } } } lib iconv : : "@LIBICONV_LIBRARY@" shared shared release : : ; -lib iconv : : "@LIBICONV_LIBRARY@" shared shared debug : : ; +if "@VCPKG_BUILD_TYPE@" != "release" +{ + lib iconv : : "@LIBICONV_LIBRARY@" shared shared debug : : ; +} diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 192b420666ce5d..78d6efa372e5be 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.76.0", - "port-version": 1, + "port-version": 2, "dependencies": [ "boost-build", "boost-uninstall" From 2bff1094484a963e96ca38224a13da677ad82d7b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 22 Sep 2021 08:25:21 +0200 Subject: [PATCH 42/58] [boost] update references --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 95199b6d3023cf..fdf061d856c223 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9d78c1ec0be1fda109728b9017166cc408c6b34", + "version-string": "1.76.0", + "port-version": 2 + }, { "git-tree": "f9cf6243049bf0abf8526fba57702a2122665549", "version-string": "1.76.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8871ba61536718..ad12d22f406920 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -798,7 +798,7 @@ }, "boost-modular-build-helper": { "baseline": "1.76.0", - "port-version": 1 + "port-version": 2 }, "boost-move": { "baseline": "1.76.0", From 83940bf466b8f24c970218db0e185abf92903580 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 22 Sep 2021 08:57:02 +0200 Subject: [PATCH 43/58] fix --- ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 78d6efa372e5be..9a90689bc5a9dd 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.76.0", - "port-version": 2, + "port-version": 3, "dependencies": [ "boost-build", "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index fdf061d856c223..2b37412e7e63c7 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c9d78c1ec0be1fda109728b9017166cc408c6b34", + "git-tree": "fd1c08c606cabfe31c22e2677c383f8b5119fba6", "version-string": "1.76.0", "port-version": 2 }, From e08e05465cbc8daa07f794709202d24f5d922ddc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 22 Sep 2021 08:57:59 +0200 Subject: [PATCH 44/58] [boost] update refs --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 2b37412e7e63c7..1295c9e0e204df 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e641bf7f2b47eca34ae8e45179fdf82b30d0d52", + "version-string": "1.76.0", + "port-version": 3 + }, { "git-tree": "fd1c08c606cabfe31c22e2677c383f8b5119fba6", "version-string": "1.76.0", diff --git a/versions/baseline.json b/versions/baseline.json index ad12d22f406920..35f2d36bcb43c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -798,7 +798,7 @@ }, "boost-modular-build-helper": { "baseline": "1.76.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.76.0", From 600725af4a357bc91daeb72141baf8e23276b18b Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 22 Sep 2021 09:14:05 +0200 Subject: [PATCH 45/58] disable host triplet in ci because it's not necessary --- scripts/azure-pipelines/test-modified-ports.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 017821573119f7..a7eb1f5338a1f7 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -64,7 +64,7 @@ if (-Not $null -eq $HostTriplet) { throw } #$cli_extra_argument = " --host-triplet=$HostTriplet " - $env:VCPKG_DEFAULT_HOST_TRIPLET = $HostTriplet + #$env:VCPKG_DEFAULT_HOST_TRIPLET = $HostTriplet } if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { From 7e89743003c136976d65319f1504196744e52910 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 22 Sep 2021 13:15:04 +0200 Subject: [PATCH 46/58] retrigger a build for ports previously failing --- scripts/ci.baseline.txt | 96 ----------------------------------------- 1 file changed, 96 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 32f30df0406a20..038db4684a983b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1791,99 +1791,3 @@ dimcli:x64-windows-static=fail # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. cppgraphqlgen:x64-osx=fail - -v8:x64-windows-release=fail -isal:x64-windows-release=fail -azure-kinect-sensor-sdk:x64-windows-release=fail -fluidsynth:x64-windows-release=fail -libodb:x64-windows-release=fail -mdnsresponder:x64-windows-release=fail -readosm:x64-windows-release=fail -gsoap:x64-windows-release=fail -libepoxy:x64-windows-release=fail -portmidi:x64-windows-release=fail -dlfcn-win32:x64-windows-release=fail -unicorn:x64-windows-release=fail -libfreenect2:x64-windows-release=fail -fribidi:x64-windows-release=fail -pfring:x64-windows-release=fail -live555:x64-windows-release=fail -libdshowcapture:x64-windows-release=fail -wavpack:x64-windows-release=fail -cppcms:x64-windows-release=fail -optional-lite:x64-windows-release=fail -x265:x64-windows-release=fail -vulkan:x64-windows-release=fail -range-v3:x64-windows-release=fail -oatpp-libressl:x64-windows-release=fail -fann:x64-windows-release=fail -pangolin:x64-windows-release=fail -libwebsockets:x64-windows-release=fail -qpid-proton:x64-windows-release=fail -tomlplusplus:x64-windows-release=fail -crashpad:x64-windows-release=fail -sentencepiece:x64-windows-release=fail -atkmm:x64-windows-release=fail -dav1d:x64-windows-release=fail -graphene:x64-windows-release=fail -sfml:x64-windows-release=fail -librttopo:x64-windows-release=fail -farmhash:x64-windows-release=fail -intel-ipsec:x64-windows-release=fail -fastcgi:x64-windows-release=fail -tfhe:x64-windows-release=fail -libcrafter:x64-windows-release=fail -x264:x64-windows-release=fail -chromium-base:x64-windows-release=fail -opencascade:x64-windows-release=fail -usd:x64-windows-release=fail -libbf:x64-windows-release=fail -celero:x64-windows-release=fail -coolprop:x64-windows-release=fail -ccfits:x64-windows-release=fail -numactl:x64-windows-release=fail -spdk-isal:x64-windows-release=fail -turbobase64:x64-windows-release=fail -openmesh:x64-windows-release=fail -libudns:x64-windows-release=fail -directxsdk:x64-windows-release=fail -wildmidi:x64-windows-release=fail -tmxparser:x64-windows-release=fail -pmdk:x64-windows-release=fail -alembic:x64-windows-release=fail -nanorange:x64-windows-release=fail -protobuf-c:x64-windows-release=fail -python2:x64-windows-release=fail -munit:x64-windows-release=fail -libmysql:x64-windows-release=fail -crashrpt:x64-windows-release=fail -moos-essential:x64-windows-release=fail -openni2:x64-windows-release=fail -zkpp:x64-windows-release=fail -luasocket:x64-windows-release=fail -opentracing:x64-windows-release=fail -antlr4:x64-windows-release=fail -freerdp:x64-windows-release=fail -mesa:x64-windows-release=fail -libevhtp:x64-windows-release=fail -armadillo:x64-windows-release=fail -unrar:x64-windows-release=fail -intel-mkl:x64-windows-release=fail -gdal:x64-windows-release=fail -dxut:x64-windows-release=fail -quickfix:x64-windows-release=fail -libmagic:x64-windows-release=fail -duilib:x64-windows-release=fail -rtlsdr:x64-windows-release=fail -libgpod:x64-windows-release=fail -signalrclient:x64-windows-release=fail -keystone:x64-windows-release=fail -libgo:x64-windows-release=fail -freetype-gl:x64-windows-release=fail -pangomm:x64-windows-release=fail -qca:x64-windows-release=fail -qt5-wayland:x64-windows-release=fail -qt5-x11extras:x64-windows-release=fail -skia:x64-windows-release=fail -easyhook:x64-windows-release=fail -libbacktrace:x64-windows-release=fail From cd29110ff7c5efc37c640d4fceebe302cae2e6b7 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 22 Sep 2021 17:40:26 +0200 Subject: [PATCH 47/58] remove host triplet in ci, not necessary anymore? --- .../azure-pipelines/test-modified-ports.ps1 | 15 +---- .../windows/azure-pipelines.yml | 9 --- scripts/ci.baseline.txt | 67 +++++++++++++++++++ 3 files changed, 69 insertions(+), 22 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index a7eb1f5338a1f7..8212509d0134b2 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -37,8 +37,6 @@ Param( [Parameter(Mandatory = $true)] [ValidateNotNullOrEmpty()] [string]$Triplet, - [Parameter(Mandatory = $false)] - [string]$HostTriplet, [Parameter(Mandatory = $true)] [ValidateNotNullOrEmpty()] $WorkingRoot, @@ -58,15 +56,6 @@ if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/communi throw } -if (-Not $null -eq $HostTriplet) { - if (-Not ((Test-Path "triplets/$HostTriplet.cmake") -or (Test-Path "triplets/community/$HostTriplet.cmake"))) { - Write-Error "Incorrect host triplet '$HostTriplet', please supply a valid triplet." - throw - } - #$cli_extra_argument = " --host-triplet=$HostTriplet " - #$env:VCPKG_DEFAULT_HOST_TRIPLET = $HostTriplet -} - if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { if ((-Not [string]::IsNullOrWhiteSpace($BinarySourceStub))) { Write-Error "Only one binary caching setting may be used." @@ -141,11 +130,11 @@ if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) { # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. # The workaround is to pass the skip list as host-excludes as well. - & "./vcpkg$executableExtension" ci $Triplet $cli_extra_argument--x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs } else { - & "./vcpkg$executableExtension" ci $Triplet $cli_extra_argument --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs } if ($LASTEXITCODE -ne 0) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index cf0ab6947614a2..b88a5f12036372 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -36,20 +36,11 @@ jobs: displayName: 'Clean downloads' - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' - condition: ne('${{ parameters.triplet }}', 'x64-windows-release') inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - - task: PowerShell@2 - displayName: '*** Test Modified Ports and Prepare Test Logs ***' - condition: eq('${{ parameters.triplet }}', 'x64-windows-release') - inputs: - failOnStderr: true - filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -HostTriplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' - pwsh: true - task: PowerShell@2 displayName: 'Validate version files' condition: eq('${{ parameters.triplet }}', 'x86-windows') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 038db4684a983b..a79a0fc2533197 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1791,3 +1791,70 @@ dimcli:x64-windows-static=fail # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. cppgraphqlgen:x64-osx=fail + +# failures for x64-windows-release +pmdk:x64-windows-release=fail +qt5-x11extras:x64-windows-release=fail +libfreenect2:x64-windows-release=fail +libdshowcapture:x64-windows-release=fail +libgpod:x64-windows-release=fail +libodb:x64-windows-release=fail +numactl:x64-windows-release=fail +sfml:x64-windows-release=fail +pdal:x64-windows-release=fail +vulkan:x64-windows-release=fail +librttopo:x64-windows-release=fail +v8:x64-windows-release=fail +qpid-proton:x64-windows-release=fail +cppcms:x64-windows-release=fail +wildmidi:x64-windows-release=fail +gsoap:x64-windows-release=fail +dlfcn-win32:x64-windows-release=fail +nanorange:x64-windows-release=fail +freetype-gl:x64-windows-release=fail +intel-ipsec:x64-windows-release=fail +ccfits:x64-windows-release=fail +qca:x64-windows-release=fail +easyhook:x64-windows-release=fail +openni2:x64-windows-release=fail +chartdir:x64-windows-release=fail +duilib:x64-windows-release=fail +intel-mkl:x64-windows-release=fail +libbacktrace:x64-windows-release=fail +antlr4:x64-windows-release=fail +libwebsockets:x64-windows-release=fail +pangolin:x64-windows-release=fail +spdk-isal:x64-windows-release=fail +crashpad:x64-windows-release=fail +unrar:x64-windows-release=fail +fastcgi:x64-windows-release=fail +chromium-base:x64-windows-release=fail +libbf:x64-windows-release=fail +live555:x64-windows-release=fail +luasocket:x64-windows-release=fail +turbobase64:x64-windows-release=fail +opencascade:x64-windows-release=fail +protobuf-c:x64-windows-release=fail +zkpp:x64-windows-release=fail +unicorn:x64-windows-release=fail +wavpack:x64-windows-release=fail +libudns:x64-windows-release=fail +skia:x64-windows-release=fail +tmxparser:x64-windows-release=fail +python2:x64-windows-release=fail +farmhash:x64-windows-release=fail +celero:x64-windows-release=fail +isal:x64-windows-release=fail +opentracing:x64-windows-release=fail +moos-essential:x64-windows-release=fail +libevhtp:x64-windows-release=fail +sentencepiece:x64-windows-release=fail +readosm:x64-windows-release=fail +rtlsdr:x64-windows-release=fail +boost-regex:x64-windows-release=fail +mdnsresponder:x64-windows-release=fail +openmesh:x64-windows-release=fail +keystone:x64-windows-release=fail +pfring:x64-windows-release=fail +gstreamer:x64-windows-release=fail +freerdp:x64-windows-release=fail From 0571014a1490bb4630a88d303295080f09834176 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 23 Sep 2021 23:15:18 +0200 Subject: [PATCH 48/58] make PR dry --- scripts/azure-pipelines/azure-pipelines.yml | 6 -- scripts/ci.baseline.txt | 114 +------------------- 2 files changed, 4 insertions(+), 116 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 298cc202b6a67c..e5102c32cdbf4e 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -70,12 +70,6 @@ stages: jobName: x64_windows_static_md poolName: $(windows-pool) - - template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-release - jobName: x64_windows_release - poolName: $(windows-pool) - - template: windows/azure-pipelines.yml parameters: triplet: x64-uwp diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a79a0fc2533197..8bdb71d556de25 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -24,7 +24,6 @@ ## x64-windows ## x64-windows-static ## x64-windows-static-md -## x64-windows-release ## x86-windows ## @@ -94,7 +93,6 @@ catch-classic:x64-uwp = skip catch-classic:x64-windows = skip catch-classic:x64-windows-static = skip catch-classic:x64-windows-static-md=skip -catch-classic:x64-windows-release=skip catch-classic:x86-windows = skip ccd:arm-uwp=fail ccd:x64-uwp=fail @@ -115,7 +113,6 @@ charls:x64-uwp=skip charls:x64-windows=skip charls:x64-windows-static=skip charls:x64-windows-static-md=skip -charls:x64-windows-release=skip charls:x86-windows=skip # chartdir does not offer stable download URLs chartdir:arm64-windows=fail @@ -148,7 +145,6 @@ cmcstl2:x64-uwp = skip cmcstl2:x64-windows = skip cmcstl2:x64-windows-static = skip cmcstl2:x64-windows-static-md=skip -cmcstl2:x64-windows-release=skip cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail @@ -203,7 +199,6 @@ dbghelp:x64-osx=fail dbghelp:x64-uwp=skip dbghelp:x64-windows-static=skip dbghelp:x64-windows-static-md=skip -dbghelp:x64-windows-release=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip dcmtk:arm-uwp=fail @@ -249,7 +244,6 @@ duckx:x64-uwp = skip duckx:x64-windows = skip duckx:x64-windows-static = skip duckx:x64-windows-static-md=skip -duckx:x64-windows-release=skip duckx:x86-windows = skip duilib:arm-uwp=fail duilib:x64-linux=fail @@ -322,7 +316,6 @@ fluidlite:x64-osx=skip fluidlite:x64-uwp=skip fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip -fluidlite:x64-windows-release=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip fmem:arm-uwp=fail @@ -377,7 +370,6 @@ gsoap:x64-windows-static-md = skip # extremely slow may take several hours to download geotrans:x64-linux = skip geotrans:x64-windows = skip -geotrans:x64-windows-release = skip geotrans:x86-windows = skip getopt:arm-uwp=fail getopt:x64-uwp=fail @@ -398,7 +390,6 @@ gherkin-c:x64-uwp = skip gherkin-c:x64-windows = skip gherkin-c:x64-windows-static = skip gherkin-c:x64-windows-static-md=skip -gherkin-c:x64-windows-release=skip gherkin-c:x86-windows = skip gl3w:arm64-windows=fail gl3w:arm-uwp=fail @@ -472,8 +463,6 @@ ijg-libjpeg:x64-osx = skip ijg-libjpeg:x64-uwp = skip ijg-libjpeg:x64-windows = skip ijg-libjpeg:x64-windows-static = skip -ijg-libjpeg:x64-windows-static-md=skip -ijg-libjpeg:x64-windows-release=skip ijg-libjpeg:x86-windows = skip intel-ipsec:arm64-windows=fail intel-ipsec:arm-uwp=fail @@ -645,7 +634,6 @@ libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip -libmariadb:x64-windows-release=skip libmariadb:x86-windows = skip # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) libmesh:arm64-windows=skip @@ -654,7 +642,6 @@ libmesh:x64-uwp=skip libmesh:x64-windows=skip libmesh:x64-windows-static=skip libmesh:x64-windows-static-md=skip -libmesh:x64-windows-release=skip libmesh:x86-windows=skip libmesh:x64-osx=skip libmesh:x64-linux=skip @@ -699,7 +686,6 @@ libpng-apng:x64-uwp = skip libpng-apng:x64-windows = skip libpng-apng:x64-windows-static = skip libpng-apng:x64-windows-static-md=skip -libpng-apng:x64-windows-release=skip libpng-apng:x86-windows = skip libpq:arm-uwp=fail libpq:x64-uwp=fail @@ -708,7 +694,6 @@ libqcow:arm-uwp=skip libqcow:x64-uwp=skip libqcow:x64-windows-static=skip libqcow:x64-windows-static-md=skip -libqcow:x64-windows-release=skip libqcow:x64-osx=skip libqcow:x64-windows=skip libqcow:x64-linux=skip @@ -725,7 +710,6 @@ boringssl:x64-uwp = skip boringssl:x64-windows = skip boringssl:x64-windows-static = skip boringssl:x64-windows-static-md=skip -boringssl:x64-windows-release=skip boringssl:x86-windows = skip libressl:arm64-windows = skip libressl:arm-uwp = skip @@ -735,7 +719,6 @@ libressl:x64-uwp = skip libressl:x64-windows = skip libressl:x64-windows-static = skip libressl:x64-windows-static-md=skip -libressl:x64-windows-release=skip libressl:x86-windows = skip libsamplerate:x64-osx=fail libsoundio:arm64-windows=fail @@ -797,7 +780,6 @@ libvmdk:x86-windows=skip libvmdk:x64-windows=skip libvmdk:x64-windows-static=skip libvmdk:x64-windows-static-md=skip -libvmdk:x64-windows-release=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip @@ -854,7 +836,6 @@ luajit:x64-uwp = skip luajit:x64-windows = skip luajit:x64-windows-static = skip luajit:x64-windows-static-md=skip -luajit:x64-windows-release=skip luajit:x86-windows = skip luafilesystem:arm-uwp=fail luafilesystem:x64-uwp=fail @@ -889,7 +870,6 @@ mecab:x64-uwp = skip mecab:x64-windows = skip mecab:x64-windows-static = skip mecab:x64-windows-static-md=skip -mecab:x64-windows-release=skip mecab:x86-windows = skip memorymodule:arm-uwp=fail memorymodule:x64-linux=fail @@ -937,7 +917,6 @@ microsoft-signalr:x64-uwp=skip microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip microsoft-signalr:x64-windows-static-md=skip -microsoft-signalr:x64-windows-release=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail @@ -954,7 +933,6 @@ mmloader:x86-windows=fail mmx:x64-windows=skip mmx:x64-windows-static=skip mmx:x64-windows-static-md=skip -mmx:x64-windows-release=skip mmx:x86-windows=skip mmx:x64-linux=skip mmx:x64-osx=skip @@ -987,7 +965,6 @@ mozjpeg:x64-uwp = skip mozjpeg:x64-windows = skip mozjpeg:x64-windows-static = skip mozjpeg:x64-windows-static-md=skip -mozjpeg:x64-windows-release=skip mozjpeg:x86-windows = skip # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 @@ -995,7 +972,6 @@ mpir:x86-windows=skip mpir:x64-windows=skip mpir:x64-windows-static=skip mpir:x64-windows-static-md=skip -mpir:x64-windows-release=skip mpir:arm64-windows=skip mpir:x64-osx=skip mpir:x64-linux=skip @@ -1072,7 +1048,6 @@ ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip ogdf:x64-windows-static-md=skip -ogdf:x64-windows-release=skip ogdf:x86-windows = skip # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936 ogdf:x64-linux=fail @@ -1086,7 +1061,6 @@ ogre-next:x64-uwp = skip ogre-next:x64-windows = skip ogre-next:x64-windows-static = skip ogre-next:x64-windows-static-md=skip -ogre-next:x64-windows-release=skip ogre-next:x86-windows = skip ois:arm64-windows=fail ois:arm-uwp=fail @@ -1128,7 +1102,6 @@ opencv2:x64-uwp = skip opencv2:x64-windows = skip opencv2:x64-windows-static = skip opencv2:x64-windows-static-md=skip -opencv2:x64-windows-release=skip opencv2:x86-windows = skip opencv3:arm64-windows = skip opencv3:arm-uwp = skip @@ -1138,7 +1111,6 @@ opencv3:x64-uwp = skip opencv3:x64-windows = skip opencv3:x64-windows-static = skip opencv3:x64-windows-static-md=skip -opencv3:x64-windows-release=skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail @@ -1196,7 +1168,6 @@ optional-bare:x64-uwp = skip optional-bare:x64-windows = skip optional-bare:x64-windows-static = skip optional-bare:x64-windows-static-md=skip -optional-bare:x64-windows-release=skip optional-bare:x86-windows = skip opusfile:arm-uwp=fail opusfile:x64-uwp=fail @@ -1293,7 +1264,6 @@ qt5-canvas3d:x64-osx=skip qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip -qt5-canvas3d:x64-windows-release=skip qt5-canvas3d:x86-windows=skip # Missing system libraries qt5-wayland:x64-osx=fail @@ -1306,7 +1276,6 @@ qt5-webengine:x64-osx=fail # fatal error C1189: #error: This file was generated by an older version of protoc which is # Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg. qt5-webengine:x64-windows=skip -qt5-webengine:x64-windows-release=skip qt5-webengine:x86-windows=skip # Static builds of qt5-webengine are not supported by the port itself qt5-webengine:x64-windows-static=skip @@ -1337,7 +1306,6 @@ range-v3-vs2015:x64-uwp = skip range-v3-vs2015:x64-windows = skip range-v3-vs2015:x64-windows-static = skip range-v3-vs2015:x64-windows-static-md=skip -range-v3-vs2015:x64-windows-release=skip range-v3-vs2015:x86-windows = skip rapidstring:arm64-windows=fail rapidstring:arm-uwp=fail @@ -1380,7 +1348,6 @@ rest-rpc:x86-windows=skip rest-rpc:x64-windows=skip rest-rpc:x64-windows-static=skip rest-rpc:x64-windows-static-md=skip -rest-rpc:x64-windows-release=skip rest-rpc:x64-uwp=skip rest-rpc:arm-uwp=skip rest-rpc:arm64-windows=skip @@ -1471,7 +1438,6 @@ shogun:x64-uwp = skip shogun:x64-windows = skip shogun:x64-windows-static = skip shogun:x64-windows-static-md=skip -shogun:x64-windows-release=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail @@ -1560,7 +1526,6 @@ theia:x64-uwp = skip theia:x64-windows = skip theia:x64-windows-static = skip theia:x64-windows-static-md=skip -theia:x64-windows-release=skip theia:x86-windows = skip tidy-html5:arm-uwp=fail tidy-html5:x64-uwp=fail @@ -1646,7 +1611,6 @@ vxl:x64-uwp = skip vxl:x64-windows = skip vxl:x64-windows-static = skip vxl:x64-windows-static-md=skip -vxl:x64-windows-release=skip vxl:x86-windows = skip wampcc:arm64-windows=fail wildmidi:x64-osx=fail @@ -1660,7 +1624,6 @@ winpcap:x64-uwp = skip winpcap:x64-windows = skip winpcap:x64-windows-static = skip winpcap:x64-windows-static-md=skip -winpcap:x64-windows-release=skip winpcap:x86-windows = skip winreg:x64-linux=fail winreg:x64-osx=fail @@ -1670,8 +1633,6 @@ wintoast:arm-uwp=fail wintoast:x64-linux=fail wintoast:x64-osx=fail wintoast:x64-uwp=fail -workflow:x64-uwp=fail -workflow:arm-uwp=fail wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail @@ -1697,7 +1658,6 @@ xmsh:x64-osx=skip xmsh:x64-uwp=skip xmsh:x64-windows-static=skip xmsh:x64-windows-static-md=skip -xmsh:x64-windows-release=skip xmsh:x64-windows=skip xmsh:x86-windows=skip yajl:arm-uwp=fail @@ -1732,7 +1692,6 @@ ctp:x64-uwp=skip ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x64-windows-static-md=skip -ctp:x64-windows-release=skip ctp:x86-windows=skip protozero:arm-uwp=fail protozero:x64-uwp=fail @@ -1742,7 +1701,6 @@ clapack:x64-linux=skip clapack:x64-osx=skip clapack:x64-windows-static=skip clapack:x64-windows-static-md=skip -clapack:x64-windows-release=skip clapack:x64-windows=skip clapack:x86-windows=skip clapack:x64-uwp=skip @@ -1757,6 +1715,7 @@ chromium-base:x64-windows-static-md=fail clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail gmp:x64-windows-static-md=fail +ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail libspatialite:x64-windows-static-md=fail @@ -1772,10 +1731,12 @@ sentencepiece:x64-windows-static-md=fail symengine:x64-windows-static-md=fail teemo:x64-windows-static-md=fail unicorn:x64-windows-static-md=fail -usbmuxd:x64-windows-static-md=fail v8:x64-windows-static-md=fail yato:x64-windows-static-md=fail zyre:x64-windows-static-md=fail +usbmuxd:x64-windows-static-md=fail +workflow:x64-uwp=fail +workflow:arm-uwp=fail # wangle triggers an internal compiler error # https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1269468 @@ -1791,70 +1752,3 @@ dimcli:x64-windows-static=fail # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. cppgraphqlgen:x64-osx=fail - -# failures for x64-windows-release -pmdk:x64-windows-release=fail -qt5-x11extras:x64-windows-release=fail -libfreenect2:x64-windows-release=fail -libdshowcapture:x64-windows-release=fail -libgpod:x64-windows-release=fail -libodb:x64-windows-release=fail -numactl:x64-windows-release=fail -sfml:x64-windows-release=fail -pdal:x64-windows-release=fail -vulkan:x64-windows-release=fail -librttopo:x64-windows-release=fail -v8:x64-windows-release=fail -qpid-proton:x64-windows-release=fail -cppcms:x64-windows-release=fail -wildmidi:x64-windows-release=fail -gsoap:x64-windows-release=fail -dlfcn-win32:x64-windows-release=fail -nanorange:x64-windows-release=fail -freetype-gl:x64-windows-release=fail -intel-ipsec:x64-windows-release=fail -ccfits:x64-windows-release=fail -qca:x64-windows-release=fail -easyhook:x64-windows-release=fail -openni2:x64-windows-release=fail -chartdir:x64-windows-release=fail -duilib:x64-windows-release=fail -intel-mkl:x64-windows-release=fail -libbacktrace:x64-windows-release=fail -antlr4:x64-windows-release=fail -libwebsockets:x64-windows-release=fail -pangolin:x64-windows-release=fail -spdk-isal:x64-windows-release=fail -crashpad:x64-windows-release=fail -unrar:x64-windows-release=fail -fastcgi:x64-windows-release=fail -chromium-base:x64-windows-release=fail -libbf:x64-windows-release=fail -live555:x64-windows-release=fail -luasocket:x64-windows-release=fail -turbobase64:x64-windows-release=fail -opencascade:x64-windows-release=fail -protobuf-c:x64-windows-release=fail -zkpp:x64-windows-release=fail -unicorn:x64-windows-release=fail -wavpack:x64-windows-release=fail -libudns:x64-windows-release=fail -skia:x64-windows-release=fail -tmxparser:x64-windows-release=fail -python2:x64-windows-release=fail -farmhash:x64-windows-release=fail -celero:x64-windows-release=fail -isal:x64-windows-release=fail -opentracing:x64-windows-release=fail -moos-essential:x64-windows-release=fail -libevhtp:x64-windows-release=fail -sentencepiece:x64-windows-release=fail -readosm:x64-windows-release=fail -rtlsdr:x64-windows-release=fail -boost-regex:x64-windows-release=fail -mdnsresponder:x64-windows-release=fail -openmesh:x64-windows-release=fail -keystone:x64-windows-release=fail -pfring:x64-windows-release=fail -gstreamer:x64-windows-release=fail -freerdp:x64-windows-release=fail From 22112d4ef1c4b6219e47b444d16ff500ebdfc8ca Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 24 Sep 2021 09:06:15 +0200 Subject: [PATCH 49/58] [tensorflow-common] bump version --- ports/tensorflow-common/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index 51d3fa8558abcd..f9a085f25e0e6a 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow-common", "version-semver": "2.4.1", - "port-version": 5, + "port-version": 6, "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } From c9370de1aeebfc51c167c0d9bc1cc7446854cb6c Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 24 Sep 2021 09:07:02 +0200 Subject: [PATCH 50/58] [tensorflow-common] fix references --- versions/baseline.json | 2 +- versions/t-/tensorflow-common.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 826ac0a4dc0be4..b7c98be34b3cca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6418,7 +6418,7 @@ }, "tensorflow-common": { "baseline": "2.4.1", - "port-version": 5 + "port-version": 6 }, "tensorpipe": { "baseline": "2021-04-26", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index a647b39e35f863..91a1d53e72881a 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9b2886f444ffdfc87fe3b2038f5ba44a932e1b6", + "version-semver": "2.4.1", + "port-version": 6 + }, { "git-tree": "2160d070413af839dbe9da331350e34c91352e11", "version-semver": "2.4.1", From 1f28a1ebb9c3df5cf7533e34fb3abdbbea9e7575 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 28 Sep 2021 12:25:55 -0700 Subject: [PATCH 51/58] Fix version database for boost-modular-build-helper. --- ports/boost-modular-build-helper/vcpkg.json | 1 + versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 63251aa3c46d47..e81e9a0fce0b15 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", + "port-version": 1, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 6d8bd59a618190..f47d86e071658a 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e535d880b8c1c6b29a187a24dbf6b4fae2b74c63", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "b14ac826c44c030a65af10732269f379b856f76f", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 311ec811ec7df8..f3441c4d084e84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -806,7 +806,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-move": { "baseline": "1.77.0", From 21a7836ab275350f4dfd6c8103dfe7a0628cf9d7 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 3 Nov 2021 09:04:37 +0100 Subject: [PATCH 52/58] fix references --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 22 ++++++++++----------- versions/d-/detours.json | 2 +- versions/l-/libffi.json | 2 +- versions/x-/x264.json | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index ef9108decadccb..129b696eb1b2b5 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de30eaeb88a51d7656cb0479f2f9cb6cd911b783", + "version": "1.77.0", + "port-version": 5 + }, { "git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6f0253f9f57eb6..38213674b756c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -822,7 +822,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 4 + "port-version": 5 }, "boost-move": { "baseline": "1.77.0", @@ -1214,7 +1214,7 @@ }, "calceph": { "baseline": "3.5.0", - "port-version": 0 + "port-version": 1 }, "camport3": { "baseline": "1.5.3", @@ -3038,7 +3038,7 @@ }, "kf5config": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5configwidgets": { "baseline": "5.84.0", @@ -3074,7 +3074,7 @@ }, "kf5holidays": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5i18n": { "baseline": "5.84.0", @@ -3118,7 +3118,7 @@ }, "kf5plotting": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5service": { "baseline": "5.84.0", @@ -3126,7 +3126,7 @@ }, "kf5solid": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5sonnet": { "baseline": "5.84.0", @@ -3298,7 +3298,7 @@ }, "libbacktrace": { "baseline": "2021-03-14", - "port-version": 0 + "port-version": 1 }, "libbf": { "baseline": "1.0.0", @@ -3538,7 +3538,7 @@ }, "libjpeg-turbo": { "baseline": "2.0.6", - "port-version": 2 + "port-version": 3 }, "libjuice": { "baseline": "0.9.1", @@ -3622,7 +3622,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 8 + "port-version": 9 }, "libmorton": { "baseline": "0.2.8", @@ -4790,11 +4790,11 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 5 + "port-version": 6 }, "ogre-next": { "baseline": "2019-10-20", - "port-version": 2 + "port-version": 3 }, "ois": { "baseline": "1.5", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index d5b7471a31a528..5ba5b794d4b5ec 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5399f9185e9e7d815bf3c8380e745b5be77c2258", + "git-tree": "9e69332d3a6a308e3be865f253f5c2c66b305853", "version-string": "4.0.1", "port-version": 4 }, diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index 5454fe15be112d..6736bf581ab9fb 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e", + "git-tree": "f0d4da1612020d25e50bbf6b751442939d6eccf6", "version": "3.4.2", "port-version": 2 }, diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 7ca11279e98699..c43ba6bfcc6d12 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e8f14328cb425b2a7450bf36f731f97d41564fed", + "git-tree": "c1a4e78364914c00c356b7b13a48883d1c772605", "version-string": "157-303c484ec828ed0", "port-version": 16 }, From c39073c3ae8246180eea90d7fce2ade40c5137dc Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 19 Nov 2021 12:42:44 +0100 Subject: [PATCH 53/58] restore CRLF on some ports --- .../user-config.jam.in | 122 +++++++++--------- ports/libmodplug/portfile.cmake | 60 ++++----- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/ports/boost-modular-build-helper/user-config.jam.in b/ports/boost-modular-build-helper/user-config.jam.in index 90bd46af3e2f90..fbd6f8d36e5e0b 100644 --- a/ports/boost-modular-build-helper/user-config.jam.in +++ b/ports/boost-modular-build-helper/user-config.jam.in @@ -1,61 +1,61 @@ -import toolset ; - -using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLSET_INVOCATION_COMMAND@ - : -@USER_CONFIG_TOOLSET_OPTIONS@ - ; - -@USER_CONFIG_EXTRA_LINES@ - -if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel" -{ - using mpi : : - "@CURRENT_INSTALLED_DIR@/lib" - "@CURRENT_INSTALLED_DIR@/include" - msmpi ; -} - -project user-config : ; - -if "@USER_CONFIG_TOOLSET@" = "msvc" -{ - lib advapi32 ; - - lib icuuc : : "@CURRENT_INSTALLED_DIR@/lib/icuuc.lib" release : : advapi32 ; - lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" debug : : advapi32 ; - - lib icuin : : "@CURRENT_INSTALLED_DIR@/lib/icuin.lib" release : : ; - lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" debug : : ; - - lib icudt : : "@CURRENT_INSTALLED_DIR@/lib/icudt.lib" release : : ; - lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" debug : : ; -} -else -{ - if "@CMAKE_SYSTEM_NAME@" = "Windows" # We are hopelessly stuck inside boost-modular-build-helper, only this works - { - lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuuc : : icuucd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - - lib icuin : : icuin "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuin : : icuind "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - - lib icudt : : icudt "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icudt : : icudtd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - } - else - { - lib dl ; - lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : dl ; - lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : dl ; - - lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - - lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/lib" release : : ; - lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; - } -} - -lib iconv : : "@VCPKG_ICONV_LIBRARY_RELEASE@" shared shared release : : ; -lib iconv : : "@VCPKG_ICONV_LIBRARY_DEBUG@" shared shared debug : : ; +import toolset ; + +using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLSET_INVOCATION_COMMAND@ + : +@USER_CONFIG_TOOLSET_OPTIONS@ + ; + +@USER_CONFIG_EXTRA_LINES@ + +if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel" +{ + using mpi : : + "@CURRENT_INSTALLED_DIR@/lib" + "@CURRENT_INSTALLED_DIR@/include" + msmpi ; +} + +project user-config : ; + +if "@USER_CONFIG_TOOLSET@" = "msvc" +{ + lib advapi32 ; + + lib icuuc : : "@CURRENT_INSTALLED_DIR@/lib/icuuc.lib" release : : advapi32 ; + lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuucd.lib" debug : : advapi32 ; + + lib icuin : : "@CURRENT_INSTALLED_DIR@/lib/icuin.lib" release : : ; + lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib/icuind.lib" debug : : ; + + lib icudt : : "@CURRENT_INSTALLED_DIR@/lib/icudt.lib" release : : ; + lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib/icudtd.lib" debug : : ; +} +else +{ + if "@CMAKE_SYSTEM_NAME@" = "Windows" # We are hopelessly stuck inside boost-modular-build-helper, only this works + { + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuuc : : icuucd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icuin : : icuin "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuin : : icuind "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icudt : : icudt "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icudt : : icudtd "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } + else + { + lib dl ; + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/lib" release : : dl ; + lib icuuc : : icuuc "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : dl ; + + lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icuin : : icui18n "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + + lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/lib" release : : ; + lib icudt : : icudata "@CURRENT_INSTALLED_DIR@/debug/lib" debug : : ; + } +} + +lib iconv : : "@VCPKG_ICONV_LIBRARY_RELEASE@" shared shared release : : ; +lib iconv : : "@VCPKG_ICONV_LIBRARY_DEBUG@" shared shared debug : : ; diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 50cc3d6dd715cd..b4fef7b053a015 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -1,30 +1,30 @@ -set(MODPLUG_HASH 5a39f5913d07ba3e61d8d5afdba00b70165da81d) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(STATIC_PATCH "001-automagically-define-modplug-static.patch") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Konstanty/libmodplug - REF ${MODPLUG_HASH} - SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1 - PATCHES - ${STATIC_PATCH} - 002-detect_sinf.patch - 003-use-static-cast-for-ctype.patch - 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 - 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 -) - -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +set(MODPLUG_HASH 5a39f5913d07ba3e61d8d5afdba00b70165da81d) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_PATCH "001-automagically-define-modplug-static.patch") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Konstanty/libmodplug + REF ${MODPLUG_HASH} + SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1 + PATCHES + ${STATIC_PATCH} + 002-detect_sinf.patch + 003-use-static-cast-for-ctype.patch + 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 + 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 +) + +vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 1a7895e5d889b8150811e67e8330eb4470a30685 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 19 Nov 2021 12:44:50 +0100 Subject: [PATCH 54/58] bump versions --- ports/boost-modular-build-helper/vcpkg.json | 2 +- ports/kf5solid/vcpkg.json | 2 +- ports/libmodplug/vcpkg.json | 2 +- ports/x264/vcpkg.json | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index a4292b000ad91c..4d9b2854259c57 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 5, + "port-version": 6, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index f2924d6642acc6..7244488c0afbab 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5solid", "version": "5.84.0", - "port-version": 3, + "port-version": 4, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index d5c841955434f3..e10136bd98df24 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodplug", "version-string": "0.8.9.0", - "port-version": 9, + "port-version": 10, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", "supports": "!uwp" diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index a36254294eaec6..82e50e3c67579b 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,6 +1,7 @@ { "name": "x264", "version-string": "164-5db6aa6cab1b146", + "port-version": 1, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://github.com/mirror/x264", "supports": "!arm", From 981287f1fd4f462434274f890a501d62ca0399c3 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 19 Nov 2021 12:44:59 +0100 Subject: [PATCH 55/58] fix references --- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 8 ++++---- versions/k-/kf5solid.json | 5 +++++ versions/l-/libmodplug.json | 5 +++++ versions/x-/x264.json | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 129b696eb1b2b5..58006ce175bcdc 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64399e39acddab04270fc8b8dca8c4b50b0e810f", + "version": "1.77.0", + "port-version": 6 + }, { "git-tree": "de30eaeb88a51d7656cb0479f2f9cb6cd911b783", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 827f52c8d399a4..9a33475d4b55a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 5 + "port-version": 6 }, "boost-move": { "baseline": "1.77.0", @@ -3138,7 +3138,7 @@ }, "kf5solid": { "baseline": "5.84.0", - "port-version": 3 + "port-version": 4 }, "kf5sonnet": { "baseline": "5.84.0", @@ -3654,7 +3654,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 9 + "port-version": 10 }, "libmorton": { "baseline": "0.2.8", @@ -7222,7 +7222,7 @@ }, "x264": { "baseline": "164-5db6aa6cab1b146", - "port-version": 0 + "port-version": 1 }, "x265": { "baseline": "3.4", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index 0691de71027e47..8fb026f54d69b0 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c3d7f2bab233357fa39e099d6054cc98ed6db99", + "version": "5.84.0", + "port-version": 4 + }, { "git-tree": "77af969f1b19c937d7f41651b657a774cd3802c7", "version": "5.84.0", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index a342cd4762cdf8..453fcf89273518 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e8d479e517925aad0ed5049b8cbafd1f6d9029c", + "version-string": "0.8.9.0", + "port-version": 10 + }, { "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b", "version-string": "0.8.9.0", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 20454b471ef407..16092409159a4e 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18f036511871575852d74ac4b2bedc4faf33a020", + "version-string": "164-5db6aa6cab1b146", + "port-version": 1 + }, { "git-tree": "2280334f1235046e20f80586b7d83893f52b23b7", "version-string": "164-5db6aa6cab1b146", From 659022bc43f9582c18b4b89641506988d98c04f6 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 17 Dec 2021 15:04:27 +0100 Subject: [PATCH 56/58] bump port versions --- ports/kf5config/vcpkg.json | 1 + ports/kf5holidays/vcpkg.json | 1 + ports/kf5plotting/vcpkg.json | 1 + ports/tensorflow-common/vcpkg.json | 1 + ports/x264/vcpkg.json | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 2e3c6fe3b6aa7c..62f993d997a194 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5config", "version": "5.89.0", + "port-version": 1, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 5055e2a83a030e..67ba469d7ec0ad 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5holidays", "version": "5.89.0", + "port-version": 1, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 6a085aacc18510..314db70e4e9a69 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.89.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index dc23ce51725969..18008bbc24aa7f 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorflow-common", "version-semver": "2.7.0", + "port-version": 1, "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 82e50e3c67579b..69751e289fc978 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x264", "version-string": "164-5db6aa6cab1b146", - "port-version": 1, + "port-version": 2, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://github.com/mirror/x264", "supports": "!arm", From 4cc5413f2edfc89f6bf9db7f2312a3e38eab1591 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 17 Dec 2021 15:04:40 +0100 Subject: [PATCH 57/58] fix references --- versions/baseline.json | 10 +++++----- versions/k-/kf5config.json | 5 +++++ versions/k-/kf5holidays.json | 5 +++++ versions/k-/kf5plotting.json | 5 +++++ versions/t-/tensorflow-common.json | 5 +++++ versions/x-/x264.json | 5 +++++ 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index b07389267001a4..be329382430322 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3070,7 +3070,7 @@ }, "kf5config": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5configwidgets": { "baseline": "5.89.0", @@ -3106,7 +3106,7 @@ }, "kf5holidays": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5i18n": { "baseline": "5.89.0", @@ -3150,7 +3150,7 @@ }, "kf5plotting": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5service": { "baseline": "5.89.0", @@ -6702,7 +6702,7 @@ }, "tensorflow-common": { "baseline": "2.7.0", - "port-version": 0 + "port-version": 1 }, "tensorpipe": { "baseline": "2021-04-26", @@ -7302,7 +7302,7 @@ }, "x264": { "baseline": "164-5db6aa6cab1b146", - "port-version": 1 + "port-version": 2 }, "x265": { "baseline": "3.4", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 7f60f58102afb3..7dc0a0490f142e 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9f1de88c7229d69152cc5abcfa855bfef7489d4", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "b8cf3131bfc3810be865d269b9873e08b36ed0ca", "version": "5.89.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 82a72f220e5c53..19149e66bbd4bd 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f4bcc1998abd227534b5db00e18ac6c1bab9edf", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "91ecdfa6bebbaf14e316af8763d3a355eb2d5108", "version": "5.89.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index a5fd11df74079b..76fce1b9b26797 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dffeb5e6db0b7e9743c9a1b300ac48a78577f77", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "18344c8d460769664a1644a9c0bbca283766b2aa", "version": "5.89.0", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index a7797048467249..245122ad4fc0ed 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f74a7fc1035059bfca5bbb51d176155daacd758", + "version-semver": "2.7.0", + "port-version": 1 + }, { "git-tree": "eb9e0e1345847b72eccecd5a6b85a441f034e1a7", "version-semver": "2.7.0", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 381e5fa4adee89..da43dcce377694 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c449395a31c61601c5313e4f3e6040bee9c67fde", + "version-string": "164-5db6aa6cab1b146", + "port-version": 2 + }, { "git-tree": "8d6c7ba5815a0683a2915df5f95de5d06e938781", "version-string": "164-5db6aa6cab1b146", From 5793a2aa1c0a3b8e0ec31c272134e2851c28e3ae Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 17 Dec 2021 14:22:48 -0500 Subject: [PATCH 58/58] boost-modular-build-helper: Reverted due to no changes. detours, kf5config, kf5holidays, libbacktrace: Reverted due to only whitespace changes. libffi: bumped port-version libmodplug: reverted due to no functional changes ogre, ogre-next: reverted due to incorrect case of "Debug" vs. "Release" already fixed in master. And rebuilt version database. --- ports/boost-modular-build-helper/vcpkg.json | 2 +- ports/detours/portfile.cmake | 2 +- ports/kf5config/portfile.cmake | 96 ++++++++++----------- ports/kf5config/vcpkg.json | 1 - ports/kf5holidays/portfile.cmake | 60 ++++++------- ports/kf5holidays/vcpkg.json | 1 - ports/kf5plotting/portfile.cmake | 4 +- ports/kf5plotting/vcpkg.json | 1 - ports/libbacktrace/vcpkg.json | 1 - ports/libffi/vcpkg.json | 2 +- ports/libmodplug/portfile.cmake | 2 +- ports/libmodplug/vcpkg.json | 2 +- ports/ogre-next/portfile.cmake | 4 +- ports/ogre-next/vcpkg.json | 2 +- ports/ogre/portfile.cmake | 6 +- ports/ogre/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 10 --- versions/baseline.json | 18 ++-- versions/d-/detours.json | 2 +- versions/k-/kf5config.json | 5 -- versions/k-/kf5holidays.json | 5 -- versions/k-/kf5plotting.json | 5 -- versions/l-/libbacktrace.json | 5 -- versions/l-/libffi.json | 7 +- versions/l-/libmodplug.json | 5 -- versions/o-/ogre-next.json | 5 -- versions/o-/ogre.json | 5 -- 27 files changed, 107 insertions(+), 153 deletions(-) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 4d9b2854259c57..9daad0988434fa 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 6, + "port-version": 4, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake index cafa8e22b9dbeb..c09d61b7f84732 100644 --- a/ports/detours/portfile.cmake +++ b/ports/detours/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( REF v4.0.1 SHA512 0a9c21b8222329add2de190d2e94d99195dfa55de5a914b75d380ffe0fb787b12e016d0723ca821001af0168fd1643ffd2455298bf3de5fdc155b3393a3ccc87 HEAD_REF master - PATCHES + PATCHES find-jmp-bounds-arm64.patch ) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index f89b2fec757727..3abf465951cb2b 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -1,48 +1,48 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kconfig - REF v5.89.0 - SHA512 5b61812cd8b1d4cbbcc97e4ae350f5e46de9e7d73e3c68e3fbea3a2bad6a6be104c111ddcab9696593b60d34f74f3d4d7f828f54ad8d1f7b3408925b4bc51640 - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_LIBEXECDIR=bin -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config) -vcpkg_copy_pdbs() - -vcpkg_copy_tools( - TOOL_NAMES kreadconfig5 kwriteconfig5 - AUTO_CLEAN -) - -if(NOT VCPKG_TARGET_IS_WINDOWS) - set(LIBEXEC_SUBFOLDER "kf5/") -endif() - -vcpkg_copy_tools( - TOOL_NAMES kconf_update kconfig_compiler_kf5 - SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}" - AUTO_CLEAN -) - -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kconfig + REF v5.89.0 + SHA512 5b61812cd8b1d4cbbcc97e4ae350f5e46de9e7d73e3c68e3fbea3a2bad6a6be104c111ddcab9696593b60d34f74f3d4d7f828f54ad8d1f7b3408925b4bc51640 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_LIBEXECDIR=bin +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kreadconfig5 kwriteconfig5 + AUTO_CLEAN +) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(LIBEXEC_SUBFOLDER "kf5/") +endif() + +vcpkg_copy_tools( + TOOL_NAMES kconf_update kconfig_compiler_kf5 + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}" + AUTO_CLEAN +) + +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 62f993d997a194..2e3c6fe3b6aa7c 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5config", "version": "5.89.0", - "port-version": 1, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 5fdd4a570de98d..df9d162c8ce21d 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -1,30 +1,30 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO KDE/kholidays - REF v5.89.0 - SHA512 df5a68c9faf2c05b30b161f2e9f363f252be2efd9ec89787a88952fecb91d36b0187e9c88bdedde6887086f5ead4aa5d6ff627c9ea267cd447d5d7ad938b5d65 - HEAD_REF master -) - -# Prevent KDEClangFormat from writing to source effectively blocking parallel configure -file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DKDE_INSTALL_QMLDIR=qml -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays) -vcpkg_copy_pdbs() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kholidays + REF v5.89.0 + SHA512 df5a68c9faf2c05b30b161f2e9f363f252be2efd9ec89787a88952fecb91d36b0187e9c88bdedde6887086f5ead4aa5d6ff627c9ea267cd447d5d7ad938b5d65 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 67ba469d7ec0ad..5055e2a83a030e 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5holidays", "version": "5.89.0", - "port-version": 1, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index c3de67708d3cc6..cd05b7ff557d72 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -20,9 +20,7 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Plotting CONFIG_PATH lib/cmake/KF5Plott vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if (NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") -endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 314db70e4e9a69..6a085aacc18510 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5plotting", "version": "5.89.0", - "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/libbacktrace/vcpkg.json b/ports/libbacktrace/vcpkg.json index ec58bfeab93aad..7b6b32b53b710d 100644 --- a/ports/libbacktrace/vcpkg.json +++ b/ports/libbacktrace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libbacktrace", "version-date": "2021-03-14", - "port-version": 1, "description": "The libbacktrace library may be linked into a program or library and used to produce symbolic backtraces.", "homepage": "https://github.com/ianlancetaylor/libbacktrace" } diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 4525cee7b98bae..83130d841f47b6 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libffi", "version": "3.4.2", - "port-version": 2, + "port-version": 4, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", "dependencies": [ diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index b4fef7b053a015..a7af03816114d3 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -4,7 +4,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(STATIC_PATCH "001-automagically-define-modplug-static.patch") endif() -vcpkg_from_github( +vcpkg_from_github(ARCHIVE OUT_SOURCE_PATH SOURCE_PATH REPO Konstanty/libmodplug REF ${MODPLUG_HASH} diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index e10136bd98df24..d5c841955434f3 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodplug", "version-string": "0.8.9.0", - "port-version": 10, + "port-version": 9, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", "supports": "!uwp" diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 3c38326447b512..02f147ab85b963 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -90,7 +90,7 @@ endif() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) @@ -98,7 +98,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index 7a41899efd87fa..a729f0bfd84319 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre-next", "version-string": "2019-10-20", - "port-version": 3, + "port-version": 2, "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "dependencies": [ diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 25a44bef2228a1..c14da2fac93b22 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 java OGRE_BUILD_COMPONENT_JAVA python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + csharp OGRE_BUILD_COMPONENT_CSHARP overlay OGRE_BUILD_COMPONENT_OVERLAY zziplib OGRE_CONFIG_ENABLE_ZIP strict OGRE_RESOURCEMANAGER_STRICT @@ -99,7 +99,7 @@ endif() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) @@ -107,7 +107,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 279c70699b6298..d084653e719bfb 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version-string": "1.12.9", - "port-version": 6, + "port-version": 5, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "dependencies": [ diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 58006ce175bcdc..ef9108decadccb 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,15 +1,5 @@ { "versions": [ - { - "git-tree": "64399e39acddab04270fc8b8dca8c4b50b0e810f", - "version": "1.77.0", - "port-version": 6 - }, - { - "git-tree": "de30eaeb88a51d7656cb0479f2f9cb6cd911b783", - "version": "1.77.0", - "port-version": 5 - }, { "git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8819f3f6b7efe5..19992247d81f91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -826,7 +826,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 6 + "port-version": 4 }, "boost-move": { "baseline": "1.77.0", @@ -3070,7 +3070,7 @@ }, "kf5config": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 0 }, "kf5configwidgets": { "baseline": "5.89.0", @@ -3106,7 +3106,7 @@ }, "kf5holidays": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 0 }, "kf5i18n": { "baseline": "5.89.0", @@ -3150,7 +3150,7 @@ }, "kf5plotting": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 0 }, "kf5service": { "baseline": "5.89.0", @@ -3342,7 +3342,7 @@ }, "libbacktrace": { "baseline": "2021-03-14", - "port-version": 1 + "port-version": 0 }, "libbf": { "baseline": "1.0.0", @@ -3454,7 +3454,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 2 + "port-version": 4 }, "libfido2": { "baseline": "1.7.0", @@ -3678,7 +3678,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 10 + "port-version": 9 }, "libmorton": { "baseline": "0.2.8", @@ -4862,11 +4862,11 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 6 + "port-version": 5 }, "ogre-next": { "baseline": "2019-10-20", - "port-version": 3 + "port-version": 2 }, "ois": { "baseline": "1.5.1", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index 5ba5b794d4b5ec..d5b7471a31a528 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9e69332d3a6a308e3be865f253f5c2c66b305853", + "git-tree": "5399f9185e9e7d815bf3c8380e745b5be77c2258", "version-string": "4.0.1", "port-version": 4 }, diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 7dc0a0490f142e..7f60f58102afb3 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "f9f1de88c7229d69152cc5abcfa855bfef7489d4", - "version": "5.89.0", - "port-version": 1 - }, { "git-tree": "b8cf3131bfc3810be865d269b9873e08b36ed0ca", "version": "5.89.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 19149e66bbd4bd..82a72f220e5c53 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "9f4bcc1998abd227534b5db00e18ac6c1bab9edf", - "version": "5.89.0", - "port-version": 1 - }, { "git-tree": "91ecdfa6bebbaf14e316af8763d3a355eb2d5108", "version": "5.89.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 76fce1b9b26797..a5fd11df74079b 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "4dffeb5e6db0b7e9743c9a1b300ac48a78577f77", - "version": "5.89.0", - "port-version": 1 - }, { "git-tree": "18344c8d460769664a1644a9c0bbca283766b2aa", "version": "5.89.0", diff --git a/versions/l-/libbacktrace.json b/versions/l-/libbacktrace.json index 001a31890859ab..252be58df8d087 100644 --- a/versions/l-/libbacktrace.json +++ b/versions/l-/libbacktrace.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "a58a5d37a98b80856dca2a3f7aa643cb00361710", - "version-date": "2021-03-14", - "port-version": 1 - }, { "git-tree": "8772967fbaa6b8840266c0d04a6daccc78b44c3d", "version-date": "2021-03-14", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index 6736bf581ab9fb..f69e9547616907 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "f0d4da1612020d25e50bbf6b751442939d6eccf6", + "git-tree": "05f73f7c0bbd49045d312d90683a01405f5ffd83", + "version": "3.4.2", + "port-version": 4 + }, + { + "git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e", "version": "3.4.2", "port-version": 2 }, diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index 453fcf89273518..a342cd4762cdf8 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "5e8d479e517925aad0ed5049b8cbafd1f6d9029c", - "version-string": "0.8.9.0", - "port-version": 10 - }, { "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b", "version-string": "0.8.9.0", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 4be1ea0342945a..88181a1f30e37c 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "457080b04371353bccb20a026d9796a1f4d697c0", - "version-string": "2019-10-20", - "port-version": 3 - }, { "git-tree": "8d2e2e06d0b21779df8bd6579387805dc06ca6ff", "version-string": "2019-10-20", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 8bd0871b669908..5dd8f1b76d14f4 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "483fa8a5804bf15f26fbd9c505c7f3b23d30f551", - "version-string": "1.12.9", - "port-version": 6 - }, { "git-tree": "322b9a5290ce1656aa66b684b07d1e327b18eeeb", "version-string": "1.12.9",