From nobody Sat Mar 9 14:18:59 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsQBr2Lrjz5DJFc; Sat, 9 Mar 2024 14:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsQBq6w4Cz49R1; Sat, 9 Mar 2024 14:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMNcAm7REYAThe4t57sIpiRurXl+bFXtzPic9nM1koQ=; b=q7Ub2fGvXwv4timtP8w+22j0oY1SS21O6IyP7BUwLnmNgUf63nJoMHxr7Y1oKpHIpn4xfq 0wmzpSw2pbBLG2ViNQK4wDHQHS85Adqhar9FUUTSj0/nTqBo6dVrybLVSzA3yRB601Z7xN Owvg/cm6BYFXbO9Zg2yNlUVIbwJ4yx5XkhOWnG2yegzjqxMeaXNqa1iDOeAOL9lJ5YSAxo RgCjwk7LHGBbR0JLE/8OsOQPptEO+aKJt0Gz4V8YYZVnU2q0Ekd1JTT3xnD47GiKisah2w EbRM/zz+oBERz1B+xdWHlVtZ0vG169uZ3VJgsWeWmijViAhyez/fpBl7+gK7zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709993940; a=rsa-sha256; cv=none; b=mAIOVjahvhOXTuczp8uvU2FJnVdn2oNab2CcREjUlm5CbeSuGRLmoaaoj+pQg47qAfiJsv cWqgLIIRVhgtq5ohJB7Z1NcVQmBobaRD6TVKrrTR3Q3cr07F9xmqZUHC0hK5dOfz07pend mqPxrQ77yJWFFHYN7pN266KHmAiXpPoUZiXup4bKjsete4xHzE9H1mMxBv9oTbPaX5KpaU r5XJ96/a/o03xppdtId1vzSA72a0Hr85WeWWD50uGHjzSS9wXFj6WJLgEtQs71Ofls1DT6 Foo59tub9hq1oYcRS3isJvwD3a87BhYnYTTaUB3Mqi2+crW6eoJhVcJWjrGzGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMNcAm7REYAThe4t57sIpiRurXl+bFXtzPic9nM1koQ=; b=f7pGqZidUgr13vWE/xR31HpzhPAihf5b1SJXtWJ+c/cMqsVr0mgLfbM+trs+6JXxIPI3UC +4ukEeQxTmMK4LMV2YH0zM8CunPIz0prS14vshWjenSb9nIDpVNBJkSs+DPsn8DxB2hQ7C 2KhLxByDchN8qMzNAzhPr7G0TJyadrD/bfnAiebyt7ZNVXRPYCPozWWO53hQQX2WKmvnRD NPZrlIYJuJKt+YF1wlpzvY8/Ny6/mscQ8BzcrAGxY9XHz5aNCLSTKBY+bChwegQYJl6KHq gADEgY6bRc5oHs7jRnuSiMBvoDu1pJEi6Jo5fgADCYO95Xv3UqlYaKN1KN8EvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsQBq5fYkz15J4; Sat, 9 Mar 2024 14:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429EIxrj028828; Sat, 9 Mar 2024 14:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429EIxEr028825; Sat, 9 Mar 2024 14:18:59 GMT (envelope-from git) Date: Sat, 9 Mar 2024 14:18:59 GMT Message-Id: <202403091418.429EIxEr028825@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9b1d0a8492cc - main - net/ecal: Allow build with tinyxml2 with meson List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b1d0a8492cc2e42e6f30dbc067167c6a349e8d2 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b1d0a8492cc2e42e6f30dbc067167c6a349e8d2 commit 9b1d0a8492cc2e42e6f30dbc067167c6a349e8d2 Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:57:29 +0000 Commit: Po-Chuan Hsieh 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