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

[osgearth ] update osgearth to 3.2 and updated patches #20160

Merged
merged 6 commits into from
Sep 28, 2021
Merged

[osgearth ] update osgearth to 3.2 and updated patches #20160

merged 6 commits into from
Sep 28, 2021

Conversation

plevy
Copy link
Contributor

@plevy plevy commented Sep 14, 2021

Describe the pull request

  • What does your PR fix?

    Updates osgEarth to version 3.2 which required updates to the patches as well.
    Moved patch ports/osgearth/fix-dependencies.patch into make-all-find-packages-required.patch since both are patching
    dependencies.

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

    <all / linux, windows, ...>, <Yes/No>
    linux, windows

  • 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

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

@ghost
Copy link

ghost commented Sep 14, 2021

CLA assistant check
All CLA requirements met.

@JonLiu1993 JonLiu1993 self-assigned this Sep 15, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Sep 15, 2021
@JonLiu1993 JonLiu1993 changed the title initial update for osgearth 3.2 and updated patches [osgearth ] update osgearth to 3.2 and updated patches Sep 15, 2021
@JonLiu1993 JonLiu1993 linked an issue Sep 15, 2021 that may be closed by this pull request
ports/osgearth/vcpkg.json Outdated Show resolved Hide resolved
@JonLiu1993
Copy link
Member

@plevy ,Have you tested the feature locally?

@plevy
Copy link
Contributor Author

plevy commented Sep 20, 2021

@plevy ,Have you tested the feature locally?

Yes, but WIndows X64. The bulk of the changes are simply updating the patches to the new source code.

@JonLiu1993
Copy link
Member

@plevy ,Have you tested the feature locally?

Yes, but WIndows X64. The bulk of the changes are simply updating the patches to the new source code.

OK, I will test feature locally.

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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout e201002b4f4827d7b7b672f0c5c672a77fc3b77d -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json
index c6b582a..3809d39 100644
--- a/versions/o-/osgearth.json
+++ b/versions/o-/osgearth.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "343ea1d26c583372c988385681ab151fac9e6b88",
+      "git-tree": "ad6aaca479868cdc9fb4e0161288433ed338868f",
       "version": "3.2",
       "port-version": 0
     },

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/osgearth/portfile.cmake

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/osgearth/portfile.cmake

@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Sep 22, 2021
@JonLiu1993 JonLiu1993 removed the info:reviewed Pull Request changes follow basic guidelines label Sep 23, 2021
@chuyanjuncn
Copy link

updated? It is still ver 3.1 in ports folder.

@JonLiu1993
Copy link
Member

updated? It is still ver 3.1 in ports folder.

Wait for this pr be merged

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Sep 26, 2021
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/osgearth/portfile.cmake

@BillyONeal BillyONeal merged commit 124239f into microsoft:master Sep 28, 2021
@BillyONeal
Copy link
Member

Thanks for the update!

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.

[osgEarth] update to <3.2>
5 participants