git: 9b1d0a8492cc - main - net/ecal: Allow build with tinyxml2 with meson

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9b1d0a8492cc2e42e6f30dbc067167c6a349e8d2

commit 9b1d0a8492cc2e42e6f30dbc067167c6a349e8d2
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-03-09 13:57:29 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-03-09 14:07:22 +0000

    net/ecal: Allow build with tinyxml2 with meson
---
 net/ecal/Makefile                                   |  2 +-
 .../patch-app_rec_rec__server__core_CMakeLists.txt  | 21 +++++++++++++++++++++
 .../files/patch-app_sys_sys__core_CMakeLists.txt    | 21 +++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/net/ecal/Makefile b/net/ecal/Makefile
index 9b93f43b48a0..4302995e65ea 100644
--- a/net/ecal/Makefile
+++ b/net/ecal/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libyaml-cpp.so:devel/yaml-cpp
 		# binaries aren't linked with libfineftp-server.so, see https://github.com/continental/ecal/issues/381; same with libcurl.so
 
-USES=		cmake compiler:c++17-lang desktop-file-utils localbase:ldflags qt:5 shared-mime-info
+USES=		cmake compiler:c++17-lang desktop-file-utils localbase:ldflags pkgconfig qt:5 shared-mime-info
 USE_QT=		core gui widgets buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
diff --git a/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt
new file mode 100644
index 000000000000..e20fc1430fd9
--- /dev/null
+++ b/net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- app/rec/rec_server_core/CMakeLists.txt.orig	2023-10-27 08:38:06 UTC
++++ app/rec/rec_server_core/CMakeLists.txt
+@@ -20,7 +20,8 @@ find_package(fineftp REQUIRED)
+ find_package(Protobuf REQUIRED)
+ find_package(spdlog REQUIRED)
+ find_package(fineftp REQUIRED)
+-find_package(tinyxml2 REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2)
+ 
+ set(PROJECT_NAME rec_server_core)
+ 
+@@ -66,7 +66,7 @@ target_link_libraries(${PROJECT_NAME}
+ 
+ target_link_libraries(${PROJECT_NAME}
+     PRIVATE
+-    tinyxml2::tinyxml2
++    PkgConfig::tinyxml2
+     protobuf::libprotobuf
+     eCAL::core
+     eCAL::app_pb
diff --git a/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt b/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt
new file mode 100644
index 000000000000..d69971c6de78
--- /dev/null
+++ b/net/ecal/files/patch-app_sys_sys__core_CMakeLists.txt
@@ -0,0 +1,21 @@
+--- app/sys/sys_core/CMakeLists.txt.orig	2023-10-27 08:38:06 UTC
++++ app/sys/sys_core/CMakeLists.txt
+@@ -21,7 +21,8 @@ find_package(spdlog REQUIRED)
+ find_package(Threads REQUIRED)
+ find_package(Protobuf REQUIRED)
+ find_package(spdlog REQUIRED)
+-find_package(tinyxml2 REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2)
+ 
+ set(ecalsyscore_src
+   include/ecalsys/ecal_sys.h
+@@ -88,7 +88,7 @@ target_link_libraries(${PROJECT_NAME}
+ 
+ target_link_libraries(${PROJECT_NAME}
+   Threads::Threads
+-  tinyxml2::tinyxml2
++  PkgConfig::tinyxml2
+   spdlog::spdlog
+   protobuf::libprotobuf
+   eCAL::core