From beea85fdd8bf6b716acdac191cde9bfc7c72b73b Mon Sep 17 00:00:00 2001
From: toge <toge.mail@gmail.com>
Date: Sat, 1 Nov 2025 02:22:19 +0900
Subject: [PATCH] [behaviortree-cpp] update to 4.8.0 (#47836)

---
 ports/behaviortree-cpp/fix-dependencies.patch | 20 +++++++++++++++++--
 ports/behaviortree-cpp/portfile.cmake         |  7 +++++--
 .../behaviortree-cpp/use-external-lexy.patch  | 14 -------------
 ports/behaviortree-cpp/vcpkg.json             |  6 ++++--
 versions/b-/behaviortree-cpp.json             |  5 +++++
 versions/baseline.json                        |  4 ++--
 6 files changed, 34 insertions(+), 22 deletions(-)
 delete mode 100644 ports/behaviortree-cpp/use-external-lexy.patch

diff --git a/ports/behaviortree-cpp/fix-dependencies.patch b/ports/behaviortree-cpp/fix-dependencies.patch
index 2cda921cf7..f9db412ab5 100644
--- a/ports/behaviortree-cpp/fix-dependencies.patch
+++ b/ports/behaviortree-cpp/fix-dependencies.patch
@@ -1,14 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3fd81ed..357ec01 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,7 +233,7 @@ target_link_libraries(${BTCPP_LIBRARY}
+         foonathan::lexy
+         minitrace::minitrace
+         tinyxml2::tinyxml2
+-        minicoro::minicoro
++        $<BUILD_INTERFACE:minicoro::minicoro>
+         flatbuffers::flatbuffers
+         $<$<BOOL:${BTCPP_GROOT_INTERFACE}>:cppzmq>
+         $<$<BOOL:${BTCPP_SQLITE_LOGGING}>:SQLite::SQLite3>
 diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
-index 77a7c18..7eeaceb 100644
+index eaed471..dd8a4a8 100644
 --- a/cmake/Config.cmake.in
 +++ b/cmake/Config.cmake.in
-@@ -1,5 +1,10 @@
+@@ -1,5 +1,13 @@
  @PACKAGE_INIT@
  
 +include(CMakeFindDependencyMacro)
 +
 +find_dependency(Threads)
++find_dependency(flatbuffers CONFIG)
 +find_dependency(lexy CONFIG)
++find_dependency(minitrace CONFIG)
++find_dependency(tinyxml2 CONFIG)
 +
  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
  
diff --git a/ports/behaviortree-cpp/portfile.cmake b/ports/behaviortree-cpp/portfile.cmake
index 025ec16e2a..5092b50b4c 100644
--- a/ports/behaviortree-cpp/portfile.cmake
+++ b/ports/behaviortree-cpp/portfile.cmake
@@ -2,12 +2,11 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BehaviorTree/BehaviorTree.CPP
     REF ${VERSION}
-    SHA512 b2460f24915ab3aa803b95ca8a07a3d6d96c9e6d17f6b20297c45572162fe83f50e0cb51dd62da783ce6b962838bc0e74e7e137b8ef29a92f1805058beccc404
+    SHA512 956664e829c0b6ab9a398de7b7b788eb6da269d91823615925b7d080a3ecc784c610a9328761e2fad00507328f55307a6e5e667a779fa025937e5d519a4f2396
     HEAD_REF master
     PATCHES
         fix-x86_build.patch
         remove-source-charset.diff
-        use-external-lexy.patch
         fix-dependencies.patch
 )
 
@@ -32,6 +31,10 @@ vcpkg_cmake_configure(
         -DBTCPP_GROOT_INTERFACE=OFF
         -DBTCPP_SQLITE_LOGGING=OFF
         -DBTCPP_SHARED_LIBS=${BTCPP_SHARED_LIBS}
+        -DUSE_VENDORED_FLATBUFFERS=OFF
+        -DUSE_VENDORED_LEXY=OFF
+        -DUSE_VENDORED_MINITRACE=OFF
+        -DUSE_VENDORED_TINYXML2=OFF
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_Curses
 )
diff --git a/ports/behaviortree-cpp/use-external-lexy.patch b/ports/behaviortree-cpp/use-external-lexy.patch
deleted file mode 100644
index 00e19d345b..0000000000
--- a/ports/behaviortree-cpp/use-external-lexy.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa19bdb..5b12345 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,7 +96,8 @@ endif()
- #############################################################
- # LIBRARY
- 
--add_subdirectory(3rdparty/lexy)
-+find_package(lexy CONFIG REQUIRED)
-+message(STATUS "Found foonathan-lexy: ${lexy_VERSION}")
- 
- add_library(minitrace STATIC 3rdparty/minitrace/minitrace.cpp)
- target_compile_definitions(minitrace PRIVATE MTR_ENABLED=True)
diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json
index e759367f03..f4896cbf4c 100644
--- a/ports/behaviortree-cpp/vcpkg.json
+++ b/ports/behaviortree-cpp/vcpkg.json
@@ -1,14 +1,16 @@
 {
   "name": "behaviortree-cpp",
-  "version": "4.7.0",
-  "port-version": 1,
+  "version": "4.8.0",
   "description": "Behavior Trees Library in C++.",
   "homepage": "https://www.behaviortree.dev",
   "supports": "!uwp",
   "dependencies": [
     "boost-coroutine2",
     "cppzmq",
+    "flatbuffers",
     "foonathan-lexy",
+    "minitrace",
+    "tinyxml2",
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json
index 26eef9f597..37891eac03 100644
--- a/versions/b-/behaviortree-cpp.json
+++ b/versions/b-/behaviortree-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "adf0195ecbb649c7a107ad55684b62b853d68eb2",
+      "version": "4.8.0",
+      "port-version": 0
+    },
     {
       "git-tree": "698d27b36d7e3b53430558a6e92d51cc8bd22d79",
       "version": "4.7.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 8fdf89cc5f..ae1b8990ab 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -649,8 +649,8 @@
       "port-version": 2
     },
     "behaviortree-cpp": {
-      "baseline": "4.7.0",
-      "port-version": 1
+      "baseline": "4.8.0",
+      "port-version": 0
     },
     "benchmark": {
       "baseline": "1.9.4",