[gazebo] fix gazebo linux dependency

ports/gazebo/0001-Fix-deps.patch

@@ -1,102 +1,141 @@
-diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
-index 4085b5aaeb..f89ac88333 100644
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -179,7 +179,7 @@ if (PKG_CONFIG_FOUND)
-   # (needed, at least, for MacOS)
-
-   # Use system installation on UNIX and Apple, and internal copy on Windows
--  if (UNIX OR APPLE)
-+  if (true)
-     message (STATUS "Using system tinyxml.")
-     set (USE_EXTERNAL_TINYXML True)
-   elseif(WIN32)
-@@ -225,7 +225,7 @@ if (PKG_CONFIG_FOUND)
-   # (needed, at least, for MacOS)
-
-   # Use system installation on UNIX and Apple, and internal copy on Windows
--  if (UNIX OR APPLE)
-+  if (true)
-     message (STATUS "Using system tinyxml2.")
-     set (USE_EXTERNAL_TINYXML2 True)
-   elseif(WIN32)
-@@ -513,7 +513,7 @@ if (PKG_CONFIG_FOUND)
-   endif ()
-
-   if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND
--      libswscale_FOUND)
-+      libswscale_FOUND AND FFMPEG_FEATURE)
-     set (HAVE_FFMPEG TRUE)
-   else ()
-     set (HAVE_FFMPEG FALSE)
-@@ -538,7 +538,7 @@ if (PKG_CONFIG_FOUND)
-   ########################################
-   # Find GNU Triangulation Surface Library
-   pkg_check_modules(gts gts)
--  if (gts_FOUND)
-+  if (GTS_FEATURE)
-     message (STATUS "Looking for GTS - found")
-     set (HAVE_GTS TRUE)
-   else ()
-@@ -551,13 +551,14 @@ if (PKG_CONFIG_FOUND)
-   # First and preferred option is to look for bullet standard pkgconfig,
-   # so check it first. if it is not present, check for the OSRF
-   # custom bullet2.82.pc file
--  pkg_check_modules(BULLET bullet>=2.82)
-+  find_package(BULLET CONFIG 2.82)
-   if (NOT BULLET_FOUND)
-      pkg_check_modules(BULLET bullet2.82>=2.82)
-   endif()
-
-   if (BULLET_FOUND)
-     set (HAVE_BULLET TRUE)
-+    set(BULLET_VERSION ${BULLET_VERSION_STRING})
-     add_definitions( -DLIBBULLET_VERSION=${BULLET_VERSION} )
-   else()
-     set (HAVE_BULLET FALSE)
-@@ -572,7 +573,7 @@ if (PKG_CONFIG_FOUND)
-   ########################################
-   # Find libusb
-   pkg_check_modules(libusb-1.0 libusb-1.0)
--  if (NOT libusb-1.0_FOUND)
-+  if (NO_LIBUSB_FEATURE)
-     BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.")
-     set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE)
-   else()
-@@ -648,7 +649,7 @@ endif ()
- ########################################
- # Find gdal
- include (FindGDAL)
--if (NOT GDAL_FOUND)
-+if (NO_GDAL_FEATURE)
-   message (STATUS "Looking for libgdal - not found")
-   BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.")
-   set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE)
-@@ -718,7 +719,7 @@ endif()
- ########################################
- # Find graphviz
- include (${gazebo_cmake_dir}/FindGraphviz.cmake)
--if (NOT GRAPHVIZ_FOUND)
-+if (NO_GRAPHVIZ_FEATURE)
-   message (STATUS "Looking for libgraphviz-dev - not found")
-   BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.")
-   set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE)
-diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in
-index b57a90dd76..63ce97095e 100644
---- a/cmake/gazebo-config.cmake.in
-+++ b/cmake/gazebo-config.cmake.in
-@@ -99,12 +99,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ
-
- if (GAZEBO_HAS_BULLET)
-   if (PKG_CONFIG_FOUND)
--    pkg_check_modules(BULLET bullet>=2.82)
-+    find_package(BULLET CONFIG 2.82)
-     if (NOT BULLET_FOUND)
-        pkg_check_modules(BULLET bullet2.82>=2.82)
-     endif()
-
-     if (BULLET_FOUND)
-+      set(BULLET_VERSION ${BULLET_VERSION_STRING})
-       add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION})
-     else()
-       message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.")
+diff --git a/cmake/FindFreeimage.cmake b/cmake/FindFreeimage.cmake
+index a989ec7..2ec8fcc 100644
+--- a/cmake/FindFreeimage.cmake
++++ b/cmake/FindFreeimage.cmake
+@@ -33,6 +33,9 @@ if (NOT freeimage_FOUND)
+     endif (NOT FREEIMAGE_RUNS)
+   endif (NOT freeimage_INCLUDE_DIRS)
+
++  find_package(freeimage CONFIG REQUIRED)
++  set(freeimage_LIBRARIES freeimage::FreeImage)
++  if (0)
+   if (WIN32)
+     if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+       find_library(freeimage_LIBRARIES FreeImaged)
+@@ -49,4 +52,5 @@ if (NOT freeimage_FOUND)
+     message (STATUS "  Looking for libfreeimage - found")
+     include_directories(${freeimage_INCLUDE_DIRS})
+   endif (NOT freeimage_LIBRARIES)
++  endif()
+ endif (NOT freeimage_FOUND)
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 9777a46..11864ff 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -179,7 +179,7 @@ if (PKG_CONFIG_FOUND)
+   # (needed, at least, for MacOS)
+
+   # Use system installation on UNIX and Apple, and internal copy on Windows
+-  if (UNIX OR APPLE)
++  if (true)
+     message (STATUS "Using system tinyxml.")
+     set (USE_EXTERNAL_TINYXML True)
+   elseif(WIN32)
+@@ -225,7 +225,7 @@ if (PKG_CONFIG_FOUND)
+   # (needed, at least, for MacOS)
+
+   # Use system installation on UNIX and Apple, and internal copy on Windows
+-  if (UNIX OR APPLE)
++  if (true)
+     message (STATUS "Using system tinyxml2.")
+     set (USE_EXTERNAL_TINYXML2 True)
+   elseif(WIN32)
+@@ -329,6 +329,7 @@ if (PKG_CONFIG_FOUND)
+   #################################################
+   # Find OGRE
+
++  if (false)
+   pkg_check_modules(OGRE-RTShaderSystem
+                     OGRE-RTShaderSystem>=${MIN_OGRE_VERSION})
+
+@@ -375,8 +376,8 @@ if (PKG_CONFIG_FOUND)
+       set (OGRE_PLUGINDIR ${_pkgconfig_invoke_result})
+     endif()
+   endif()
+-
+-  if (NOT OGRE_FOUND)
++  endif()
++  if (true)
+     # Workaround for CMake bug https://gitlab.kitware.com/cmake/cmake/issues/17135,
+     # that prevents to successfully run a find_package(<package>) call if before there
+     # was a failed call to pkg_check_modules(<package> <package>)
+@@ -513,7 +514,7 @@ if (PKG_CONFIG_FOUND)
+   endif ()
+
+   if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND
+-      libswscale_FOUND)
++      libswscale_FOUND AND FFMPEG_FEATURE)
+     set (HAVE_FFMPEG TRUE)
+   else ()
+     set (HAVE_FFMPEG FALSE)
+@@ -538,7 +539,7 @@ if (PKG_CONFIG_FOUND)
+   ########################################
+   # Find GNU Triangulation Surface Library
+   pkg_check_modules(gts gts)
+-  if (gts_FOUND)
++  if (GTS_FEATURE)
+     message (STATUS "Looking for GTS - found")
+     set (HAVE_GTS TRUE)
+   else ()
+@@ -551,13 +552,14 @@ if (PKG_CONFIG_FOUND)
+   # First and preferred option is to look for bullet standard pkgconfig,
+   # so check it first. if it is not present, check for the OSRF
+   # custom bullet2.82.pc file
+-  pkg_check_modules(BULLET bullet>=2.82)
++  find_package(BULLET CONFIG 2.82)
+   if (NOT BULLET_FOUND)
+      pkg_check_modules(BULLET bullet2.82>=2.82)
+   endif()
+
+   if (BULLET_FOUND)
+     set (HAVE_BULLET TRUE)
++    set(BULLET_VERSION ${BULLET_VERSION_STRING})
+     add_definitions( -DLIBBULLET_VERSION=${BULLET_VERSION} )
+   else()
+     set (HAVE_BULLET FALSE)
+@@ -572,7 +574,7 @@ if (PKG_CONFIG_FOUND)
+   ########################################
+   # Find libusb
+   pkg_check_modules(libusb-1.0 libusb-1.0)
+-  if (NOT libusb-1.0_FOUND)
++  if (NO_LIBUSB_FEATURE)
+     BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.")
+     set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE)
+   else()
+@@ -648,7 +650,7 @@ endif ()
+ ########################################
+ # Find gdal
+ include (FindGDAL)
+-if (NOT GDAL_FOUND)
++if (NO_GDAL_FEATURE)
+   message (STATUS "Looking for libgdal - not found")
+   BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.")
+   set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE)
+@@ -732,7 +734,7 @@ endif()
+ ########################################
+ # Find graphviz
+ include (${gazebo_cmake_dir}/FindGraphviz.cmake)
+-if (NOT GRAPHVIZ_FOUND)
++if (NO_GRAPHVIZ_FEATURE)
+   message (STATUS "Looking for libgraphviz-dev - not found")
+   BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.")
+   set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE)
+diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in
+index b57a90d..63ce970 100644
+--- a/cmake/gazebo-config.cmake.in
++++ b/cmake/gazebo-config.cmake.in
+@@ -99,12 +99,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ
+
+ if (GAZEBO_HAS_BULLET)
+   if (PKG_CONFIG_FOUND)
+-    pkg_check_modules(BULLET bullet>=2.82)
++    find_package(BULLET CONFIG 2.82)
+     if (NOT BULLET_FOUND)
+        pkg_check_modules(BULLET bullet2.82>=2.82)
+     endif()
+
+     if (BULLET_FOUND)
++      set(BULLET_VERSION ${BULLET_VERSION_STRING})
+       add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION})
+     else()
+       message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.")

ports/gazebo/portfile.cmake

@@ -27,9 +27,9 @@ vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON
-        -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe
         ${FEATURE_OPTIONS}
+        -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON
+        "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}"
         -DBUILD_TESTING=OFF  # Not enabled by default, but to be sure
 )
 

ports/gazebo/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "gazebo",
   "version-date": "2022-01-20",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Open source robotics simulator.",
   "homepage": "http://gazebosim.org",
   "license": "Apache-2.0",
@@ -19,6 +19,7 @@
     "boost-thread",
     "boost-uuid",
     "ccd",
+    "freeimage",
     {
       "name": "hdf5",
       "features": [
@@ -30,6 +31,10 @@
     "ignition-math6",
     "ignition-msgs5",
     "ignition-transport8",
+    {
+      "name": "libtar",
+      "platform": "!windows"
+    },
     "ogre",
     {
       "name": "pkgconf",

ports/libtar/portfile.cmake

@@ -0,0 +1,15 @@
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH
+    URL https://repo.or.cz/libtar.git
+    REF 50dcdd27a33444b974d940ed5f225a2444e5aeba
+)
+
+vcpkg_configure_make(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_install_make()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"  "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/libtar/vcpkg.json

@@ -0,0 +1,8 @@
+{
+  "name": "libtar",
+  "version": "1.2.20",
+  "description": "TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching.",
+  "homepage": "https://github.com/laurikari/tre",
+  "license": "ICU",
+  "supports": "!windows"
+}

scripts/ci.baseline.txt

@@ -288,7 +288,6 @@ ftgl:x64-uwp=fail
 functions-framework-cpp:x64-uwp=fail
 fuzzylite:x64-osx=fail
 
-gazebo:x64-linux=fail
 # gsoap does not offer stable public source downloads
 gsoap:x64-windows        = skip
 gsoap:x86-windows        = skip

versions/baseline.json

@@ -2430,7 +2430,7 @@
     },
     "gazebo": {
       "baseline": "2022-01-20",
-      "port-version": 1
+      "port-version": 2
     },
     "gcem": {
       "baseline": "1.14.1",
@@ -4072,6 +4072,10 @@
       "baseline": "3.25",
       "port-version": 0
     },
+    "libtar": {
+      "baseline": "1.2.20",
+      "port-version": 0
+    },
     "libtasn1": {
       "baseline": "4.17.0",
       "port-version": 3

versions/g-/gazebo.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0575eb88760d8605617cd01db94b58444afccccc",
+      "version-date": "2022-01-20",
+      "port-version": 2
+    },
     {
       "git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4",
       "version-date": "2022-01-20",

versions/l-/libtar.json

@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a5593040e54dad7cd9a5b276ce458e6a435fb0b9",
+      "version": "1.2.20",
+      "port-version": 0
+    }
+  ]
+}