Commit Graph

1910 Commits

Author SHA1 Message Date
Kai Pastor
ce73eebf08
[geos] Update to 3.10.0 (#21051)
* Update geos to 3.10.0

* Enable geos on uwp

* Update versions

* Fix mingw build

* Fix deinstallation

* Update versions
2021-11-09 10:10:08 -08:00
Osyotr
52fd7e4a64
[vcpkg-cmake-config] Fix parsing of NO_PREFIX_CORRECTION (#21062) 2021-11-08 21:29:35 -08:00
chausner
79a943954d
[ois] Update to 1.5.1 (#21244)
* Update ois to 1.5.1

* Update CI baseline

* Fix typo

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Add "supports", remove entries from CI baseline

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-11-08 20:43:34 -08:00
Jack·Boos·Yu
cf308f37ce
[script audit] Meson buildsystem (#21026)
* [script audit] Meson buildsystem

* Apply suggestions, fix build

* Fix non-Windows build

* Fix debug path in meson config

* Fix env pkgconfig path

* Apply suggestions

* Nicole's CRs

* oops

* Apply suggestions

* final changes

* fix typoes

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-11-08 12:27:18 -08:00
Jack·Boos·Yu
66c39e113a
[scripts-audit] QMake buildsystem (#20322)
* [scripts-audit] QMake buildsystem

* Apply suggestions

* Change qt5-base as a host port

* version

* Fix installation

* Apply suggestions

* Update doc

* Typo

* update doc

* Fix bug

* fix vcpkg_host_path_list issue

* Process more host path

* Apply suggestions

* Apply suggestions

* Apply suggestions from code review

* more changes

* Apply suggestions

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-11-05 16:55:23 -07:00
nicole mazzuca
297f1b8ea0
[scripts-audit] CMake buildsystem (#20885)
* [scripts-audit] vcpkg_configure_cmake

Start auditing vcpkg_configure_cmake

* [scripts-audit] vcpkg_build_cmake

* [scripts-audit] vcpkg_install_cmake

* wow that was a dumb bug

* fix x86 configure, fix `if` guidelines

* Billy's CRs

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-11-05 16:55:14 -07:00
nicole mazzuca
efdf9346ab
[scripts-audit] nmake buildsystem (#20987)
* [scripts-audit] vcpkg_install_nmake

* [scripts-audit] vcpkg_build_nmake

hoping not to make too many changes, just minor simplifications

* is this the issue with gdal?

* back-compat hack woot

* remove port-specific workaround

* dg0yt CR
2021-11-05 16:55:01 -07:00
NancyLi1013
41d944f701
[getdns/flint/arb] Update to the latest version (#20050)
* [getdns/flint] Update to the latest version

* [getdns/flint] Update to the latest version

* [flint] Add unsupported on uwp

* Update version files

* [flint] Handle dllimport macro in header files

* [arb] Update to 2.21.0

* [arb] Update to 2.2.1 and use upstream CMakeLists.txt

* [arb] App patch

* Update versions/a-/arb.json
2021-11-05 16:09:43 -07:00
autoantwort
cb1db07258
[vcpkg_download_distfile] allow uppercase SHA512 (#21157) 2021-11-05 14:23:33 -07:00
Alexander Smyslov
0032024513
[librdkafka] Upgrade up to 1.8.2 (#21111)
* Add files via upload

* [new port] avro-cpp

* add boost-format

* remove comments

* remove comments

* [librdkafka] Upgrade up to 1.8.2

* [librdkafka] Upgrade up to 1.8.2

* fix remarks

* fix remarks

* fix remarks

* Update ports/librdkafka/vcpkg.json

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/librdkafka/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* fix remarks

* fix remarks

* fix remarks

* fix remarks

* fix remarks

Co-authored-by: Alexander Smyslov <aleksandr.smyslov@libertexgroup.com>
Co-authored-by: Smyslov Alexander Nikolayevich <aleksandr.smyslov@fxclub.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
2021-11-04 12:17:46 -07:00
chausner
508383cdd4
[clblast] Update to 1.5.2 (#20915)
* Update clblast to 1.5.2

* Update CI baseline

* Disable static builds

* Update git-tree hash

* Remove entries from ci.baseline.txt.

* update version

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
2021-11-03 21:44:42 -07:00
nicole mazzuca
bad2c589d5
[vcpkg_host_path_list] add SET subcommand (#20879)
* [vcpkg_host_path_list] add SET subcommand

* update docs

* try to do something that Billy might like more?

* wheee

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-11-03 21:42:05 -07:00
Kai Pastor
fdb593292c
[vcpkg] Always use an autotools build triplet (#18130)
* Always use a build triplet for mingw

* [vcpkg_configure_make] Always assume cross-compilation

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-11-03 21:29:29 -07:00
Stefano Sinigardi
7375bb408f
[NUGET] update to 5.11.0 (#21058)
* [NUGET] update to 5.11.0

* [nuget] update hash
2021-11-03 00:58:06 -07:00
Jack·Boos·Yu
975822a2a2
[vcpkg] Add aria2 as vcpkg required tool (step 1) (#20971)
* Add aria2 as vcpkg required tool

* Change exeRelativePath

* overwrite

* Fix typo

* Fix incorrect set

* Update scripts/vcpkgTools.xml

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-11-03 00:43:01 -07:00
Billy O'Neal
d0015f95d3
Update vcpkg-tool to 2021-11-02. (#21153) 2021-11-03 00:38:49 -07:00
Kai Pastor
eea02380aa
[ci] Remove unaffected ports from pull request builds (#21078)
* Rewrite to single invovation of 'vcpkg ci'

* Split caching args from common args

* Use parent hashes for pull request CI builds

* Completely switch to parent revision state and back
2021-11-01 12:18:28 -07:00
Billy O'Neal
5bdb9d6012
Update vcpkg tool, add windows-arm64, and download rather than build on some POSIX (#20838) 2021-10-29 22:39:14 -07:00
Alexander Neumann
fdac8bfc1b
[hwloc] Update to 2.5 and switch to make (#20905)
* hwloc try and error

* hwloc fix build.

* format manifest

* version stuff

* remove supports expression. Copy COPYING from src dir

* format manifest

* overwrite version

* update ci baseline
hpx uses _mm_pause which seems to be undefined on arm64
maybe hpx requires a supports field?

* switch to version in manifest

* version stuff

* add maintainer

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

* version stuff

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2021-10-27 23:05:10 -07:00
Victor Romero
75b6191dff
[vcpkg_download_distfile] Check SHA512 for already downloaded files (#20988)
* [vcpkg_download_distfile] Check SHA512 for already downloaded files

* [vcpkg_download_distfile] Respect SKIP_SHA512 to enable --head
2021-10-27 10:36:59 -07:00
Dawid Wróbel
8cbc51f36b
[Docs] vcpkg_copy_tools cleans only copied tools (#20940)
Clarify that AUTO_CLEAN only removes the executables previously copied, not all of them.
2021-10-26 23:44:43 -07:00
Dawid Wróbel
542693b300
[vcpkg_acquire_msys] Add gzip to default packages (#20393)
Fixes #20392
2021-10-26 22:24:18 -07:00
Phoebe
fbc74b00b1
[boost-modular-build-helper] Add quotes to path (#20896) 2021-10-21 22:43:44 -07:00
Billy O'Neal
4474aba1e7
[ci] Attempt to make CI more reliable by using robocopy to delete (#20889) 2021-10-20 22:51:29 -07:00
Jack·Boos·Yu
5283cdb370
[scripts-audit] Make buildsystem (#20165)
* [script-audit] Make buildsystem

* Fix wrongly merge

* Fix rename

* Format

* Apply suggestions

* Apply suggestion

* Fix bug

* Change the function names

* Fix command line

* Apply suggestions

* version

* typo

* Apply suggestions

* Fix bug

* Fix path

* Fix bug

* Fix un=parser code, move macros to the top

* Apply suggestions

* Update docs

* update doc

* CRLF

* add docs and add a PARENT_SCOPE

* Update doc

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-10-20 14:12:58 -07:00
Billy O'Neal
078f3e51ef
[ci] Skip attempting to upload failure logs if there is no failure logs directory. (#20826) 2021-10-18 15:04:49 -07:00
Billy O'Neal
f330f20100
[geogram] Remove ci.baseline.txt skip. (#20825)
Victor and I forgot to remove geogram from ci.baseline.txt in https://github.com/microsoft/vcpkg/pull/20778
2021-10-18 14:32:19 -07:00
Billy O'Neal
699c8779f1
[vcpkg] Update VMs for October Patch Tuesday and Server 2022 (#20730)
* Patch tuesday and switch to Server 2022.

* Update pools.
2021-10-16 12:14:53 -07:00
Victor Romero
c1bd850c62
[wildmidi] Change baseline to pass (#20731) 2021-10-15 20:29:08 -07:00
Yury Bura
1f5e8e4e9b
[boost] fix boost-mpi dependency (#20681)
* [boost] fix #20676

* update version
2021-10-13 14:50:03 -07:00
NancyLi1013
f978be6534
[ryml] Support osx (#20661)
* [ryml] Support osx

* Update deprecated functions

* Remove supports field
2021-10-12 17:09:17 -07:00
Jack·Boos·Yu
b8c39998ea
[vcpkg_from_github] Fix parse error on OSX (#20650) 2021-10-12 17:07:28 -07:00
Long Nguyen
193880f0a8
[vcpkg.cmake] Add default triplet for mingw compilers (#19020) 2021-10-12 11:30:40 -07:00
Kai Pastor
5fb4257c3c
[boost-modular-build-helper] Fixup mingw lib names (#20576)
* Fixup mingw lib names on windows

* Update versions

* Bump boost-modular-build-helper port-version.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-10-12 11:27:43 -07:00
Jack·Boos·Yu
143cfa363c
[vcpkg_configure_make] Fix environment variable _LINK_ (#20652) 2021-10-11 20:41:51 -07:00
Osyotr
9240fd0d8c
[boost-gil] remove dependency boost-filesystem (#20575)
* [boost-gil] remove dependency boost-filesystem
This dependency is optional and only used to build and run tests and examples.
See https://github.com/boostorg/gil#requirements
However, there is also BOOST_GIL_IO_ADD_FS_PATH_SUPPORT which enables
boost::filesystem::path support for IO functions, but since users have to define
it manually, they must install the dependency manually, too.

* fix spacing

* fix generate-ports.ps1

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-10-11 20:28:23 -07:00
NancyLi1013
ea4b8b17cd
[vcpkg baseline][rply] Skip all triplets check on ci for temporatory fix (#20653)
* [rply] Skip all triplets check on ci for temporatory fix

* Add x64-windows-static-md
2021-10-11 20:27:42 -07:00
Yury Bura
f904f7354d
[boost] bugfix and new features after update to 1.77.0 (#20432)
* [scripts/boost] fix issue #20417
[boost-iostreams] replace explicit dependencies with default-features, allow to disable compression filters

* add versions

* [scripts/boost] update port version after #20421

* [boost-odeint] move boost-mpi dependency to the feature

* add version

* [boost-modular-build-helper] rework user-config generation

* [boost-python] move python3 from explicit dependency to default feature

* [boost-modular-build-helper] update version

* add verions

* [boost-modular-build-helper] fix empty flags

* update version

* Fix compilation on Emscripten / WebAssembly (#20551)

* [opencv4,opencv3] Control exported protobuf dependency (#20550)

* Control exported protobuf dependency

* Update versions

* Control exported protobuf dependency

* Update versions

* [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422)

* [OpenMVS] restore deprecated cmake scripts

* [OpenMVS] fix references

* switch back to vcpkg_cmake_*

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

* [libffi] Don't replace string in file that doesn't exist. (#20554)

* Don't replace string in file that doesn't exist.

* Update per bot.

* Update per bot again.

* Address comments.

* [json-dto] Update to 0.2.14 (#20570)

* json-dto updated to v.0.2.14.

* json-dto-0.2.14 added to baseline.

* Change deprecated commands.

* Update baseline for fresh json-dto-0.2.14.

* [sail] Update to 0.9.0-pre17 (#20562)

* [sail] Update to 0.9.0-pre17

* [sail] vcpkg x-add-version --all --overwrite-version

* [sail] Update pre17 hash

* [sail] vcpkg x-add-version --all --overwrite-version

* [freexl] Update to 1.0.6 (#20520)

* Reformat portfile

* Minimize makefiles patch

* Update to 1.0.6

* Fix uwp builds, remove skip from baseline

* Install pc file for windows

* Update versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [dartsim] Update to 6.11.0 (#20566)

* Update dartsim

* Use newer vcpkg functions

* Update version number

* Update ports/dartsim/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update versions

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* [scripts/boost] update Boost version in boost-modular-build.cmake to avoid manual changes

* update version

* [boost-modular-build-helper] fix USER_CONFIG_EXTRA_LINES variable name and rename generated files

* update version

* Resolve differences from rerunning generate-ports.ps1.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Tobias Markus <tobbi.bugs@googlemail.com>
Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Lars Glud <larshg@gmail.com>
Co-authored-by: eao197 <eao197@users.noreply.github.com>
Co-authored-by: Dmitry Baryshev <dmitrymq@gmail.com>
Co-authored-by: Akash <Ace314159@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-10-11 18:21:08 -07:00
chausner
e29e78d835
Remove tmxlite from ci.baseline.txt (#20605)
UWP builds were fixed in #20492
2021-10-11 17:53:14 -07:00
Alexander Neumann
1d4128f08e
[qt] Fix qtmultimedia with gstreamer on windows (#20555)
* apply patches to make qtmultimedia work with gestreamer on windows

* version stuff

* remove libnice from ci.baseline

* move gstreamer on osx as fail to baseline

* add supports field to qtmultimedia. Qt does not officially support x86 on windows

* version stuff

* remove duplicated patch

* version stuff

* add upstream patch to fix x86-windows

* [skip actions] version stuff
2021-10-11 11:03:50 -07:00
Park DongHa
ad6bce211e
[farmhash] support Windows build (#20506)
* [farmhash] support windows build

* [farmhash] update baseline JSON

* [farmhash] patch from PR diff

* [farmhash] patch from all PR changes

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-10-11 10:28:01 -07:00
Michael Heyman
4ce045cdc2
[activemq-cpp] support linux (#19789)
@PhoebeHui

> * I think we need a discussion about unofficial being in the namespace

I still want to discuss this
2021-10-11 10:19:49 -07:00
Kai Pastor
ac030b40d5
[freexl] Update to 1.0.6 (#20520)
* Reformat portfile

* Minimize makefiles patch

* Update to 1.0.6

* Fix uwp builds, remove skip from baseline

* Install pc file for windows

* Update versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-10-07 03:56:57 -07:00
Adam Johnson
15dab6a762
[python3] Upgrade to Python 3.10.0 (#20519)
* [python3] Update to Python 3.10.0rc2 (for testing).

* [python3] Revert trivial patch changes.

* [python3] Bump to 3.10.0 final.

* x-add-version

* update python tools to 3.10.0

* [ecm] Add patch from upstream for Python 3.10.

Remove this on the next release.

* x-add-version

* [python3] Add patch to fix static interpreter.

* x-add-version
2021-10-06 12:53:06 -07:00
Pavel Kisliak
e1c8bbd3c6
[BitSerializer] Upgrade to new version 0.44 (#20544)
* [BitSerializer] Update to version 0.9

* [bitserializer] Update port to new version 0.44

* [bitserializer] Update deprecated VCPKG Cmake functions

* [bitserializer] Remove default features list

Co-authored-by: Pavel_Kisliak <Pavel_Kisliak@epam.com>
2021-10-06 11:17:26 -07:00
Billy O'Neal
ff5afbab34
[geogram, ccfits, chartdir] Build fixes discovered by CI on 2021-10-01 (#20518)
* REGRESSION: chartdir:x64-linux. If expected, add chartdir:x64-linux=fail to .\scripts\ci.baseline.txt.

-- Note: chartdir only supports dynamic library linkage. Building dynamic library.
-- Downloading http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz -> chartdir_cpp_linux_64-7.0.0.tar.gz...
[DEBUG] Feature flag 'binarycaching' unset
[DEBUG] Feature flag 'manifests' = off
[DEBUG] Feature flag 'compilertracking' unset
[DEBUG] Feature flag 'registries' unset
[DEBUG] Feature flag 'versions' unset
[DEBUG] popen(curl --fail -L "https://vcpkgassetcache.blob.core.windows.net/assets/e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa?sp=racwl&st=2021-06-29T20:09:46Z&se=2021-10-02T04:09:46Z&spr=https&sv=2020-08-04&sr=c&sig=g3shlIpD0R923OUzfIsrTwjX0vc6OzNXGEDO3URXmYc%3D" --create-dirs --output /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part 2>&1)
[DEBUG] cmd_execute_and_stream_data() returned 5632 after    31162 us
[DEBUG] popen(curl --fail -L http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz --create-dirs --output /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part 2>&1)
[DEBUG] cmd_execute_and_stream_data() returned 0 after  8512565 us
Error: Failed to download from mirror set:
https://vcpkgassetcache.blob.core.windows.net/assets/e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa?*** SECRET ***:   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (22) The requested URL returned error: 403 Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.

File does not have the expected hash:
             url : [ http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz ]
       File path : [ /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part ]
   Expected hash : [ e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa ]
     Actual hash : [ ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467 ]

Updated SHAs and added quotes. These are the changes made by upstream:

```
diff --git a/new_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp b/old_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp
index 79f15be..302eb78 100644
--- a/new_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp
+++ b/old_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp
@@ -108,7 +108,9 @@ void createChart(int chartIndex, const char *filename)
     const int dataZ_size = dataX_size * dataY_size;
     double dataZ[dataZ_size];
     for(int yIndex = 0; yIndex < dataY_size; ++yIndex) {
+        double y = dataY[yIndex];
         for(int xIndex = 0; xIndex < dataX_size; ++xIndex) {
+            double x = dataX[xIndex];
             dataZ[yIndex * dataX_size + xIndex] = dataX[xIndex] * dataY[yIndex];
         }
     }
@@ -176,7 +178,7 @@ void createChart(int chartIndex, const char *filename)
         // Use a DrawArea to load the image
         DrawArea* d = new DrawArea();
         d->load("maptexture.png");
-        d->resize(c->getPlotRegionWidth(), c->getPlotRegionDepth());
+        d->resize(240, 210);

         // Set the DrawArea as a resource
         c->setResource("texture", d);
diff --git a/new_sha/ChartDirector/lib/libchartdir.so.7.0.0 b/old_sha/ChartDirector/lib/libchartdir.so.7.0.0
index b1ea97f..bfb1d4b 100644
Binary files a/new_sha/ChartDirector/lib/libchartdir.so.7.0.0 and b/old_sha/ChartDirector/lib/libchartdir.so.7.0.0 differ
diff --git a/new_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp b/old_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp
index 5736d60..423120f 100644
--- a/new_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp
+++ b/old_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp
@@ -107,9 +107,9 @@ private:
     QCursor *hZoomOutCursor;
     QCursor *hNoZoomCursor;

-    QCursor &getZoomCursor(QCursor **cache, double scale, int flags)
+    QCursor &getZoomCursor(QCursor *cache, double scale, int flags)
     {
-        if (0 == *cache)
+        if (0 == cache)
         {
             DrawArea d;
             d.setSize(32, 32, Chart::Transparent);
@@ -127,9 +127,9 @@ private:
             MemBlock m = d.outPNG();
             QImage img = QImage::fromData((const uchar*)m.data, m.len);
             img.setDevicePixelRatio(scale);
-            *cache = new QCursor(QPixmap::fromImage(img), 15, 15);
+            cache = new QCursor(QPixmap::fromImage(img), 15, 15);
         }
-        return **cache;
+        return *cache;
     }

 public:
@@ -145,15 +145,15 @@ public:
     }
     QCursor &getZoomInCursor(double scale)
     {
-        return getZoomCursor(&hZoomInCursor, scale, 3);
+        return getZoomCursor(hZoomInCursor, scale, 3);
     }
     QCursor &getZoomOutCursor(double scale)
     {
-        return getZoomCursor(&hZoomOutCursor, scale, 1);
+        return getZoomCursor(hZoomOutCursor, scale, 1);
     }
     QCursor &getNoZoomCursor(double scale)
     {
-        return getZoomCursor(&hNoZoomCursor, scale, 0);
+        return getZoomCursor(hNoZoomCursor, scale, 0);
     }
 } cursorManager;

diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp
index a3b7962..d706853 100644
--- a/new_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp
+++ b/old_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp
@@ -10954,7 +10954,9 @@ void surfacetexture(QChartViewer *viewer, int chartIndex)
     const int dataZ_size = dataX_size * dataY_size;
     double dataZ[dataZ_size];
     for(int yIndex = 0; yIndex < dataY_size; ++yIndex) {
+        double y = dataY[yIndex];
         for(int xIndex = 0; xIndex < dataX_size; ++xIndex) {
+            double x = dataX[xIndex];
             dataZ[yIndex * dataX_size + xIndex] = dataX[xIndex] * dataY[yIndex];
         }
     }
@@ -11022,7 +11024,7 @@ void surfacetexture(QChartViewer *viewer, int chartIndex)
         // Use a DrawArea to load the image
         DrawArea* d = new DrawArea();
         d->load("@/images/maptexture.png");
-        d->resize(c->getPlotRegionWidth(), c->getPlotRegionDepth());
+        d->resize(240, 210);

         // Set the DrawArea as a resource
         c->setResource("texture", d);
@@ -12304,6 +12306,11 @@ void treemapcolors(QChartViewer *viewer, int /* chartIndex */)

 void treemaplayout(QChartViewer *viewer, int chartIndex)
 {
+    // Labels for the tree map
+    const char* energy_types[] = {"Coal", "Oil", "Gas", "Nuclear", "Hydro", "Solar", "Wind",
+        "Biomass", "Geothermal", "Wave"};
+    const int energy_types_size = (int)(sizeof(energy_types)/sizeof(*energy_types));
+
     // Random data for the tree map
     RanSeries* r = new RanSeries(3);
     DoubleArray data = r->getSeries(20, 20, 400);
@@ -14163,10 +14170,7 @@ void circularbarmeter2(QChartViewer *viewer, int chartIndex)
     m->setCap(0, Chart::Transparent);

     // In this example, the circular bar has 20 segments
-    int segmentCount = 20;
-
-    // The angular step
-    double angleStep = 360.0 / segmentCount;
+    int angleStep = 360 / 20;

     // The gap between segments is 4.5 degrees
     double angleGap = 4.5;
@@ -14205,39 +14209,28 @@ void circularbarmeter2(QChartViewer *viewer, int chartIndex)
             stepColorScale_size));
     }

-    //
-    // Now we draw the segments of the bar meter
-    //
-
-    // The segment that contains the value
-    int currentSegment = (int)(angle / angleStep);
-
-    // Segments after the current segment is colored with the blank color
-    for(int i = currentSegment + 1; i < segmentCount; ++i) {
-        m->addRingSector(radius, radius - 20, i * angleStep, (i + 1) * angleStep - angleGap,
-            blankColor);
+    // Draw the blank part of the circular bar
+    if (angle < 360) {
+        // Iterate the segments in the blank part of the circular bar
+        for(int startAngle = (int)(angle / angleStep) * angleStep; startAngle < 360; startAngle +=
+            angleStep) {
+            // The first segment may be partially filled
+            double partialAngle = (startAngle >= angle ? 0 : (angle - startAngle) * (1 - angleGap /
+                angleStep));
+            m->addRingSector(radius, radius - 20, startAngle + partialAngle, startAngle + angleStep
+                 - angleGap, blankColor);
         }
-
-    // Segments before the current segment is colored with the fill color
-    for(int i = 0; i < currentSegment; ++i) {
-        m->addRingSector(radius, radius - 20, i * angleStep, (i + 1) * angleStep - angleGap,
-            fillColor);
     }

-    // Segment that contains the angle will be partially filled and partially blank. We need to
-    // adjust the angle to compensated for the angle gap.
-    double adjustedAngle = currentSegment * angleStep + (angle - currentSegment * angleStep) * (1 -
-        angleGap / angleStep);
-
-    // The blank part of the segment
-    if ((currentSegment + 1) * angleStep > angle) {
-        m->addRingSector(radius, radius - 20, adjustedAngle, (currentSegment + 1) * angleStep -
-            angleGap, blankColor);
+    // Draw the fill part of the circular bar
+    if (angle > 0) {
+        // Iterate the segments in the fill part of the circular bar
+        for(int startAngle = 0; startAngle < angle; startAngle += angleStep) {
+            // The last segment may be partially filled
+            double angleSpan = (angleStep - angleGap) * (angle >= startAngle + angleStep ? 1 : (
+                angle - startAngle) / angleStep);
+            m->addRingSector(radius, radius - 20, startAngle, startAngle + angleSpan, fillColor);
         }
-
-    // The filled part of the segment.
-    if (angle > currentSegment * angleStep) {
-        m->addRingSector(radius, radius - 20, currentSegment * angleStep, adjustedAngle, fillColor);
     }

     // Add a label at the center to display the value
diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp
index 7b8c1f5..b029776 100644
--- a/new_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp
+++ b/old_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp
@@ -315,13 +315,6 @@ void FinanceDemo::onLineEditChanged()
     int new_avgPeriod2 = m_MovAvg2->text().toInt();

     QString tickerKey = m_TickerSymbol->text();
-    if (tickerKey.isEmpty())
-    {
-        // Default tickerKey
-        tickerKey = "ASE";
-        m_TickerSymbol->setText(tickerKey);
-    }
-
     QString compareKey = m_CompareWith->text();

     bool needReloadData = (m_tickerKey != tickerKey) || (m_compareKey != compareKey);
@@ -367,16 +360,12 @@ void FinanceDemo::loadData(const QString& ticker, const QString& compare)
     if (m_compareKey != compare)
     {
         m_compareKey = compare;
-        if (m_compareKey.isEmpty())
-            m_dailyPrice.compareData.clear();
-        else
-        {
+
         // Simulator to generate realistic random OHLC values
         FinanceSimulator db2(compare.toUtf8().data(), Chart::chartTime(2010, 1, 1),
             Chart::chartTime(2020, 12, 31), 86400);
         m_dailyPrice.compareData = arrayToVector(db2.getCloseData());
     }
-    }

     // In this example, we will compute the weekly and monthly prices on demand. We just
     // need to clear the old data here.
diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp
index 5736d60..423120f 100644
--- a/new_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp
+++ b/old_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp
@@ -107,9 +107,9 @@ private:
     QCursor *hZoomOutCursor;
     QCursor *hNoZoomCursor;

-    QCursor &getZoomCursor(QCursor **cache, double scale, int flags)
+    QCursor &getZoomCursor(QCursor *cache, double scale, int flags)
     {
-        if (0 == *cache)
+        if (0 == cache)
         {
             DrawArea d;
             d.setSize(32, 32, Chart::Transparent);
@@ -127,9 +127,9 @@ private:
             MemBlock m = d.outPNG();
             QImage img = QImage::fromData((const uchar*)m.data, m.len);
             img.setDevicePixelRatio(scale);
-            *cache = new QCursor(QPixmap::fromImage(img), 15, 15);
+            cache = new QCursor(QPixmap::fromImage(img), 15, 15);
         }
-        return **cache;
+        return *cache;
     }

 public:
@@ -145,15 +145,15 @@ public:
     }
     QCursor &getZoomInCursor(double scale)
     {
-        return getZoomCursor(&hZoomInCursor, scale, 3);
+        return getZoomCursor(hZoomInCursor, scale, 3);
     }
     QCursor &getZoomOutCursor(double scale)
     {
-        return getZoomCursor(&hZoomOutCursor, scale, 1);
+        return getZoomCursor(hZoomOutCursor, scale, 1);
     }
     QCursor &getNoZoomCursor(double scale)
     {
-        return getZoomCursor(&hNoZoomCursor, scale, 0);
+        return getZoomCursor(hNoZoomCursor, scale, 0);
     }
 } cursorManager;

```

* REGRESSION: ccfits:arm64-windows. If expected, add ccfits:arm64-windows=fail to .\scripts\ci.baseline.txt.

REGRESSION: ccfits:x64-linux. If expected, add ccfits:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-osx. If expected, add ccfits:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-windows-static-md. If expected, add ccfits:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-windows-static. If expected, add ccfits:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-windows. If expected, add ccfits:x64-windows=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x86-windows. If expected, add ccfits:x86-windows=fail to .\scripts\ci.baseline.txt.

>[DEBUG] popen(curl --fail -L https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz --create-dirs --output /Users/bion/vcpkg/downloads/CCfits-2.5.tar.gz.15183.part 2>&1)
>[DEBUG] cmd_execute_and_stream_data() returned 5632 after   415053 us
>Error: Failed to download from mirror set:
>https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz:   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
>                                 Dload  Upload   Total   Spent    Left  Speed
>  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
>curl: (22) The requested URL returned error: 404 Not Found

Fixed link and modernized portfile.

* REGRESSION: geogram:x64-linux. If expected, add geogram:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-osx. If expected, add geogram:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-windows-static-md. If expected, add geogram:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-windows-static. If expected, add geogram:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-windows. If expected, add geogram:x64-windows=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x86-windows. If expected, add geogram:x86-windows=fail to .\scripts\ci.baseline.txt.

Upstream is gone:

https://gforge.inria.fr/frs/download.php/file/38314/geogram_1.7.5.tar.gz:   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed

  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
curl: (60) SSL: no alternative certificate subject name matches target host name 'gforge.inria.fr'
More details here: https://curl.haxx.se/docs/sslcerts.html

curl failed to verify the legitimacy of the server and therefore could not
establish a secure connection to it. To learn more about this situation and
how to fix it, please visit the web page mentioned above.

[DEBUG] /agent/_work/1/s/buildtrees/_vcpkg/src/vcpkg-tool-2021-09-10/src/vcpkg/base/downloads.cpp(626)
[DEBUG] Exiting after 583.7 ms us (582562 us)

CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:83 (message):

      Failed to download file with error: 1
      If you use a proxy, please check your proxy setting. Possible causes are:

      1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable
         to `https://address:port`. This is not correct, because `https://` prefix
         claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr
         , etc..) is an HTTP proxy. Try setting `http://address:port` to both
         HTTP_PROXY and HTTPS_PROXY instead.

      2. You are using Fiddler. Currently a bug (https://github.com/microsoft/vcpkg/issues/17752)
         will set HTTPS_PROXY to `https://fiddler_address:port` which lead to problem 1 above.
         Workaround is open Windows 10 Settings App, and search for Proxy Configuration page,
         Change `http=address:port;https=address:port` to `address`, and fill the port number.

      3. You proxy's remote server is out of service.

      In future vcpkg releases, if you are using Windows, you no longer need to set
      HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy
      Settings set by your proxy software. See (https://github.com/microsoft/vcpkg-tool/pull/49)
      and (https://github.com/microsoft/vcpkg-tool/pull/77)

      Otherwise, please submit an issue at https://github.com/Microsoft/vcpkg/issues

Call Stack (most recent call first):
  scripts/cmake/vcpkg_download_distfile.cmake:274 (z_vcpkg_download_distfile_show_proxy_and_fail)
  ports/geogram/portfile.cmake:4 (vcpkg_download_distfile)
  scripts/ports.cmake:141 (include)

Skipped in ci.baseline.txt.
2021-10-05 22:14:35 -07:00
Ryan
b6b6a8b630
[reproc] Update port to 14.2.3 (#20456)
* update to 14.2.3

* remove trailing whitespace

* update HEAD_REF

* update deprecated functions

* quote paths

* update versioning

* update baseline

* update versioning

* Use version rather than version-string.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-10-04 17:20:02 -07:00
Dawid Wróbel
7aa1a14c5f
[vcpkg_copy_tools] support copying .app bundles (#20210)
* [vcpkg_copy_tools] support copying .app bundles

* check for VCPKG_TARGET_IS_OSX

* Fix formatting

* [vcpkg_copy_tools] copy bundle and plain bin if both present

* Update scripts/cmake/vcpkg_copy_tools.cmake

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2021-10-04 12:40:14 -07:00
Billy O'Neal
f670aa5657
Use the correct SAS token for macos and fix tensorflow build failing on success. (#20512)
* Use the correct SAS token for macos and fix tensorflow build failing on success.

* Fix binary cache.
2021-10-04 11:52:47 -07:00
Billy O'Neal
ffdc00841c
PASSING, REMOVE FROM FAIL LIST: concurrencpp:x64-osx (.\scripts\ci.baseline.txt) (#20454)
PASSING, REMOVE FROM FAIL LIST: libsamplerate:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: cppgraphqlgen:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: libopusenc:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: cartographer:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: clockutils:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: cairo:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: matio:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: coolprop:x64-osx (.\scripts\ci.baseline.txt)
These were all hidden because before the Tensorflow fix we haven't had a working MacOS CI in weeks.
REGRESSION: mfl:x64-osx. If expected, add mfl:x64-osx=fail to .\scripts\ci.baseline.txt.
This depended on cario.
REGRESSION: cppkafka:x64-osx. If expected, add cppkafka:x64-osx=fail to .\scripts\ci.baseline.txt.
This looks like a legitimate failure to detect the dependent library librdkafka
REGRESSION: forge:x64-osx. If expected, add forge:x64-osx=fail to .\scripts\ci.baseline.txt.
This looks like a legitimate failure to
REGRESSION: embree3:x64-osx. If expected, add embree3:x64-osx=fail to .\scripts\ci.baseline.txt.
Conflicts on MacOS probably for the same reason as Linux.
2021-10-01 00:00:18 -07:00