[osgEarth] Update port version to 3.5 #37613

plevy · 2024-03-21T22:32:33Z

If this PR updates an existing port, please uncomment and fill out this checklist:

[x ] Changes comply with the maintainer guide.
[ x] SHA512s are updated for each updated download.
[ x] The "supports" clause reflects platforms that may be fixed by this new version.
[ x] Any fixed CI baseline entries are removed from that file.
[ x] Any patches that are no longer applied are deleted from the port's directory.
[ x] The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
[ x] Only one version is added to each modified port's versions file.

FrankXie05 · 2024-03-22T07:24:38Z

ports/osgearth/find-package.patch

+ if(OSGEARTH_BUILD_CESIUM_NODEKIT)
+     find_package(CesiumNative)
+ endif()
+
+ if(OSGEARTH_BUILD_TRITON_NODEKIT)
+-    find_package(Triton)
+    find_package(Triton REQUIRED)
+ endif()
+
+ if(OSGEARTH_BUILD_SILVERLINING_NODEKIT)
+-    find_package(SilverLining)
+    find_package(SilverLining REQUIRED)
+ endif()


These now need to be added as features to support. Otherwise they cannot be used :)

-These now need to be added as features to support. +These now need to be added as dependencies.

Since Silverlining, Triton, and Cesium Native do not have vcpkg ports, the intention is not to be used and fail if someone tries to enable them. All 3 are going to be off by default as we did this with Silverlining and Triton in past ports.

Thank you

Since Silverlining, Triton, and Cesium Native do not have vcpkg ports,

Silverlining :
If the feature is not implemented, don't modify it

vcpkg/ports/osgearth/portfile.cmake

Line 64 in a34c873

-DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF

Triton:

If you want to modify find_package(Triton REQUIRED), please improve it to a feature (if the port is correct https://github.com/microsoft/vcpkg/blob/master/ports/triton/portfile.cmake)

Cesium Native:
If it's not supported, don't modify it. :)

FTR the lines are only moved, not added,

FrankXie05 · 2024-03-22T08:20:18Z

I will be converting your PR to draft status. When you respond, please revert to "ready for review".
That way, I can be aware that you've responded since you can't modify the tags.

plevy · 2024-03-26T00:14:49Z

I removed the modifications to Triton and Silverlining. The Triton that we use is this one:
https://sundog-soft.com/portfolio-items/the-triton-ocean-sdk/

Different than the other Triton with a port.

FrankXie05 · 2024-03-26T01:44:27Z

versions/o-/osgearth.json

+    {
+      "git-tree": "66666b6eb6c6823bce9b00d8651e6bd2fda42722",
+      "version": "3.5",
+      "port-version": 1
+    },


Suggested change

{

"git-tree": "66666b6eb6c6823bce9b00d8651e6bd2fda42722",

"version": "3.5",

"port-version": 1

},

Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>

plevy · 2024-04-30T14:22:31Z

@FrankXie05 @dg0yt I'd still like to complete this port. Any suggestions on how to move it forward?

dg0yt

After committing the changes, run vcpkg x-add-version --overwrite-version osgearth, and commit that, too.

And please fix an "osgEath" typo in the PR title.

dg0yt · 2024-04-30T17:13:39Z

ports/osgearth/link-libraries.patch

 MACRO(LINK_WITH_VARIABLES TRGTNAME)
+	string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}")
+	if(DEFINED ${lwv_libraries})
+		TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}})
+		continue()
+	endif()
     FOREACH(varname ${ARGN})
-+        string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}")
-+        if(DEFINED ${lwv_libraries})
-+            TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}})
-+            continue()
-+        endif()
         IF(${varname}_DEBUG)


This change looks invalid. The extra code is to use varname which is controlled by FOREACH(varname ${ARGN}).

dg0yt · 2024-04-30T17:14:03Z

ports/osgearth/vcpkg.json

@@ -1,6 +1,6 @@
 {
  "name": "osgearth",
-  "version": "3.4",
+  "version": "3.5",
  "port-version": 1,


Suggested change

"port-version": 1,

dg0yt · 2024-05-03T00:38:22Z

It cannot be merged in this state. Please respond to the review comments.

plevy · 2024-05-03T21:23:55Z

It cannot be merged in this state. Please respond to the review comments.

Fixed the patch but the build fails now. My cmake skills aren't strong, can you take a quick look at the failure. I think you wrote the original patch.

dg0yt

Please apply the suggestions in the source and recreate the patch.

ports/osgearth/link-libraries.patch

Co-authored-by: Kai Pastor <dg0yt@darc.de>

dg0yt · 2024-05-07T02:51:39Z

ports/osgearth/link-libraries.patch

+        string(REPLACE "_LIBRARY" "_LINK_LIBRARIES" lwv_link_libraries "${varname}")
+        if(DEFINED ${lwv_link_libraries})
+            TARGET_LINK_LIBRARIES(${TRGTNAME} PRIVATE ${${lwv_link_libraries}})
+            continue()
+        endif()
 +        string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}")
 +        if(DEFINED ${lwv_libraries})
-+            TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}})
+            TARGET_LINK_LIBRARIES(${TRGTNAME} PRIVATE ${${lwv_libraries}})
 +            continue()
 +        endif()


I think this will add some libraries twice now. LIBRARIES are included in LINK_LIBRARIES if the latter is defined. This should be avoided.

BillyONeal

Can you respond to dg0yt's feedback?

BillyONeal · 2024-06-12T23:41:39Z

ports/osgearth/exampleresources.patch

+         template<typename FUNC_TYPE>
+         struct Action {
+             FUNC_TYPE func;
+-            bool eat = true;


Is this patch submitted upstream?

plevy added 2 commits March 21, 2024 18:27

update to osgearth 3.5

1fcd86a

updated versions

44a493e

LilyWangLL assigned FrankXie05 Mar 22, 2024

FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Mar 22, 2024

FrankXie05 requested changes Mar 22, 2024

View reviewed changes

FrankXie05 marked this pull request as draft March 22, 2024 08:20

plevy marked this pull request as ready for review March 22, 2024 17:59

plevy added 2 commits March 25, 2024 17:26

remove changes to triton, silverlining, cesium

41cff9f

update versions

52eb7f9

FrankXie05 requested changes Mar 26, 2024

View reviewed changes

Update versions/o-/osgearth.json

8355184

Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>

plevy requested a review from FrankXie05 April 2, 2024 14:39

plevy requested a review from dg0yt April 30, 2024 14:22

dg0yt suggested changes Apr 30, 2024

View reviewed changes

plevy changed the title ~~update osgEath port to osgEarth 3.5~~ May 2, 2024

updated versions osgearth

9877ec7

plevy added 2 commits May 3, 2024 16:44

fix link-libraries patch

6224f7a

update versions

91bddec

dg0yt reviewed May 4, 2024

View reviewed changes

ports/osgearth/link-libraries.patch Outdated Show resolved Hide resolved

ports/osgearth/link-libraries.patch Outdated Show resolved Hide resolved

FrankXie05 changed the title ~~update osgEarth port to osgEarth 3.5~~ May 6, 2024

plevy and others added 5 commits May 6, 2024 01:14

Update ports/osgearth/link-libraries.patch

b38e703

Co-authored-by: Kai Pastor <dg0yt@darc.de>

Update ports/osgearth/link-libraries.patch

e72ef16

Co-authored-by: Kai Pastor <dg0yt@darc.de>

updated versions

09faeab

added PRIVATE to link target

4b95b25

updated version

3071db0

dg0yt reviewed May 7, 2024

View reviewed changes

BillyONeal reviewed Jun 12, 2024

View reviewed changes

BillyONeal marked this pull request as draft June 18, 2024 20:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[osgEarth] Update port version to 3.5 #37613

[osgEarth] Update port version to 3.5 #37613

plevy commented Mar 21, 2024

FrankXie05 Mar 22, 2024

dg0yt Mar 22, 2024

plevy Mar 22, 2024 •

edited

Loading

FrankXie05 Mar 25, 2024

dg0yt Mar 25, 2024

FrankXie05 commented Mar 22, 2024

plevy commented Mar 26, 2024

FrankXie05 Mar 26, 2024

plevy commented Apr 30, 2024

dg0yt left a comment

dg0yt Apr 30, 2024

dg0yt Apr 30, 2024

dg0yt commented May 3, 2024

plevy commented May 3, 2024

dg0yt left a comment

dg0yt May 7, 2024

BillyONeal left a comment

BillyONeal Jun 12, 2024

[osgEarth] Update port version to 3.5 #37613

Are you sure you want to change the base?

[osgEarth] Update port version to 3.5 #37613

Conversation

plevy commented Mar 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plevy Mar 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FrankXie05 commented Mar 22, 2024

plevy commented Mar 26, 2024

Choose a reason for hiding this comment

plevy commented Apr 30, 2024

dg0yt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dg0yt commented May 3, 2024

plevy commented May 3, 2024

dg0yt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BillyONeal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plevy Mar 22, 2024 •

edited

Loading