[inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision (#13584)

* [inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision

* Fix license path for fastrtps and remove bin with static build for kd-soap

4 files changed, 8 insertions, 45 deletions

diff --git a/ports/fastrtps/CONTROL b/ports/fastrtps/CONTROL
index f97ba46c7..8d52ba9a2 100644
--- a/ports/fastrtps/CONTROL
+++ b/ports/fastrtps/CONTROL
@@ -1,4 +1,5 @@
 Source: fastrtps
-Version: 1.5.0-3
+Version: 2.0.1
+Homepage: https://www.eprosima.com/
 Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.
-Build-Depends: openssl, asio, tinyxml2
\ No newline at end of file
+Build-Depends: openssl, asio, tinyxml2, fastcdr, foonathan-memory
\ No newline at end of file
diff --git a/ports/fastrtps/fix-install.patch b/ports/fastrtps/fix-install.patch
deleted file mode 100644
index 4777ae3ee..000000000
--- a/ports/fastrtps/fix-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt

-index a1e91fd..f5578cd 100644

---- a/src/cpp/CMakeLists.txt

-+++ b/src/cpp/CMakeLists.txt

-@@ -416,7 +416,8 @@ if(MSVC OR MSVC_IDE)

-             PATTERN "*.pdb"

-             )

- 

--        if(NOT (("${MSVC_ARCH}" STREQUAL "i86Win32VS2013") OR ("${MSVC_ARCH}" STREQUAL "x64Win64VS2013")))

-+        if(NOT (("${MSVC_ARCH}" STREQUAL "i86Win32VS2013") OR ("${MSVC_ARCH}" STREQUAL "x64Win64VS2013")

-+            OR ("${MSVC_ARCH}" STREQUAL "i86Win32VS2015") OR ("${MSVC_ARCH}" STREQUAL "x64Win64VS2015")))

-             install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_static.dir/Debug/${PROJECT_NAME}_static.pdb

-                 DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}

-                 COMPONENT libraries_${MSVC_ARCH}

diff --git a/ports/fastrtps/namespace_tinyxml2.patch b/ports/fastrtps/namespace_tinyxml2.patch
deleted file mode 100644
index 3df65996f..000000000
--- a/ports/fastrtps/namespace_tinyxml2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/modules/FindTinyXML2.cmake b/cmake/modules/FindTinyXML2.cmake

-index 24aa98a..4e2188e 100644

---- a/cmake/modules/FindTinyXML2.cmake

-+++ b/cmake/modules/FindTinyXML2.cmake

-@@ -7,10 +7,10 @@ option(TINYXML2_FROM_SOURCE "Integrate TinyXML2 source code inside Fast RTPS" OF

- find_package(TinyXML2 CONFIG QUIET)

- if(TinyXML2_FOUND)

-     message(STATUS "Found TinyXML2: ${TinyXML2_DIR}")

--    if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2)

-+    if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2::tinyxml2)

-         # in this case, we're probably using TinyXML2 version 5.0.0 or greater

-         # in which case tinyxml2 is an exported target and we should use that

--        set(TINYXML2_LIBRARY tinyxml2)

-+        set(TINYXML2_LIBRARY tinyxml2::tinyxml2)

-     endif()

- else()

-     if(THIRDPARTY)

diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake
index 3dfbe87c9..9f72b5d6f 100644
--- a/ports/fastrtps/portfile.cmake
+++ b/ports/fastrtps/portfile.cmake
@@ -1,12 +1,9 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO eProsima/Fast-DDS

-    REF b1779b608c7b5b2dcb101728f4213c58bdde74ee # waiting for next release

-    SHA512 f316a71784cdac5379b1cf59cee4bf57304aa59a73563fcbdd141b0d1297302048ca73817adca68baf18472e74f200af9490d2d6fa6124863ec260546fb373e4

+    REF 40568fa4784e846f95c461608d43a2b57eaef55b # v2.0.1

+    SHA512 a0cb48713a41ba3562c98dfc176508779e70e35b573428ac0a74c74254aa34c583bd545169f3a3961172bfc9e7bb14d08b5d56569e176fe8248d714bec5813a4

     HEAD_REF master

-    PATCHES 

-        fix-install.patch 

-        namespace_tinyxml2.patch 

 )

 

 vcpkg_configure_cmake(

@@ -17,13 +14,9 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastrtps/cmake)

+vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastrtps/cmake TARGET_PATH share/fastrtps)

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/examples)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/fastrtps)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/fastrtps)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 

-file(RENAME ${CURRENT_PACKAGES_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)