From 10c0262c268d0a0bc0dd9604ed29cd6060bd3b8c Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Tue, 27 Dec 2022 20:01:00 +1100 Subject: [PATCH] [ignition-common3] Update to 3.14.1. (#28495) * [ignition-cmake2] Update to 2.16. * [ignition-math6] Update to 6.9.2. * [ignition-common] Update to 3.14.1. * Update versions. --- .../add-pkgconfig-and-remove-privatefor-limit.patch | 8 ++++---- ports/ignition-cmake2/portfile.cmake | 5 ++--- ports/ignition-cmake2/vcpkg.json | 3 +-- ports/ignition-common3/portfile.cmake | 4 ++-- ports/ignition-common3/vcpkg.json | 3 +-- ports/ignition-math6/portfile.cmake | 6 +++--- ports/ignition-math6/vcpkg.json | 3 +-- versions/baseline.json | 12 ++++++------ versions/i-/ignition-cmake2.json | 5 +++++ versions/i-/ignition-common3.json | 5 +++++ versions/i-/ignition-math6.json | 5 +++++ 11 files changed, 35 insertions(+), 24 deletions(-) diff --git a/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch b/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch index 5acf97537a..cb562df06d 100644 --- a/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch +++ b/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch @@ -2,16 +2,16 @@ diff --git a/cmake/IgnUtils.cmake b/cmake/IgnUtils.cmake index bc6dbdc..1e8adbb 100644 --- a/cmake/IgnUtils.cmake +++ b/cmake/IgnUtils.cmake -@@ -138,7 +138,7 @@ macro(ign_find_package PACKAGE_NAME) +@@ -142,7 +142,7 @@ macro(ign_find_package PACKAGE_NAME) #------------------------------------ # Define the expected arguments - set(options REQUIRED PRIVATE EXACT QUIET BUILD_ONLY PKGCONFIG_IGNORE) + set(options REQUIRED PRIVATE EXACT QUIET CONFIG BUILD_ONLY PKGCONFIG_IGNORE) - set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON) + set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON BY_PKGCONFIG) set(multiValueArgs REQUIRED_BY PRIVATE_FOR COMPONENTS OPTIONAL_COMPONENTS) #------------------------------------ -@@ -183,9 +183,15 @@ macro(ign_find_package PACKAGE_NAME) +@@ -191,9 +191,15 @@ macro(ign_find_package PACKAGE_NAME) endif() @@ -27,7 +27,7 @@ index bc6dbdc..1e8adbb 100644 if(${PACKAGE_NAME}_FOUND) -@@ -300,17 +306,11 @@ macro(ign_find_package PACKAGE_NAME) +@@ -319,17 +325,11 @@ macro(ign_find_package PACKAGE_NAME) endif() if(ign_find_package_REQUIRED_BY) diff --git a/ports/ignition-cmake2/portfile.cmake b/ports/ignition-cmake2/portfile.cmake index 93dc94a3d6..00fca8f5d3 100644 --- a/ports/ignition-cmake2/portfile.cmake +++ b/ports/ignition-cmake2/portfile.cmake @@ -1,10 +1,9 @@ -set(PACKAGE_VERSION "2.5.0") +set(PACKAGE_VERSION "2.16.0") ignition_modular_library(NAME cmake VERSION ${PACKAGE_VERSION} - SHA512 e39ed44ae6f7ccc338412f466f1257f88989e0818bee801ddbe09350e906cd9ce709be24356310fdbfde22d1b5b5846fed0aa794c06dcf7caf82748a07b428d6 + SHA512 6ee64ff6c82c657678188be459c50a4255fd3881d758906d93361425702d04854a13a46124b20e058069f314077ba7e6c15a058153b615b3245084f066d1cbae PATCHES - FindGTS.patch add-pkgconfig-and-remove-privatefor-limit.patch) # Install custom usage diff --git a/ports/ignition-cmake2/vcpkg.json b/ports/ignition-cmake2/vcpkg.json index 84fcf05c34..98d4e3e431 100644 --- a/ports/ignition-cmake2/vcpkg.json +++ b/ports/ignition-cmake2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ignition-cmake2", - "version": "2.5.0", - "port-version": 3, + "version": "2.16.0", "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/ignition-common3/portfile.cmake b/ports/ignition-common3/portfile.cmake index 5ea87a9355..f8269c11fc 100644 --- a/ports/ignition-common3/portfile.cmake +++ b/ports/ignition-common3/portfile.cmake @@ -1,6 +1,6 @@ ignition_modular_library(NAME common - VERSION "3.9.0" - SHA512 1bae86efd7da10ac517d67a75ad1b612ea2046128eb75e0f0a134ffff7cc76431e850a9b46fdb7dc6603e2acb044f4204fdedaf38fc7bff82883db3f36830fb9 + VERSION "3.14.1" + SHA512 5f83685b67cb0b8e295136f74a681e2ca5f00a730b0a221f0c00cab5f9049c84692185fb5924ab29cd07cbdf85450e81dfcdc984fc8af4ed4cc549b2fe2f9a6e OPTIONS -DUSE_EXTERNAL_TINYXML2=ON PATCHES fix-dependencies.patch) diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json index f25d46d506..29046dc3e3 100644 --- a/ports/ignition-common3/vcpkg.json +++ b/ports/ignition-common3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ignition-common3", - "version": "3.9.0", - "port-version": 4, + "version": "3.14.1", "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": null, diff --git a/ports/ignition-math6/portfile.cmake b/ports/ignition-math6/portfile.cmake index fc9ac44696..52e9ae82b8 100644 --- a/ports/ignition-math6/portfile.cmake +++ b/ports/ignition-math6/portfile.cmake @@ -1,4 +1,4 @@ ignition_modular_library(NAME math - VERSION "6.6.0" - SHA512 6c0a6e7098f31b3dc9abbcd8714808669eca10e385748d4c1b44aa06dcfa5701906bea0277a99c3132fdd1a8c9a8e9c593099ac0eedfe5dec370018b2b63bfec - PATCHES fix-isspace.patch) + VERSION "6.9.2" + SHA512 87fe43f745a2337e1b4c92abdb98180d55cf6034f9b85e93e42ab1c6e0af645912b9a246589115f919ca1fe7ecb38090fe76cdd0d6726315ffb0f090626c0634 + ) diff --git a/ports/ignition-math6/vcpkg.json b/ports/ignition-math6/vcpkg.json index dc47d87539..ad2325291e 100644 --- a/ports/ignition-math6/vcpkg.json +++ b/ports/ignition-math6/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ignition-math6", - "version": "6.6.0", - "port-version": 3, + "version": "6.9.2", "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 5ce74b58bd..0f514a46d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3001,16 +3001,16 @@ "port-version": 4 }, "ignition-cmake2": { - "baseline": "2.5.0", - "port-version": 3 + "baseline": "2.16.0", + "port-version": 0 }, "ignition-common1": { "baseline": "1.1.1", "port-version": 3 }, "ignition-common3": { - "baseline": "3.9.0", - "port-version": 4 + "baseline": "3.14.1", + "port-version": 0 }, "ignition-fuel-tools1": { "baseline": "1.2.0", @@ -3025,8 +3025,8 @@ "port-version": 3 }, "ignition-math6": { - "baseline": "6.6.0", - "port-version": 3 + "baseline": "6.9.2", + "port-version": 0 }, "ignition-modularscripts": { "baseline": "2022-05-11", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index 652bc5f9cb..bf739cda16 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e94a4739cf0e6197a67fbd5770cbff1afcf5f51", + "version": "2.16.0", + "port-version": 0 + }, { "git-tree": "04ad74fe00ed7c2030aec3e27fc0beaaf2c90bf8", "version": "2.5.0", diff --git a/versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json index b34807520d..375f3e4324 100644 --- a/versions/i-/ignition-common3.json +++ b/versions/i-/ignition-common3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f63b7872dccdd6f71e0a075ea4bbf677c679a9d8", + "version": "3.14.1", + "port-version": 0 + }, { "git-tree": "6dc33f01d43ba86ec811a09138434f76815a40c8", "version": "3.9.0", diff --git a/versions/i-/ignition-math6.json b/versions/i-/ignition-math6.json index 4fa097963a..ba446607ee 100644 --- a/versions/i-/ignition-math6.json +++ b/versions/i-/ignition-math6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ba12e1d6fbb4b7b72e209a4dad9b3bf0ec83879", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "eb148027e8b1f6b1c6a47500140fa02467911e26", "version": "6.6.0",