[proj4] Update to 8.1.1, revise features and dependencies #20443

dg0yt · 2021-09-30T07:32:15Z

What does your PR fix?
- Update proj to 8.1.1. (Resolves [proj4] update to 8.1.1 #19910.)
- Adds a new net feature. It is enabled by default, following upstream.
  Network support (via libcurl) was bound to the tools feature but in fact it is independent.
  (I wonder if there is an established name for such a feature. Alternatives are "network" or "online".)
- Enables tiff and network support for static builds. This is essential for the official osx and linux triplets.
  The key issue was properly exporting the dependencies for consumers (cmake config and pkgconfig).
Which triplets are supported/not supported? Have you updated the CI baseline?

unchanged
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?

yes

Important behavioural change

The opt-in feature tools no longer implies network support.

dg0yt · 2021-09-30T09:47:52Z

Okay, libspatialite needs to learn transitive dependencies.

JackBoosY · 2021-10-08T02:38:43Z

ports/proj4/portfile.cmake

+if("net" IN_LIST FEATURES)
+    vcpkg_list(APPEND TOOL_NAMES projsync)
+    set(feature_for_projsync "tools")
 else()
-  set(VCPKG_BUILD_SHARED_LIBS OFF)
-  set(TOOL_NAMES cct cs2cs geod gie proj projinfo)
+    set(feature_for_projsync "net")
 endif()


I personally don't like this, this will increase variability.

I personally don't like this, this will increase variability.

What is your proposal? It just implements upstream feature design: With net and tools, there is projsync. But there is no AND in `vcpkg_check_features´.

Use the original method:

if ("tools" IN_LIST FEATURES OR "net" IN_LIST FEATURES) set(ADDITIONAL_OPTIONS "-DBUILD_PROJSYNC=ON") endif()

The original method was variation in number of FEATURES supplied to check_feature_options (before check_feature_options, sometimes adding tools BUILD_PROJSYNC to EXTRA_FEATURES).

You propose another alternative, adding the setting to another variable, independent of check_feature_options.

I dislike both approaches for the inconsistency. All other tools are handled by vcpkg_check_features. vcpkg_check_features doesn't only set FEATURE_OPTIONS (functional effect) but also individual variables (side effect). I wanted to have the same behaviour for BUILD_PROJSYNC.

See #20147.
This situation cannot be handled in vcpkg_check_features at present, we can only do so.

This situation can be handled in vcpkg_check_features, but only in the proposed way: Changing the feature name.

Well, please complete this PR and let my colleague review it further.

I will complete it when the pc file PR is merged (#20458). We need to carry transitive usage requirements for static linkage. That's why it is a draft.

dg0yt · 2021-11-11T08:14:35Z

Depends on #20480.

dg0yt · 2021-11-23T08:57:08Z

Seems to need #21594 which in turn needs #21599 which needs review from @JackBoosY.

github-actions

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

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 80be868eb552a8d2f94cda5ee1ce94d49612ce12 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index c557c01..674bfc4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5401,7 +5401,7 @@
       "port-version": 1
     },
     "proj4": {
-      "baseline": "8.0.0",
+      "baseline": "8.1.1",
       "port-version": 0
     },
     "prometheus-cpp": {

…-features

dg0yt · 2021-12-07T08:53:41Z

libcrypto from openssl needs user32.lib. This is not an issue with CMake which has implicit link libraries. But it is an isse with nmake when relying only on pkg-config.

libcrypto.lib(cryptlib.obj) : error LNK2019: unresolved external symbol __imp_GetProcessWindowStation referenced in function OPENSSL_isservice
libcrypto.lib(cryptlib.obj) : error LNK2019: unresolved external symbol __imp_GetUserObjectInformationW referenced in function OPENSSL_isservice
libcrypto.lib(cryptlib.obj) : error LNK2019: unresolved external symbol __imp_MessageBoxW referenced in function OPENSSL_showfatal
spatialite.dll : fatal error LNK1120: 3 unresolved externals

Alternative A: Update libcrypto.pc. Rebuilds all dependencies of openssl.
Alternative B: Pass cmake's implicit link libraries to nmake. Rebuilds all dependencies of vcpkg_build_nmake.

I tend towards B. It seems to more consistent overall behaviour in vcpkg.

Neumann-A · 2021-12-07T09:06:55Z

@dg0yt Put them into ENV{_LINK_} just like vcpkg_configure_make? (or ENV{LIBS} if nmake uses that...)

dg0yt · 2021-12-07T09:12:25Z

@dg0yt But them into ENV{_LINK_} just like vcpkg_configure_make? (or ENV{LIBS} if nmake uses that...)

Something like vcpkg_configure_make does, for B, yes.

dg0yt · 2021-12-07T12:27:31Z

Alternative A: Update libcrypto.pc. Rebuilds all dependencies of openssl.
Alternative B: Pass cmake's implicit link libraries to nmake. Rebuilds all dependencies of vcpkg_build_nmake.

To unblock the highly desired proj changes now, I implemented alternative C: Add user32.lib explicitly where needed.

In the long run, I still prefer alternative B. But this would be a fundamental change. It would better go to a new port vcpkg-nmake instead of the currrent unversioned maintainer script.

dg0yt · 2021-12-07T12:43:53Z

CI strangeness: On osx, it rebuilds some ports which should be cached and are not affected by the changes. From the logs:

Build 1, 0f07f0f: Rebuilding readosm,

Agent: vcpkg-eg-mac-03

HEAD is now at 65433e8c3 Merge 0f07f0fe0c231c9e8da14def0f28642caf46283b into 431d3810aa9241aed49b14367be417f225d2af5e


                          freexl:x64-osx:     pass: 3336081133f426c8aa88c625fd0efa8c6f03cd9d481226770fb0c0abfa94bb5f
                         readosm:x64-osx:     pass: bd8d2ef7219f20a0174d386abcd73fc717429c326efe2be276a9e7c83f75416b

2021-12-07T12:15:13.8180670Z Uploaded binaries to 1 HTTP remotes.
2021-12-07T12:15:13.8183800Z Installing package readosm[core]:x64-osx...
2021-12-07T12:15:13.8256250Z Elapsed time for package readosm:x64-osx: 31.13 s

Build 2, d5bc878: Rebuiding freexl

Agent: vcpkg-eg-mac-03

HEAD is now at b5978228c Merge d5bc878bd0c63f843139520a133519e3f0b0963a into 431d3810aa9241aed49b14367be417f225d2af5e

                          freexl:x64-osx:     pass: 3336081133f426c8aa88c625fd0efa8c6f03cd9d481226770fb0c0abfa94bb5f
                         readosm:x64-osx:     pass: bd8d2ef7219f20a0174d386abcd73fc717429c326efe2be276a9e7c83f75416b

2021-12-07T12:25:59.1985960Z Uploaded binaries to 1 HTTP remotes.
2021-12-07T12:25:59.1988430Z Installing package freexl[core]:x64-osx...
2021-12-07T12:25:59.2056200Z Elapsed time for package freexl:x64-osx: 41.47 s

Build 2 was started after completing build 1, the ABI hashes didn't change, and master didn't change. Neither freexl nor readosm depend on the changed ports.

BillyONeal · 2021-12-10T02:18:21Z

Thanks for the updates!

dg0yt changed the title ~~[proj] Revise features and dependencies~~ [proj4] Revise features and dependencies Sep 30, 2021

github-actions bot approved these changes Sep 30, 2021

View reviewed changes

This was referenced Sep 30, 2021

[libspatialite] Revise portfile and update to 5.0.1 #20445

Merged

[proj4] Install pc file #20458

Merged

github-actions bot approved these changes Oct 5, 2021

View reviewed changes

PhoebeHui assigned JackBoosY Oct 8, 2021

JackBoosY added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Oct 8, 2021

JackBoosY suggested changes Oct 8, 2021

View reviewed changes

JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Oct 13, 2021

dg0yt force-pushed the proj-features branch from 1ad4712 to 367f995 Compare October 22, 2021 06:08

This was referenced Nov 12, 2021

[libspatialite] Use pkgconfig for nmake and autotools #20480

Merged

[proj4] Update to 8.0.0 #16494

Merged

dg0yt changed the title ~~[proj4] Revise features and dependencies~~ [proj4] Update to 8.1.1, revise features and dependencies Nov 19, 2021

dg0yt force-pushed the proj-features branch from 367f995 to 8fc92f7 Compare November 19, 2021 08:01

github-actions bot approved these changes Nov 19, 2021

View reviewed changes

Update to 8.1.1, cleanup patches

43abcb5

dg0yt force-pushed the proj-features branch from 8fc92f7 to 810c274 Compare November 19, 2021 08:13

github-actions bot approved these changes Nov 19, 2021

View reviewed changes

dg0yt added 5 commits November 19, 2021 09:23

Patch and use pc file installation from upstream

b560242

Simplify dependency fixup

2527b2a

Remove obsolete VCPKG_BUILD_SHARED_LIBS

73b12cd

Revise feature and dependency interface

d410448

Update versions

a720b47

dg0yt force-pushed the proj-features branch from 810c274 to a720b47 Compare November 19, 2021 08:24

github-actions bot approved these changes Nov 19, 2021

View reviewed changes

github-actions bot approved these changes Nov 20, 2021

View reviewed changes

dg0yt mentioned this pull request Nov 20, 2021

[curl] Update to 7.80, fix exported config #21554

Merged

Use all libs from proj.pc for gdal

881f836

dg0yt mentioned this pull request Nov 22, 2021

[proj4] update to 8.1.1 #19910

Closed

Merge branch 'master' of https://github.com/microsoft/vcpkg

40e2f45

github-actions bot approved these changes Nov 23, 2021

View reviewed changes

github-actions bot requested changes Dec 7, 2021

View reviewed changes

dg0yt added 2 commits December 7, 2021 07:35

Merge branch 'master' of https://github.com/microsoft/vcpkg into proj…

7806d2c

…-features

Update versions

a1b578a

dg0yt force-pushed the proj-features branch from f25b55e to a1b578a Compare December 7, 2021 06:37

github-actions bot approved these changes Dec 7, 2021

View reviewed changes

dg0yt marked this pull request as ready for review December 7, 2021 06:38

dg0yt mentioned this pull request Dec 7, 2021

[gdal] Add features for hdf5, netcdf, postgresql #21231

Merged

dg0yt added 2 commits December 7, 2021 13:09

Fix missing user32.lib when using libcrypto

373d980

Update versions

0f07f0f

github-actions bot approved these changes Dec 7, 2021

View reviewed changes

dg0yt added 2 commits December 7, 2021 13:21

Fix missing user32.lib when using libcrypto

bd033f0

Update versions

d5bc878

github-actions bot approved these changes Dec 7, 2021

View reviewed changes

dg0yt mentioned this pull request Dec 7, 2021

[X* libraries] new ports #21584

Closed

1 task

dg0yt mentioned this pull request Dec 8, 2021

[vcpkg-ci] Current CI problems #21905

Open

5 tasks

JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Dec 9, 2021

JackBoosY approved these changes Dec 9, 2021

View reviewed changes

JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Dec 9, 2021

BillyONeal merged commit a4f322c into microsoft:master Dec 10, 2021

dg0yt deleted the proj-features branch December 11, 2021 16:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[proj4] Update to 8.1.1, revise features and dependencies #20443

[proj4] Update to 8.1.1, revise features and dependencies #20443

dg0yt commented Sep 30, 2021 •

edited

Loading

dg0yt commented Sep 30, 2021

JackBoosY Oct 8, 2021

dg0yt Oct 8, 2021 •

edited

Loading

JackBoosY Oct 8, 2021

dg0yt Oct 8, 2021

JackBoosY Oct 9, 2021

dg0yt Oct 13, 2021

JackBoosY Oct 13, 2021

dg0yt Oct 13, 2021

dg0yt Nov 19, 2021

dg0yt commented Nov 11, 2021

dg0yt commented Nov 23, 2021

github-actions bot left a comment

dg0yt commented Dec 7, 2021

Neumann-A commented Dec 7, 2021 •

edited

Loading

dg0yt commented Dec 7, 2021

dg0yt commented Dec 7, 2021

dg0yt commented Dec 7, 2021

BillyONeal commented Dec 10, 2021

[proj4] Update to 8.1.1, revise features and dependencies #20443

[proj4] Update to 8.1.1, revise features and dependencies #20443

Conversation

dg0yt commented Sep 30, 2021 • edited Loading

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?

Important behavioural change

dg0yt commented Sep 30, 2021

Choose a reason for hiding this comment

dg0yt Oct 8, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dg0yt commented Nov 11, 2021

dg0yt commented Nov 23, 2021

github-actions bot left a comment

Choose a reason for hiding this comment

dg0yt commented Dec 7, 2021

Neumann-A commented Dec 7, 2021 • edited Loading

dg0yt commented Dec 7, 2021

dg0yt commented Dec 7, 2021

dg0yt commented Dec 7, 2021

BillyONeal commented Dec 10, 2021

dg0yt commented Sep 30, 2021 •

edited

Loading

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

dg0yt Oct 8, 2021 •

edited

Loading

Neumann-A commented Dec 7, 2021 •

edited

Loading