* [pcl] Update patches and portfile for PCL 1.12.0.99
* [pcl] Update pcl to 1.12.0.99
* Update rtabmap to 0.20.13, don't build Qt libs when WITH_QT is OFF
* [rtabmap] update to 0.20.13
* Use PCL 1.12.0 instead of 1.12.0.99
* [pcl] Use PCL 1.12.0
* Require pcl[vtk] to build rtabmap
* Fix rtabmap hash
* Go back to ccc8202, where Linux CI was passing, update rtabmap to require pcl[vtk]
* test - go back to pcl 1.20.0.99
* That wasn't it - go back to PCL release commit
* Go back to pcl 1.12.0
* Remove libpng patch due to updated VTK per https://github.com/microsoft/vcpkg/pull/18855#issuecomment-880989289
* Bump version as per git bot
* Fix find dependencies in pcl's dependency
* version stuff
* version
* Replace depreciate functions
* version
* Add DISABLE_PARALLEL_CONFIGURE to rtabmap
* version
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
* [Qt] Update to 6.2.1
* add changes from qtbase in the vcpkg-qmake PR into this PR. (So I don't invalidate everybody in the other PR)
* [skip actions] fix qtbase and format of vcpkg.json
* remove outdated patch
* remove patches and add alsa feature.
* version stuff
* Add bddisasm port
Currently fetching bddisasm from my fork of the project
* bddisasm: Build with BDD_INCLUDE_TOOL=OFF
* bddisasm: Use PREFER_NINJA
* bddisasm: Update REF
* bddisasm: Don't use vcpkg_install_msbuild
* bddisasm: Switch to release 1.32.1 from the bitdefender repo
* Add the result of ./vcpkg x-add-version --all
* Replace the control file with a manifest
Converted with ./vcpkg format-manifest
* Add more details to bddisasm/vcpkg.json
Added port-version, license, homepage, documentation, and port mantainers
* Fix bddisasm/vcpkg.json
* Fix the version file
* List arm as not supported
* Update version file
* Fail install on arm
* Use the new vcpkg_cmake_* functions
* Remove the LICENSE file
* Fix version
* Update version file
* build only static library
bddisasm only supports being built as a static library, so say that in the portfile
* bddisasm: Update port to version 1.33.0
* bddisasm: Update port to version 1.34.2
* bddisasm: Update port to version 1.34.7
* bddisasm: Set `port-version` to 1
* Update ports/bddisasm/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Run `vcpkg x-add-version --all`
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update portfile.cmake
This change resolves the hash error while installing the package.
Error:
File path: [ D:/vcpkg/downloads/temp/muflihun-easyloggingpp-v9.97.0.tar.gz ]
Expected hash: [ E45789EDAF7A43AD6A73861840D24CCCE9B9D6BBA1AAACF93C6AC26FF7449957251D2CA322C9DA85130B893332DD305B13A2499EAFFC65ECFAAAFA3E11F8D63D ]
Actual hash: [ e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d ]
* Bump version number and fix @NancyLi1013 's comment.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update lazy-importer to 2021-03-09
* Update CI baseline
* Fix version date
* Update git-tree hash
* Remove extra phantom version from version database.
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update xorstr to 2021-09-12
* Update CI baseline
* Fix version date
* Update git-tree hash
* Remove phantom version from version database.
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [qca] Fix usage
* version
* Add double quotes to paths
* version
* Remove some double quotes
* version
* Remove depreciate code
* version
* Try to remove the out-dated code
* version
* Apply suggestions
* version
* [brigand] Fix pkgconfig file and modernize portfile.cmake.
* Undo patch patch and add version.
* Depend only on boost-fusion and boost-variant, as suggested by PhoebeHui
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Update version database.
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* [opensubdiv] Add features
* version
* Add more judgment
* version
* fix mac build - upstream bug
* Re-fix dependency tbb
* version
* fix judgment
* version
* In order to remove them, change header file permission
* version
* 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>
* [many ports] call vcpkg_fixup_pkgconfig()
The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files
* Update port-version for armadillo and polyclipping.
* Update version database.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [libmysql] Added limits include patch
Fixes numeric_limits is not a member of std build failure on GCC 11.2 in
sql-common/sql_string.cc file.
* Updated version database
* Update portfile.cmake
* Update versions/l-/libmysql.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Don't add _static suffix to mingw pc file
* Update versions
* Update portfile.cmake
Small changes for the format
* Fix name of exported version file
* Update versions
* [skip actions] CI
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* many ports: Fix pkgconfig files location
* Use rename in botan rather than install plus delete.
* Delete the duplicate share/pkgconfig files in cppad *after* vcpkg_fixup_pkgconfig.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [xaudio2redist] updated for new version and added find_package support
* 1.2.7 didn't last long... on to 1.2.8
* baseline update
* Upstream change for directxtk port to use new find package
* update baseline
* Updated vcpkg_fail_port_install for Linux and OSX
* Update ports/xaudio2redist/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* update baseline
* Added quotes per request
* Update baseline
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [libopenmpt] Upgrade to 0.5.10, include author feedback
* [libopenmpt] Add version info
* [mpg123] Switch to CMake build for all platforms. Fixes#15551
* [libopenmpt] Address CR feedback
* [libopenmpt] Update to 0.5.12
* Update version db
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [utf8h] Update to 23 august 2021
* [utf8h] Update versions database
* update utf8h to latest version
* update version
* CI
Co-authored-by: Jonliu1993 <13720414433@163.com>
* [folly] Change from master branch to main
* update vcpkg.json
* update version
Co-authored-by: QuellaZhang <zhangyi2090@163.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
* [libcanberra] fix Linux static consumption
* [libcanberra] add Debian patches
* [libcanberra] make all backends features
* [libcanberra] bump port version
* [libcanberra] update versions
* Fix detours port to respect VCPKG_BUILD_TYPE
If the target triplet sets VCPKG_BUILD_TYPE, we can't assume that both '-rel' and 'dbg' build trees exist.
* Bump the port version number.
* Fix tree hash
* Add requested double-quotes around file paths.
* Update tree hash.
Co-authored-by: Pavel Curtis <pavelc@microsoft.com>
* Add cpp-jwt
* Update ports/cpp-jwt/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* overwrite cpp-jwt version
* Update cpp-jwt which no longer requires to remove include/jwt/test
* Use version-date in cpp-jwt port
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* [bux] Add new port
* Corrections according to Create Pull Request suggested questions
* SHA512
* Mark fails into .\scripts\ci.baseline.txt
* Mark fails into .\scripts\ci.baseline.txt
* No need of "port-version": 1 in vcpkg.json
* Update version database
* Update ports/bux/portfile.cmake
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/bux/portfile.cmake
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/bux/portfile.cmake
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/bux/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update bux.json
* Update ports/bux/vcpkg.json
* update version
* Update scripts/ci.baseline.txt
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* update bux support
* update version
* update version
* Rename bux to buck-yeh-bux
* Update version database
* [buck-yeh-bux] upgrade to v1.5.0
1. [New] `bux::C_ParaLog` is ready for a variety of parallel logging configurations, filtered or unfiltered.
2. [New] Necessary helper classes for implementation _s.t_ logger users no longer need to declare child source instances explicitly.
3. [New] Add methods to `ParaLog.h` & `SyncLog.h` to support testability.
4. [New] Add unit test cases to `ParaLog.h` & `SyncLog.h` (test_paralog & test_logger)
5. [New] Update what are found in `test/` to `test/archlinux/aur_poc/`
6. [Bug] `std::uniform_int_distribution<unsigned char>` no longer allowed.
7. [Change] `CUR_FUNC_` for Windows (MSVC)
8. [Change] `tbb` is no longer implicitly needed by C++ standard library.
9. [Change] `smoke_filtlog.cpp` verifies 2-level log filters ok.
* Missing comma in versions/b-/buck-yeh-bux.json
* buck-yeh-bux 1.6.0
* Corrections made according to NancyLi1013's requests in PR #20813
* Fix SHA key in versions/b-/buck-yeh-bux.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
In https://github.com/microsoft/vcpkg/pull/20757 I patch easyhook to remove /Zi in release builds, but in our most recent nightly build we got another failure https://dev.azure.com/vcpkg/public/_build/results?buildId=61519&view=artifacts&pathAsName=false&type=publishedArtifacts
```
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\cderr.h : fatal error C1073: Internal error involving incremental compilation(compiler file 'd:\a01\_work\6\s\src\vctools\Compiler\CxxFE\sl\p1\c\p0io.c', line 1257) [D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\EasyHookDll\EasyHookDll.vcxproj]
C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um\ddeml.h(37,1): fatal error C1001: Internal compiler error. [D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\EasyHookDll\EasyHookDll.vcxproj]
D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\DriverShared\LocalHook\install.c(618,1): error C2471: cannot update program database '???' [D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\EasyHookDll\EasyHookDll.vcxproj]
```
This change also removes /ZI (which was used in debug builds) and /Gm (which is irrelevant since we aren't doing development work on Easyhook)
* Update ezc3d-port to 1.4.6
* Use different settings for non-windows platfom
* Reformat manifest
* Bump version
* Apply suggestions from code review
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Format vcpkg.json
* Update versionsfile
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* [geogram] Switch to github mirror (alicevision/geogram)
* [geogram] Update version files
* Clean portfile and use correct version scheme
* [geogram] Update versions file
* update to latest commit
* remove demo feature
* update to latest
* fix pkgconfig
* speed up copy tools
* update mapnik
* update sha
* remove debug messages
* update version
* add coretext to harfbuzz for osx
* version
* [skip actions] Trigger CI
* fix issue on macos
* version database
* apply ras0219-msft suggestions
* remove core
* version
* version
* [skip actions] Trigger CI
* test latest commit
* v
* update to latest
* version
* update to latest master
* version
* revert portfile.cmake format
* update version
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
* [openssl] fix cross compilation with mingw
When cross compiling openssl on Linux, e.g.
./vcpkg install openssl:x64-mingw-dynamic
failed, because 'windres' was not found. The call to
openssl's Configure was missing the WINDRES environment
variable, which is needed in case it is prefixed. On
Ubuntu the binutils-mingw-w64-x86-64 package installed
it as /usr/bin/x86_64-w64-mingw32-windres.
Since mingw uses openssl-unix to build, it's worth mentioning
that the WINDRES env has no impact for non-mingw and is ignored
there.
* Handle conflicts
* Update version files
* Update ports/openssl/unix/CMakeLists.txt
* Update versions/o-/openssl.json
* Update versions/o-/openssl.json
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* added missing 'xml' feature implementation
* updated versions
* Update version database
* small fixes and update version database
* merged changes
* Update version database
* add version-port
* update version
* fixed [tao] feature
* updated version database
* forgot to merge this
* update version
* another small change
* update version database
* pass the same ACE features to ACEXML as well
* update version
* fixed zlib feature
* update version
* fixed x64-windows-static triplet
* update version
* incorporated requested changes after review
* update version
* updated "version" string
* updated version
* use current_install_dir
* update version
Co-authored-by: Erik Sohns <erik.sohns@posteo.de>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Remove 001-install-libraries.patch (all changes are in upstream)
* Change REF from 0c8905e84 (old master) to 59f15da55 (v8.2.0-20211013)
* Remove -Dbuild_tests=OFF which is default one
* Kill spaces at EOLn in portfile.cmake
* Update version, reset port-version
* [libigl] Update to 2.3.0
* remove the change in fix-config.patch
* restore to the original state
Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
* Revise tiff cmake wrapper
* x-add-version
* Use variables from vcpkg_check_features
* x-add-version
* Set CMP0012 to allow 'if(ON)'
* x-add-version
* Restore early call to _find_package
* Move wrapper vars to z_vcpkg namespace
* Use more common conditional dependency configuration
* Don't touch TIFF_LIBRARY
* Pass on QUIET option
* Update versions
* V8Config-shared compatibility issue fixed for VS generator
* Version updated
* port version fix
* update version
* adjust first entry
* update version
* Use version rather than version-string.
* Picking V8 snapshot via cmake generator expression
* version fix
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Add graphviz
* Address bot feedback
* Add python3 dep and fix pkgconf var
* Acquire python3 program
* Specify python3 executable
* Move bison earlier in path
* Add bison executable as var
* Add other deps as var
* Fix formatting
* Apply suggestions from code review
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Update to 2.49.1
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* 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>
* ports: sentry-native: Add CMakeFindDependencyMacro for find_dependency
find_dependency requires CMakeFindDependencyMacro to be included,
otherwise there is a CMake error when using find_package(sentry).
* versions: update sentry-native port-version to 2
* [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>
* 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
* [vtk] Add feature gdal and geojson, re-factory the feature select part
* version stuff
* Fix feature option MPI
* Fix find and use gdal.
* version
* Handle some of the same parameters
* version
* [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>
* [libsquish] Export cmake target
* [openimageio] Fix find dependency libsquish
* version
* Rename the target
* Re-fix dependency libsquish, apply official changes
* version stuff
* more version
* Change namespace
* Update patch
* version
* Remove unused patch
* version
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* 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>
* 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>
* Update simde to 0.7.2
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [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>
* 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.
* update co to v2.0.2
* fix gitree in co.json
* add install-dll.patch for co
* update version
* fix CRT linkage
* update version
* minimal patch
* update version
* Update usockets to 0.8.1
* Update CI baseline
* Minor tweaks
* Update git-tree hash
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Modernize portfile
* Update indentation
* Update to 5.0.1
* Don't enable legacy PROJ API on Windows
* Fix copyright
* Update versions
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update uwebsockets to 20.5.0
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update date to 3.0.1
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update cppzmq to 4.8.1
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update ebml to 1.4.2
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update tmxlite to 1.3.0
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update doctest to 2.4.6
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update libmorton to 0.2.8
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update span-lite to 0.10.3
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [qttools] add missing feature dependency.
* version stuff
* assistant also requires sql-sqlite.
* version stuff
* qtbase add missing concurrent dependency
* update port version
* version stuff
* Update bitmagic to 7.5.0
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update boolinq to 3.0.2
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
