[eCAL] Update to 5.13.2 (#39595)

ports/ecal/0001-disable-app-plugins.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ea1fb066..351fe6c3f 100644
+index 4f2fc25d2..e82e353e0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -351,8 +351,10 @@ endif(HAS_QT5)
+@@ -357,8 +357,10 @@ endif()
  # --------------------------------------------------------
  # ecal rec addon sdk
  # --------------------------------------------------------

ports/ecal/0002-fix-build.patch

@@ -1,40 +1,27 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 351fe6c3f..64d5bb384 100644
+index e82e353e0..19d8f2a93 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -27,7 +27,8 @@ endif (POLICY CMP0077)
+@@ -26,7 +26,8 @@ endif (POLICY CMP0077)
  
  list(APPEND CMAKE_MODULE_PATH
    ${CMAKE_CURRENT_SOURCE_DIR}/cmake
 -  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 +  # Removed project specific Module overrides
 +)
+   
+ set(eCAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
  
- project(eCAL)
+@@ -221,6 +222,8 @@ set(possible_subprojects
- set(ECAL_PROJECT_ROOT "${CMAKE_CURRENT_LIST_DIR}")
+ set(ECAL_THIRDPARTY_BUILD_CMAKEFUNCTIONS ${ECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS})
-@@ -212,11 +213,13 @@ foreach (dep IN LISTS possible_subprojects)
-   endif ()
- endforeach()
- 
-+if(NOT DISABLE_FIND_PACKAGE_OVERLOAD)
- macro(find_package)
-   if(NOT "${ARGV0}" IN_LIST as_subproject)
-     _find_package(${ARGV})
-   endif()
- endmacro()
-+endif()
  
  # if a package does need to be build, include the cmake file with build instructions
++# Disable all submodules, except CMakeFunctions which isn't a submodule and required
++set(possible_subprojects "CMakeFunctions")
  foreach (dep IN LISTS possible_subprojects)
-@@ -232,7 +235,6 @@ if(MSVC)
+   string(TOUPPER ${dep} dep_upper)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_OLD}")
+   string(TOLOWER ${dep} dep_lower)
- endif()
+@@ -336,7 +339,9 @@ add_subdirectory(ecal/core)
- 
--find_package(CMakeFunctions REQUIRED)
- 
- git_revision_information(DEFAULT ${ECAL_BUILD_VERSION})
- set(eCAL_VERSION_MAJOR  ${GIT_REVISION_MAJOR})
-@@ -330,7 +332,9 @@ add_subdirectory(ecal/core)
  # custom libs
  # --------------------------------------------------------
  add_subdirectory(lib/ThreadingUtils)
@@ -44,8 +31,8 @@ index 351fe6c3f..64d5bb384 100644
 +# add_subdirectory(lib/CustomTclap)
  add_subdirectory(lib/ecal_utils)
  
- if(HAS_QT5)
+ if(HAS_QT)
-@@ -549,7 +553,9 @@ endif()
+@@ -559,7 +564,9 @@ endif()
  # --------------------------------------------------------
  # create package
  # --------------------------------------------------------
@@ -56,11 +43,11 @@ index 351fe6c3f..64d5bb384 100644
  message(STATUS "Build Options:")
  message(STATUS "--------------------------------------------------------------------------------")
 diff --git a/contrib/ecalhdf5/CMakeLists.txt b/contrib/ecalhdf5/CMakeLists.txt
-index 080c40e28..c167bacd4 100644
+index d5285101c..3b7eb705a 100644
 --- a/contrib/ecalhdf5/CMakeLists.txt
 +++ b/contrib/ecalhdf5/CMakeLists.txt
-@@ -58,7 +58,12 @@ set(ecalhdf5_header_base
+@@ -55,7 +55,12 @@ set(ecalhdf5_header_base
-     include/ecalhdf5/eh5_types.h   
+     include/ecalhdf5/eh5_types.h
  )
  
 +if (WIN32)
@@ -90,7 +77,7 @@ index 04f1a1b9a..58df32705 100644
  target_include_directories(${PROJECT_NAME} PUBLIC 
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
-index 5c2b6e33d..3c7d57189 100644
+index f18dd6291..8655d134a 100644
 --- a/ecal/core/CMakeLists.txt
 +++ b/ecal/core/CMakeLists.txt
 @@ -20,8 +20,6 @@ project(core VERSION ${eCAL_VERSION_STRING})
@@ -102,7 +89,7 @@ index 5c2b6e33d..3c7d57189 100644
  find_package(tcp_pubsub   REQUIRED)
  if (ECAL_NPCAP_SUPPORT)
    find_package(udpcap REQUIRED)
-@@ -492,14 +490,20 @@ target_link_libraries(${PROJECT_NAME}
+@@ -549,8 +547,6 @@ target_link_libraries(${PROJECT_NAME}
      $<$<BOOL:${WIN32}>:wsock32>
      $<$<BOOL:${QNXNTO}>:socket>
      asio::asio
@@ -111,7 +98,8 @@ index 5c2b6e33d..3c7d57189 100644
      eCAL::core_pb
      Threads::Threads
      eCAL::ecal-utils
-     tcp_pubsub::tcp_pubsub
+@@ -558,6 +554,14 @@ target_link_libraries(${PROJECT_NAME}
+     ecal_service
  )
  
 +# tclap is header only and only used for implementation
@@ -125,10 +113,23 @@ index 5c2b6e33d..3c7d57189 100644
  set_property(TARGET ${PROJECT_NAME}   PROPERTY FOLDER ecal/core)
  set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core)
  
-diff --git a/thirdparty/cmake_functions/CMakeLists.txt b/thirdparty/cmake_functions/CMakeLists.txt
+diff --git a/ecal/service/ecal_service/CMakeLists.txt b/ecal/service/ecal_service/CMakeLists.txt
-index b3e93261a..3ba185a97 100644
+index 0ac70a214..6a565c726 100644
---- a/thirdparty/cmake_functions/CMakeLists.txt
+--- a/ecal/service/ecal_service/CMakeLists.txt
-+++ b/thirdparty/cmake_functions/CMakeLists.txt
++++ b/ecal/service/ecal_service/CMakeLists.txt
+@@ -99,6 +99,8 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
+     FOLDER ecal/service
+ )
+ 
++ecal_install_library(${PROJECT_NAME})
++
+ ##################################
+ 
+ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES 
+diff --git a/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt b/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt
+index 8d13b791c..6ed0d1a14 100644
+--- a/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt
++++ b/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt
 @@ -40,4 +40,6 @@ foreach (f ${file_list})
    install( FILES ${f} DESTINATION "${cmake_functions_install_cmake_dir}/${dir}" )
  endforeach()
@@ -136,17 +137,16 @@ index b3e93261a..3ba185a97 100644
 +if(CPACK_PACK_WITH_INNOSETUP)
  include(cmake/cpack_variables.cmake)
 +endif()
-diff --git a/thirdparty/cmake_functions/cmake_functions.cmake b/thirdparty/cmake_functions/cmake_functions.cmake
+diff --git a/thirdparty/cmakefunctions/cmake_functions/cmake_functions.cmake b/thirdparty/cmakefunctions/cmake_functions/cmake_functions.cmake
-index 0c3659e5c..127eb14e6 100644
+index a053b06e6..127eb14e6 100644
---- a/thirdparty/cmake_functions/cmake_functions.cmake
+--- a/thirdparty/cmakefunctions/cmake_functions/cmake_functions.cmake
-+++ b/thirdparty/cmake_functions/cmake_functions.cmake
++++ b/thirdparty/cmakefunctions/cmake_functions/cmake_functions.cmake
-@@ -5,23 +5,12 @@ set (file_list_include
+@@ -5,22 +5,12 @@ set (file_list_include
    target_definitions/targets_protobuf.cmake
  )
  
 -if(WIN32)
 -  list(APPEND file_list_include
--    qt/qt_msvc_path.cmake
 -    qt/qt_windeployqt.cmake
 -  )
 -endif()

ports/ecal/0004-install-cmake-files-to-share.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64d5bb384..1f08d4bab 100644
+index 19d8f2a93..dca8948be 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -274,7 +274,7 @@ set(eCAL_install_app_dir           ${CMAKE_INSTALL_BINDIR})
+@@ -277,7 +277,7 @@ set(eCAL_install_app_dir           ${CMAKE_INSTALL_BINDIR})
  set(eCAL_install_archive_dir       ${CMAKE_INSTALL_LIBDIR})
  set(eCAL_install_archive_dyn_dir   ${CMAKE_INSTALL_LIBDIR})
  set(eCAL_install_bin_dir           ${CMAKE_INSTALL_BINDIR})
@@ -11,10 +11,10 @@ index 64d5bb384..1f08d4bab 100644
  set(eCAL_install_config_dir        ${CMAKE_INSTALL_SYSCONFDIR}/ecal)
  set(eCAL_install_doc_dir           ${CMAKE_INSTALL_DOCDIR})
  set(eCAL_install_include_dir       ${CMAKE_INSTALL_INCLUDEDIR})
-diff --git a/thirdparty/cmake_functions/CMakeLists.txt b/thirdparty/cmake_functions/CMakeLists.txt
+diff --git a/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt b/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt
-index 3ba185a97..aa9e8a736 100644
+index 6ed0d1a14..9a833a1f9 100644
---- a/thirdparty/cmake_functions/CMakeLists.txt
+--- a/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt
-+++ b/thirdparty/cmake_functions/CMakeLists.txt
++++ b/thirdparty/cmakefunctions/cmake_functions/CMakeLists.txt
 @@ -4,12 +4,8 @@ include(cmake_functions.cmake)
  
  project(CMakeFunctions VERSION 0.4.1)

ports/ecal/0007-allow-static-build-of-core.patch

@@ -1,18 +1,18 @@
 diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
-index 3c7d57189..775f8a7c8 100644
+index 8655d134a..03d0f7c81 100644
 --- a/ecal/core/CMakeLists.txt
 +++ b/ecal/core/CMakeLists.txt
-@@ -397,7 +397,7 @@ set(ecal_header_base
+@@ -449,7 +449,7 @@ set(ecal_header_public
      ${ecal_header_msg}
  )
  
 -ecal_add_ecal_shared_library(${PROJECT_NAME} 
 +ecal_add_library(${PROJECT_NAME} 
-     ${ecal_custom_tclap_cpp_src}
+     ${ecal_config_src}
-     ${ecal_io_cpp_src} 
+     ${ecal_io_mtx_src}
-     ${ecal_io_mem_cpp_src} 
+     ${ecal_io_mtx_linux_src}
-@@ -433,7 +433,7 @@ if(UNIX)
+@@ -483,7 +483,7 @@ if(UNIX)
-   set_source_files_properties(src/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
+   set_source_files_properties(src/util/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough)
  endif()
  
 -ecal_add_ecal_shared_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src})
@@ -20,9 +20,9 @@ index 3c7d57189..775f8a7c8 100644
  
  add_library(eCAL::${PROJECT_NAME}   ALIAS ${PROJECT_NAME})
  add_library(eCAL::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c)
-@@ -457,6 +457,11 @@ target_compile_definitions(${PROJECT_NAME}
+@@ -514,6 +514,11 @@ target_compile_definitions(${PROJECT_NAME}
-     $<$<BOOL:${ECAL_HAS_ROBUST_MUTEX}>:ECAL_HAS_ROBUST_MUTEX>
+     ECALC_NO_DEPRECATION_WARNINGS
-     $<$<BOOL:${ECAL_USE_CLOCKLOCK_MUTEX}>:ECAL_USE_CLOCKLOCK_MUTEX>)
+ )
  
 +if(BUILD_SHARED_LIBS)
 +  target_compile_definitions(${PROJECT_NAME}_c PUBLIC eCAL_SHARED_LIB)
@@ -32,7 +32,7 @@ index 3c7d57189..775f8a7c8 100644
  if(ECAL_NPCAP_SUPPORT)
    target_compile_definitions(${PROJECT_NAME}
      PRIVATE ECAL_NPCAP_SUPPORT)
-@@ -507,8 +512,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIRS})
+@@ -565,8 +570,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIRS})
  set_property(TARGET ${PROJECT_NAME}   PROPERTY FOLDER ecal/core)
  set_property(TARGET ${PROJECT_NAME}_c PROPERTY FOLDER ecal/core)
  
@@ -44,7 +44,7 @@ index 3c7d57189..775f8a7c8 100644
  install(DIRECTORY
     "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk
 diff --git a/ecal/core/include/ecal/ecal_os.h b/ecal/core/include/ecal/ecal_os.h
-index a962036f2..5d466cc86 100644
+index 2b051d893..f24cdc325 100644
 --- a/ecal/core/include/ecal/ecal_os.h
 +++ b/ecal/core/include/ecal/ecal_os.h
 @@ -47,7 +47,7 @@
@@ -56,19 +56,22 @@ index a962036f2..5d466cc86 100644
    #ifdef eCAL_EXPORTS
      #define ECALC_API __declspec(dllexport)
    #else /* eCAL_EXPORTS */
-@@ -64,11 +64,15 @@
+@@ -65,11 +65,15 @@
- #endif
  
- #ifdef _MSC_VER
+ #if !defined(ECALC_NO_DEPRECATION_WARNINGS)
+   #ifdef _MSC_VER
 +  #ifdef eCAL_SHARED_LIB
-   #ifdef eCAL_EXPORTS
+     #ifdef eCAL_EXPORTS
-     #define ECALC_API_DEPRECATED __declspec(dllexport deprecated)
+       #define ECALC_API_DEPRECATED __declspec(dllexport deprecated)
-   #else /* eCAL_EXPORTS */
+     #else /* eCAL_EXPORTS */
-     #define ECALC_API_DEPRECATED __declspec(dllimport deprecated)
+       #define ECALC_API_DEPRECATED __declspec(dllimport deprecated)
-   #endif /* eCAL_EXPORTS */
+     #endif /* eCAL_EXPORTS */
-+  #else
++    #else
-+    #define ECALC_API_DEPRECATED  
++      #define ECALC_API_DEPRECATED  
-+  #endif
++    #endif
- #elif defined(__GNUC__) || defined(__clang__)
+   #elif defined(__GNUC__) || defined(__clang__)
-   #define ECALC_API_DEPRECATED __attribute__((deprecated))
+     #define ECALC_API_DEPRECATED __attribute__((deprecated))
- #else
+   #else
+-- 
+2.45.0.windows.1
+

ports/ecal/portfile.cmake

@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse-ecal/ecal
     REF v${VERSION}
-    SHA512 e9bc6c579a5331bdecc0384fb1cbac6bf63cb3910e26a4004d48c3a25528fed66413a2c80f4d866d3958d3800579c57a7298e61fca20adf9b24f5daa2e07ed3d
+    SHA512 fde579c21ef31f5cd7902129d5d00717ddab1105d58cc5b352c374c14cbd2f61297a788d3ac5fa548946035b1759130857561f830a36e546e2a6ca88dbf63854 
     HEAD_REF master
     PATCHES
         0001-disable-app-plugins.patch
@@ -36,7 +36,6 @@ vcpkg_cmake_configure(
         -DBUILD_ECAL_TESTS=OFF
         -DECAL_INCLUDE_PY_SAMPLES=OFF
         -DECAL_INSTALL_SAMPLE_SOURCES=OFF
-        -DECAL_JOIN_MULTICAST_TWICE=OFF
         -DECAL_NPCAP_SUPPORT=OFF
         -DECAL_THIRDPARTY_BUILD_CMAKE_FUNCTIONS=ON
         -DECAL_THIRDPARTY_BUILD_SPDLOG=OFF
@@ -53,7 +52,6 @@ vcpkg_cmake_configure(
         -DECAL_THIRDPARTY_BUILD_CURL=OFF
         -DECAL_THIRDPARTY_BUILD_HDF5=OFF
         -DCPACK_PACK_WITH_INNOSETUP=OFF
-        -DDISABLE_FIND_PACKAGE_OVERLOAD=ON # From patch, disable find_package macro
         -DECAL_BUILD_VERSION="${VERSION}"
 )
 

ports/ecal/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "ecal",
-  "version-semver": "5.12.0",
+  "version-semver": "5.13.2",
-  "port-version": 1,
   "description": "eCAL - enhanced Communication Abstraction Layer",
   "homepage": "https://eclipse-ecal.github.io/ecal/",
   "license": "Apache-2.0",

versions/baseline.json

@@ -2453,8 +2453,8 @@
       "port-version": 0
     },
     "ecal": {
-      "baseline": "5.12.0",
+      "baseline": "5.13.2",
-      "port-version": 1
+      "port-version": 0
     },
     "ecm": {
       "baseline": "5.98.0",

versions/e-/ecal.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1753feade0a74f9779efc017cc2d29cd7005b15a",
+      "version-semver": "5.13.2",
+      "port-version": 0
+    },
     {
       "git-tree": "26c1e5fbf33ce903aa80a25fb031ce66f0921f1f",
       "version-semver": "5.12.0",