Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[glog] update to v0.5 #22135

Merged
merged 62 commits into from
Apr 8, 2022
Merged

[glog] update to v0.5 #22135

merged 62 commits into from
Apr 8, 2022

Conversation

jiayuehua
Copy link
Contributor

Describe the pull request
glog update to new version v0.5

  • What does your PR fix?

    Fixes #...

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    ,

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

jiayuehua and others added 30 commits December 14, 2021 15:53
* Check if files exists before call vcpkg_replace_string.

* Update per comments.

Only guard debug.

* Update ports/pcre2/portfile.cmake

Co-authored-by: Jack·Boos·Yu <[email protected]>

* Bump port-version.

Co-authored-by: GLUD Lars <[email protected]>
Co-authored-by: Jack·Boos·Yu <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>
* [lodepng] Fix cannot open include file "lodepng.h"

* update version

Co-authored-by: Lily Wang <[email protected]>
* [MyGUI] update to 3.4.1

* update version
* Update to 1.3.0, add openssl dependency

* Add 'tests' feature

* Update versions

Co-authored-by: Billy Robert O'Neal III <[email protected]>
* [libpq] Update to 12.9

* [libpq] Use VCPKG_OSX_SYSROOT if set

otherwise configure set the default sysroot in addition, ignoring the
sysroot set by vcpkg_configure_cmake.

* [libpq] remove comment only chunks from patches

* [libpq] update version registry
* [qhttpengine] New port

* Update version database

* Fix the format of portfile.cmake

* Fix the format of portfile.cmake

* update version

* Remove duplicate build_shared_libs setting.

Co-authored-by: LilyWangLL <[email protected]>
Co-authored-by: Lily Wang <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>
* [xtensor-io] Fix wrong hash

* update version
* Add Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools to VS as requested by #19554

* Cherry pick python changes from #21912

* Update linux pool.

* Update windows pool.
* add CMINPACK_NO_DLL flag back

* bump port version

* updated versions JSON

* quotation mark adjustment

* git-tree update

* adjusted c flags configuration

* hash update

* whitespace fix

* git-tree hash update

* updated to ast 9.2.5, added external-cminpack flag

* updated version hash

* removed old version entry

* removed $schema element from json

* updated port git-tree hash
* updated libunifex version

* remove comment

* run x-add-versions --all

* Update ports/libunifex/vcpkg.json

Co-authored-by: JonLiu1993 <[email protected]>

* rerun x-add-version libunifex

* Update versions/l-/libunifex.json

Co-authored-by: JonLiu1993 <[email protected]>

* update libunifex to 12-07

* x-add-version

* libunifex port update

force cpp20 as cpp17 build doesn't work with msvc. added a compile fix for externConstexpr and removed warnings with /EHsc

* Update libunifex.json

version update

* Update fix-compile-error.patch

relax clang warnings

* Update libunifex.json

git x-add-version libunifex

* remove unused

* x-add-versions

* remove old version log

Co-authored-by: JonLiu1993 <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>
* Revert "incorporate changes from microsoft:master"

* Revert "Revert "incorporate changes from microsoft:master""

* update tensorflow to 2.7 and bazel to latest 4.x

* Update version database.

Co-authored-by: jgehw <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>
* [hiredis] Fix static build

* Update version database
* [baseline] Fix mpg123 build failed on Linux

* update version

* Fix misspelled "module".

* Actually fix the misspelling this time Bill.

Co-authored-by: Lily Wang <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>
* [qt5-base] no _debug lib suffixes on macOS (#14225)

* [qt5-base] patch qt5-base to remove _debug postfix on osx

* Apply suggestions from code review

Co-authored-by: Alexander Neumann <[email protected]>

* [qt5-base] create link to _debug.pc file from .pc file without _debug

* update version

* [qt5-base] create forward pkgconfig file

Co-authored-by: Billy Robert O'Neal III <[email protected]>
Co-authored-by: Alexander Neumann <[email protected]>
* [python3] Support arm on non Windows

* Support arm on all platform, add host dependency

* version

* [pybind11] Add supports

* version

Co-authored-by: NancyLi1013 <[email protected]>
Co-authored-by: JackBoosY <[email protected]>
* [openmvg] update to 2.0

* update version

* update patch

* update version
* brynet: upgrade to 1.11.1

* Update portfile.cmake

* Update brynet.json
* [graphicsmagick] update to version 1.3.37

* [graphicsmagick] manifest format

* [graphicsmagick] version database update

* [graphicsmagick] version-string -> version

* [graphicsmagick] version database update
* fix meson linker detection .....

* bit of code cleanup in vcpkg_configure_meson

* forgot the version stuff

* put cmake back on path because meson is buggy as hell
* [libgpg-error] Release-only build support

* Update version database

* Fix protfile spaces

* Update version database
The logic for keeping the static or shared libraries according to
VCPKG_LIBRARY_LINKAGE was backwards, and it was providing shared
libraries when they should have been static, and vice versa.
* [gl3w] use khrplatform.h from the egl-registry port

The file was changed yesterday, invalidating the hash: KhronosGroup/EGL-Registry@57b4876.

* [gl3w] migrate to new functions from vcpkg-cmake{,-config}

* [gl3w] bump port version
* [caf] Update to 0.18.5

* Remove setting of BUILD_SHARED_LIBS already handled by vcpkg_cmake_configure.

Co-authored-by: Billy Robert O'Neal III <[email protected]>
@jiayuehua
Copy link
Contributor Author

jiayuehua commented Apr 7, 2022

I already downloaded. I will have a look. @LilyWangLL

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for rsocket but no changes to version or port version.
-- Version: 2021.08.30.00#1
-- Old SHA: 073c3faa3992179768ce7e76cc7d39b654db9e8c
-- New SHA: 48ad9a4a7e78af20dfc32ad55a83b09c1d54a1cf
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@BillyONeal
Copy link
Member

D:\buildtrees\caffe2\src\639a981b79-8e24fb82ee.clean\caffe2/utils/conversions.h(168): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
D:\buildtrees\caffe2\src\639a981b79-8e24fb82ee.clean\caffe2/utils/conversions.h(168): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
D:\buildtrees\caffe2\src\639a981b79-8e24fb82ee.clean\caffe2/utils/conversions.h(174): error C2912: explicit specialization 'caffe2::float16 caffe2::convert::To(const float)' is not a specialization of a function template
D:\buildtrees\caffe2\src\639a981b79-8e24fb82ee.clean\caffe2/utils/conversions.h(191): error C2912: explicit specialization 'float caffe2::convert::To(const caffe2::float16)' is not a specialization of a function template
D:\buildtrees\caffe2\src\639a981b79-8e24fb82ee.clean\caffe2/utils/conversions.h(206): error C2912: explicit specialization 'float caffe2::convert::To(const float)' is not a specialization of a function template

https://github.com/facebookarchive/caffe2/blob/32f023fe8c0a0327f8f14b1c041536a7c6b1f4ec/caffe2/utils/conversions.h#L168

It looks like maybe before float16 was coming from glog?

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for rsocket but no changes to version or port version.
-- Version: 2021.08.30.00#1
-- Old SHA: 073c3faa3992179768ce7e76cc7d39b654db9e8c
-- New SHA: 48ad9a4a7e78af20dfc32ad55a83b09c1d54a1cf
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 436d98da7f6f06c8dc6bfce2801c543d7cd47ee1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json
index 7e2b6635..9b4d581a 100644
--- a/versions/r-/rsocket.json
+++ b/versions/r-/rsocket.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "48ad9a4a7e78af20dfc32ad55a83b09c1d54a1cf",
+      "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c",
       "version-string": "2021.08.30.00",
       "port-version": 1
     },

@jiayuehua
Copy link
Contributor Author

@BillyONeal It's because Macro "IN" "OUT" introduced by include <windows.h> in glog. "IN" and "OUT" are used as template parameter in caffe2. Marco is evil.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for rsocket but no changes to version or port version.
-- Version: 2021.08.30.00#1
-- Old SHA: 073c3faa3992179768ce7e76cc7d39b654db9e8c
-- New SHA: 48ad9a4a7e78af20dfc32ad55a83b09c1d54a1cf
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 436d98da7f6f06c8dc6bfce2801c543d7cd47ee1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json
index 7e2b663..9b4d581 100644
--- a/versions/r-/rsocket.json
+++ b/versions/r-/rsocket.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "48ad9a4a7e78af20dfc32ad55a83b09c1d54a1cf",
+      "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c",
       "version-string": "2021.08.30.00",
       "port-version": 1
     },

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/caffe2/portfile.cmake

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/caffe2/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for rsocket but no changes to version or port version.
-- Version: 2021.08.30.00#1
-- Old SHA: 073c3faa3992179768ce7e76cc7d39b654db9e8c
-- New SHA: 48ad9a4a7e78af20dfc32ad55a83b09c1d54a1cf
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 436d98da7f6f06c8dc6bfce2801c543d7cd47ee1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json
index 7e2b663..9b4d581 100644
--- a/versions/r-/rsocket.json
+++ b/versions/r-/rsocket.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "48ad9a4a7e78af20dfc32ad55a83b09c1d54a1cf",
+      "git-tree": "073c3faa3992179768ce7e76cc7d39b654db9e8c",
       "version-string": "2021.08.30.00",
       "port-version": 1
     },

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/caffe2/portfile.cmake

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/caffe2/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/caffe2/portfile.cmake

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/caffe2/vcpkg.json

Valid values for the license field can be found in the documentation

@LilyWangLL LilyWangLL marked this pull request as ready for review April 8, 2022 09:20
@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Apr 8, 2022
@BillyONeal
Copy link
Member

@BillyONeal It's because Macro "IN" "OUT" introduced by include <windows.h> in glog. "IN" and "OUT" are used as template parameter in caffe2. Marco is evil.

Surprising! IN and OUT aren't used on the lines indicated in the message

@strega-nil-ms
Copy link
Contributor

Thanks!

@strega-nil-ms strega-nil-ms merged commit 6f706ab into microsoft:master Apr 8, 2022
@jiayuehua jiayuehua deleted the glog branch April 8, 2022 23:52
@jiayuehua
Copy link
Contributor Author

Used by the primary template https://github.com/facebookarchive/caffe2/blob/32f023fe8c0a0327f8f14b1c041536a7c6b1f4ec/caffe2/utils/conversions.h#L154. The error message is not so intuitive.

@whuaegeanse
Copy link
Contributor

whuaegeanse commented May 4, 2022

@jiayuehua nogdi-nominmax.patch makes a conflict with freeimage because of using macro NOGDI.
colmap/colmap#1511

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[glog] update to 0.5.0