move to own git serverHEADmaster

7 files changed, 130 insertions, 0 deletions

diff --git a/vcpkg/ports/gz-common/003-include-chrono.patch b/vcpkg/ports/gz-common/003-include-chrono.patch
new file mode 100644
index 0000000..bf89471
--- /dev/null
+++ b/vcpkg/ports/gz-common/003-include-chrono.patch
@@ -0,0 +1,12 @@
+diff --git a/events/include/gz/common/Event.hh b/events/include/gz/common/Event.hh
+index a86c3ac07..936417d74 100644
+--- a/events/include/gz/common/Event.hh
++++ b/events/include/gz/common/Event.hh
+@@ -18,6 +18,7 @@
+ #define GZ_COMMON_EVENT_HH_
+ 
+ #include <atomic>
++#include <chrono>
+ #include <functional>
+ #include <list>
+ #include <map>
diff --git a/vcpkg/ports/gz-common/gdal-3.11.diff b/vcpkg/ports/gz-common/gdal-3.11.diff
new file mode 100644
index 0000000..227dd20
--- /dev/null
+++ b/vcpkg/ports/gz-common/gdal-3.11.diff
@@ -0,0 +1,21 @@
+diff --git a/geospatial/src/Dem.cc b/geospatial/src/Dem.cc
+index 88d541d..74eb78c 100644
+--- a/geospatial/src/Dem.cc
++++ b/geospatial/src/Dem.cc
+@@ -389,7 +389,6 @@ bool Dem::GeoReference(double _x, double _y,
+     {
+       gzerr << "Unable to transform terrain coordinate system for "
+              << "coordinates (" << _x << "," << _y << ")" << std::endl;
+-      OCTDestroyCoordinateTransformation(cT);
+       return false;
+     }
+ 
+@@ -401,7 +400,7 @@ bool Dem::GeoReference(double _x, double _y,
+     _latitude.SetDegree(yGeoDeg);
+     _longitude.SetDegree(xGeoDeg);
+ 
+-    OCTDestroyCoordinateTransformation(cT);
++    delete cT;
+   }
+   else
+   {
diff --git a/vcpkg/ports/gz-common/gz-utils3-log.diff b/vcpkg/ports/gz-common/gz-utils3-log.diff
new file mode 100644
index 0000000..9f762ac
--- /dev/null
+++ b/vcpkg/ports/gz-common/gz-utils3-log.diff
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae68cb7..9c5f952 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,7 @@ set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
+ #--------------------------------------
+ # Find gz-utils
+ gz_find_package(gz-utils3 REQUIRED COMPONENTS log)
++list(APPEND PROJECT_PKGCONFIG_REQUIRES_PRIVATE gz-utils3-log)
+ set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
+ 
+ #--------------------------------------
diff --git a/vcpkg/ports/gz-common/gz_remotery_vis.patch b/vcpkg/ports/gz-common/gz_remotery_vis.patch
new file mode 100644
index 0000000..9953387
--- /dev/null
+++ b/vcpkg/ports/gz-common/gz_remotery_vis.patch
@@ -0,0 +1,12 @@
+diff --git a/profiler/src/CMakeLists.txt b/profiler/src/CMakeLists.txt

+--- a/profiler/src/CMakeLists.txt

++++ b/profiler/src/CMakeLists.txt

+@@ -116,7 +116,7 @@

+   install(PROGRAMS

+     ${CMAKE_CURRENT_BINARY_DIR}/gz_remotery_vis

+-    DESTINATION ${GZ_PROFILER_SCRIPT_PATH})

++    DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/gz-common${PROJECT_VERSION_MAJOR})

+ 

+   install(DIRECTORY Remotery/vis/

+           DESTINATION ${GZ_PROFILER_VIS_PATH})

+ endif()

diff --git a/vcpkg/ports/gz-common/portfile.cmake b/vcpkg/ports/gz-common/portfile.cmake
new file mode 100644
index 0000000..5d70509
--- /dev/null
+++ b/vcpkg/ports/gz-common/portfile.cmake
@@ -0,0 +1,16 @@
+string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION})
+string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT})
+set(PACKAGE_NAME ${CMAKE_MATCH_1})
+
+ignition_modular_library(
+   NAME ${PACKAGE_NAME}
+   REF ${PORT}${VERSION_MAJOR}_${VERSION}
+   VERSION ${VERSION}
+   SHA512 0c652285b32d2d2f781595416fd80d6e52a6b765ba968d0018accc3688f4ee9d6ce62dbea74b98fa43ea40641c47020246e13645eac7940aa483057c958d3807
+   PATCHES
+      gz-utils3-log.diff
+      gz_remotery_vis.patch
+      pthread.diff
+      003-include-chrono.patch
+      gdal-3.11.diff
+)
diff --git a/vcpkg/ports/gz-common/pthread.diff b/vcpkg/ports/gz-common/pthread.diff
new file mode 100644
index 0000000..14ef278
--- /dev/null
+++ b/vcpkg/ports/gz-common/pthread.diff
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c5f952..d44132e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,6 +37,10 @@ endif()
+ #============================================================================
+ message(STATUS "\n\n-- ====== Finding Dependencies ======")
+ 
++gz_find_package(Threads REQUIRED IGNORE_PKGCONFIG)
++add_library(pthread ALIAS Threads::Threads)
++list(APPEND PROJECT_PKGCONFIG_LIBS_PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
++
+ #--------------------------------------
+ # Find gz-math
+ gz_find_package(gz-math8 REQUIRED_BY geospatial graphics events)
diff --git a/vcpkg/ports/gz-common/vcpkg.json b/vcpkg/ports/gz-common/vcpkg.json
new file mode 100644
index 0000000..9694cbb
--- /dev/null
+++ b/vcpkg/ports/gz-common/vcpkg.json
@@ -0,0 +1,42 @@
+{
+  "name": "gz-common",
+  "version": "6.0.2",
+  "port-version": 2,
+  "description": "Common libraries for robotics applications",
+  "homepage": "https://gazebosim.org/libs/common/",
+  "license": "Apache-2.0",
+  "dependencies": [
+    "assimp",
+    {
+      "name": "dlfcn-win32",
+      "platform": "windows | uwp"
+    },
+    {
+      "name": "ffmpeg",
+      "default-features": false,
+      "features": [
+        "avcodec",
+        "avdevice",
+        "avformat",
+        "swscale"
+      ]
+    },
+    "freeimage",
+    {
+      "name": "gdal",
+      "default-features": false
+    },
+    "gz-cmake",
+    "gz-math",
+    "gz-utils",
+    {
+      "name": "ignition-modularscripts",
+      "host": true
+    },
+    {
+      "name": "libuuid",
+      "platform": "!windows & !osx"
+    },
+    "tinyxml2"
+  ]
+}