[glog] update to v0.5 #22135

jiayuehua · 2021-12-21T09:53:54Z

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/

* 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 <47264268+JackBoosY@users.noreply.github.com> * Bump port-version. Co-authored-by: GLUD Lars <lars.glud@leica-geosystems.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [lodepng] Fix cannot open include file "lodepng.h" * update version Co-authored-by: Lily Wang <v-lilywang@microsoft.com>

* [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 <bion@microsoft.com>

* [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 <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang <v-lilywang@microsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [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 <63675417+JonLiu1993@users.noreply.github.com> * rerun x-add-version libunifex * Update versions/l-/libunifex.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * 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 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* 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 <Joachim_Gehweiler@McAfee.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [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 <v-lilywang@microsoft.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [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 <30894796+Neumann-A@users.noreply.github.com> * [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 <bion@microsoft.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [python3] Support arm on non Windows * Support arm on all platform, add host dependency * version * [pybind11] Add supports * version Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

* [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 <bion@microsoft.com>

jiayuehua · 2022-04-07T11:38:21Z

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

This reverts commit eb5f213.

github-actions

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 · 2022-04-07T20:59:09Z

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?

github-actions

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 · 2022-04-08T01:59:00Z

@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.

github-actions

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

github-actions

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

github-actions

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

BillyONeal · 2022-04-08T18:22:45Z

@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 · 2022-04-08T22:19:43Z

Thanks!

jiayuehua · 2022-04-09T00:14:01Z

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 · 2022-05-04T15:21:45Z

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

jiayuehua and others added 30 commits December 14, 2021 15:53

[abseil] Upgrade to 2021.1102

8add833

revert portfile.cmake

d7902b9

update version

b8c364a

update portfile.cmake

f27bc3c

update version

1ac8147

[s2geometry] google s2 for for manipulating geometric shapes

fc96e70

[libevent] no absolute paths (#21179)

757a375

[lodepng] Fix cannot open include file "lodepng.h" (#22007)

8b8eb17

* [lodepng] Fix cannot open include file "lodepng.h" * update version Co-authored-by: Lily Wang <v-lilywang@microsoft.com>

[MyGUI] update to 3.4.1 (#22015)

ef56f7d

* [MyGUI] update to 3.4.1 * update version

[s2n] Update, add openssl dependency (#21484)

64672b7

* Update to 1.3.0, add openssl dependency * Add 'tests' feature * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

[ xtensor-io ] Fix wrong hash (#22018)

a19bedd

* [xtensor-io] Fix wrong hash * update version

[vcpkg] Update VMs for December 2021 Patch Tuesday (#22013)

1a0a2fe

* 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.

[hiredis] Fix static build (#22038)

38f7c8e

* [hiredis] Fix static build * Update version database

[python3] Support arm (#21528)

f8992fb

* [python3] Support arm on non Windows * Support arm on all platform, add host dependency * version * [pybind11] Add supports * version Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

[openmvg] update to 2.0 (#22020)

b84c9fc

* [openmvg] update to 2.0 * update version * update patch * update version

[brynet] Update to 1.11.1 (#22021)

2e46c24

* brynet: upgrade to 1.11.1 * Update portfile.cmake * Update brynet.json

[graphicsmagick] update to version 1.3.37 (#22024)

91d0eea

* [graphicsmagick] update to version 1.3.37 * [graphicsmagick] manifest format * [graphicsmagick] version database update * [graphicsmagick] version-string -> version * [graphicsmagick] version database update

[meson] fix windows linker detection (#22032)

6bc621a

* 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 (#22036)

df7ead3

* [libgpg-error] Release-only build support * Update version database * Fix protfile spaces * Update version database

[elfutils] provide static or shared libraries correctly (#22055)

9202ec0

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.

[caf] Update to 0.18.5 (#22046)

a222dc6

* [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 <bion@microsoft.com>

jiayuehua added 2 commits April 8, 2022 00:49

Revert "[rsocket]:fix ERROR macro"

8909c26

This reverts commit eb5f213.

[glog]: v0.5 nogdi macro

b648927

github-actions bot requested changes Apr 7, 2022

View reviewed changes

[glog]: remove IN OUT macro

e21ff11

github-actions bot requested changes Apr 8, 2022

View reviewed changes

jiayuehua added 2 commits April 8, 2022 11:12

[glog] v0.5

f2d69d2

--amend

68d260d

github-actions bot requested changes Apr 8, 2022

View reviewed changes

[caffe2] undefinde IN OUT macro

e1d2c00

github-actions bot requested changes Apr 8, 2022

View reviewed changes

[glog]: v0.5

6712fdd

github-actions bot approved these changes Apr 8, 2022

View reviewed changes

LilyWangLL marked this pull request as ready for review April 8, 2022 09:20

JonLiu1993 approved these changes Apr 8, 2022

View reviewed changes

JonLiu1993 requested a review from LilyWangLL April 8, 2022 09:58

LilyWangLL added 2 commits April 8, 2022 03:08

Format portfile.cmake and add license

d6f2714

update version

93d6c09

github-actions bot approved these changes Apr 8, 2022

View reviewed changes

JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Apr 8, 2022

strega-nil-ms merged commit 6f706ab into microsoft:master Apr 8, 2022

jiayuehua deleted the glog branch April 8, 2022 23:52

Adela0814 mentioned this pull request May 19, 2022

[colmap] Build error #24420

Closed

jiayuehua mentioned this pull request Jun 10, 2022

[glog] fix not work on c++03 #25155

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[glog] update to v0.5 #22135

[glog] update to v0.5 #22135

jiayuehua commented Dec 21, 2021

jiayuehua commented Apr 7, 2022 •

edited

Loading

github-actions bot left a comment

BillyONeal commented Apr 7, 2022

github-actions bot left a comment

jiayuehua commented Apr 8, 2022

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

BillyONeal commented Apr 8, 2022

strega-nil-ms commented Apr 8, 2022

jiayuehua commented Apr 9, 2022

whuaegeanse commented May 4, 2022 •

edited

Loading

[glog] update to v0.5 #22135

[glog] update to v0.5 #22135

Conversation

jiayuehua commented Dec 21, 2021

What does your PR fix?

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

Does your PR follow the maintainer guide?

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

jiayuehua commented Apr 7, 2022 • edited Loading

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Apr 7, 2022

github-actions bot left a comment

Choose a reason for hiding this comment

jiayuehua commented Apr 8, 2022

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Apr 8, 2022

strega-nil-ms commented Apr 8, 2022

jiayuehua commented Apr 9, 2022

whuaegeanse commented May 4, 2022 • edited Loading

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

jiayuehua commented Apr 7, 2022 •

edited

Loading

whuaegeanse commented May 4, 2022 •

edited

Loading