[sdformat9] Update to 9.4.0 (#15720)

* Update sdformat9 to 9.4.0 * Update port_versions for sdformat9 9.4.0
microsoft · Jan 19, 2021 · 0c8af39 · 0c8af39
1 parent 6690611
commit 0c8af39
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 191 deletions.
diff --git a/port_versions/baseline.json b/port_versions/baseline.json
@@ -5165,7 +5165,7 @@
       "port-version": 0
     },
     "sdformat9": {
-      "baseline": "9.2.0-1",
+      "baseline": "9.4.0",
       "port-version": 0
     },
     "sdl1": {

diff --git a/port_versions/s-/sdformat9.json b/port_versions/s-/sdformat9.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "750aebae0f740736affd93087026e0e344d81af2",
+      "version-string": "9.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "54ae4ec88f43847be416ec4fbf9348a90e2c5b63",
       "version-string": "9.2.0-1",

diff --git a/ports/sdformat9/CONTROL b/ports/sdformat9/CONTROL
@@ -1,6 +1,6 @@
 Source: sdformat9
-Version: 9.2.0-1
+Version: 9.4.0
 Homepage: http://sdformat.org/
 Build-Depends: ignition-math6, urdfdom, tinyxml
 Description: Simulation Description Format (SDF) parser and description files.
-Supports: !(linux|uwp)
+Supports: !(linux|uwp)
diff --git a/ports/sdformat9/fix-dependency-urdfdom.patch b/ports/sdformat9/fix-dependency-urdfdom.patch
@@ -12,6 +12,6 @@ index 965f1ec..cf2acf4 100644
 
 -  if (NOT URDF_FOUND)
 +  if (NOT urdfdom_FOUND)
-     if (NOT DEFINED USE_INTERNAL_URDF)
-       message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy")
-       set(USE_INTERNAL_URDF true)
+    find_package(urdfdom)
+    if (urdfdom_FOUND)
+      set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS})
diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake
@@ -3,11 +3,10 @@ vcpkg_fail_port_install(ON_TARGET "linux" "uwp")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO osrf/sdformat
-    REF sdformat9_9.2.0
-    SHA512 6fc7d0ce46d9a7d1cae4fd905ebe6a07bb4ba98faa267be92a32b3409d6d82a99d5082485008a15484f7b5be2c347b5b24bc472fb1a4be5eb8b678b105cae6af
+    REF sdformat9_9.4.0
+    SHA512 b7ed458a5a9ba5b5dcf457d3e0c9de0bca3d514a6870aa977a00a84f8a3b8d1bd21f3b437c0651af7f0cc9b9c6c8b905c968525194605b334ab62280b9d55b0e 
     HEAD_REF sdf9
     PATCHES
-        respect-build-testing.patch # Backport of https://github.com/osrf/sdformat/pull/269
         fix-dependency-urdfdom.patch
 )
 

diff --git a/ports/sdformat9/respect-build-testing.patch b/ports/sdformat9/respect-build-testing.patch