[sdformat9] Update to 9.4.0 (#15720)

* Update sdformat9 to 9.4.0 * Update port_versions for sdformat9 9.4.0
2021-01-19 20:09:54 +01:00 · 2021-01-19 20:09:54 +01:00 · 0c8af399f5
parent 6690611750
commit 0c8af399f5
6 changed files with 13 additions and 191 deletions
--- 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": {
--- 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",
--- 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)
--- 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})
--- 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
 )

--- a/ports/sdformat9/respect-build-testing.patch
+++ b/ports/sdformat9/respect-build-testing.patch
@ -1,182 +0,0 @@
-From f31b1d65e0cc550d37ff9f67a01af055534282d0 Mon Sep 17 00:00:00 2001
-From: Silvio <silvio.traversaro@iit.it>
-Date: Sat, 2 May 2020 12:39:02 +0200
-Subject: [PATCH] If defined observe the CMake variable BUILD_TESTING
-
-For backward compatibility if it is not defined compile the tests
-
-Signed-off-by: Silvio <silvio.traversaro@iit.it>
---
- CMakeLists.txt     |  10 +++-
- src/CMakeLists.txt | 136 +++++++++++++++++++++++----------------------
- 2 files changed, 78 insertions(+), 68 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c0b934f9..38a71649 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -265,7 +265,15 @@ else (build_errors)
- 
-     link_directories(${PROJECT_BINARY_DIR}/src)
- 
-    add_subdirectory(test)
-+    if (NOT DEFINED BUILD_TESTING OR BUILD_TESTING)
-+      set(BUILD_SDF_TEST TRUE)
-+    else()
-+      set(BUILD_SDF_TEST FALSE)
-+    endif()
-+
-+    if (BUILD_SDF_TEST)
-+      add_subdirectory(test)
-+    endif()
-     add_subdirectory(src)
-     add_subdirectory(include/sdf)
-     add_subdirectory(sdf)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7dbb9536..c283a00a 100644
--- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -91,74 +91,76 @@ else()
-   include_directories(${URDF_INCLUDE_DIRS})
- endif()
- 
-set (gtest_sources
-  Actor_TEST.cc
-  AirPressure_TEST.cc
-  Altimeter_TEST.cc
-  Atmosphere_TEST.cc
-  Box_TEST.cc
-  Camera_TEST.cc
-  Collision_TEST.cc
-  Console_TEST.cc
-  Cylinder_TEST.cc
-  Element_TEST.cc
-  Error_TEST.cc
-  Exception_TEST.cc
-  Frame_TEST.cc
-  Filesystem_TEST.cc
-  Geometry_TEST.cc
-  Gui_TEST.cc
-  Imu_TEST.cc
-  Joint_TEST.cc
-  JointAxis_TEST.cc
-  Lidar_TEST.cc
-  Light_TEST.cc
-  Link_TEST.cc
-  Magnetometer_TEST.cc
-  Material_TEST.cc
-  Mesh_TEST.cc
-  Model_TEST.cc
-  Noise_TEST.cc
-  parser_urdf_TEST.cc
-  Param_TEST.cc
-  parser_TEST.cc
-  Pbr_TEST.cc
-  Physics_TEST.cc
-  Plane_TEST.cc
-  Root_TEST.cc
-  Scene_TEST.cc
-  SemanticPose_TEST.cc
-  SDF_TEST.cc
-  Sensor_TEST.cc
-  Sphere_TEST.cc
-  Surface_TEST.cc
-  Types_TEST.cc
-  Visual_TEST.cc
-  World_TEST.cc
-)
-
-# Build this test file only if Ignition Tools is installed.
-if (IGNITION-TOOLS_BINARY_DIRS)
-  set (gtest_sources ${gtest_sources}
-    ign_TEST.cc
-+if (BUILD_SDF_TEST)
-+  set (gtest_sources
-+    Actor_TEST.cc
-+    AirPressure_TEST.cc
-+    Altimeter_TEST.cc
-+    Atmosphere_TEST.cc
-+    Box_TEST.cc
-+    Camera_TEST.cc
-+    Collision_TEST.cc
-+    Console_TEST.cc
-+    Cylinder_TEST.cc
-+    Element_TEST.cc
-+    Error_TEST.cc
-+    Exception_TEST.cc
-+    Frame_TEST.cc
-+    Filesystem_TEST.cc
-+    Geometry_TEST.cc
-+    Gui_TEST.cc
-+    Imu_TEST.cc
-+    Joint_TEST.cc
-+    JointAxis_TEST.cc
-+    Lidar_TEST.cc
-+    Light_TEST.cc
-+    Link_TEST.cc
-+    Magnetometer_TEST.cc
-+    Material_TEST.cc
-+    Mesh_TEST.cc
-+    Model_TEST.cc
-+    Noise_TEST.cc
-+    parser_urdf_TEST.cc
-+    Param_TEST.cc
-+    parser_TEST.cc
-+    Pbr_TEST.cc
-+    Physics_TEST.cc
-+    Plane_TEST.cc
-+    Root_TEST.cc
-+    Scene_TEST.cc
-+    SemanticPose_TEST.cc
-+    SDF_TEST.cc
-+    Sensor_TEST.cc
-+    Sphere_TEST.cc
-+    Surface_TEST.cc
-+    Types_TEST.cc
-+    Visual_TEST.cc
-+    World_TEST.cc
-   )
-endif()
-
-sdf_build_tests(${gtest_sources})
-
-if (NOT WIN32)
-  set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc)
-  sdf_build_tests(Utils_TEST.cc)
-endif()
-
-if (NOT WIN32)
-  set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc)
-  sdf_build_tests(FrameSemantics_TEST.cc)
-endif()
-
-if (NOT WIN32)
-  set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Converter.cc)
-  sdf_build_tests(Converter_TEST.cc)
-+  
-+  # Build this test file only if Ignition Tools is installed.
-+  if (IGNITION-TOOLS_BINARY_DIRS)
-+    set (gtest_sources ${gtest_sources}
-+      ign_TEST.cc
-+    )
-+  endif()
-+  
-+  sdf_build_tests(${gtest_sources})
-+  
-+  if (NOT WIN32)
-+    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc)
-+    sdf_build_tests(Utils_TEST.cc)
-+  endif()
-+  
-+  if (NOT WIN32)
-+    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc)
-+    sdf_build_tests(FrameSemantics_TEST.cc)
-+  endif()
-+  
-+  if (NOT WIN32)
-+    set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Converter.cc)
-+    sdf_build_tests(Converter_TEST.cc)
-+  endif()
- endif()
- 
- sdf_add_library(${sdf_target} ${sources})