dependencies: bump pybind11 to v2.13.1

Author: Mizux

WORKSPACE

@@ -65,7 +65,7 @@ git_repository(
 
 git_repository(
     name = "rules_python",
-    tag = "0.31.0",
+    tag = "0.33.2",
     remote = "https://github.com/bazelbuild/rules_python.git",
 )
 
@@ -245,21 +245,21 @@ git_repository(
 new_git_repository(
     name = "pybind11",
     build_file = "@pybind11_bazel//:pybind11.BUILD",
-    tag = "v2.12.0",
+    tag = "v2.13.1",
     remote = "https://github.com/pybind/pybind11.git",
 )
 
 new_git_repository(
     name = "pybind11_abseil",
-    commit = "52f27398876a3177049977249e004770bd869e61", # 2024/01/11
+    tag = "v202402.0",
     patches = ["//patches:pybind11_abseil.patch"],
     patch_args = ["-p1"],
     remote = "https://github.com/pybind/pybind11_abseil.git",
 )
 
 new_git_repository(
     name = "pybind11_protobuf",
-    commit = "3b11990a99dea5101799e61d98a82c4737d240cc", # 2024/01/04
+    commit = "e90f33efeb2ae5c4e85ef83b22298f58e1e30894", # 2024/06/21
     remote = "https://github.com/pybind/pybind11_protobuf.git",
 )
 

cmake/dependencies/CMakeLists.txt

@@ -82,12 +82,12 @@ if(BUILD_absl)
   set(ABSL_PROPAGATE_CXX_STD ON)
   set(ABSL_BUILD_TESTING OFF)
   FetchContent_Declare(
-    abseil-cpp
+    absl
     GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
     GIT_TAG "20240116.2"
     PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240116.2.patch"
   )
-  FetchContent_MakeAvailable(abseil-cpp)
+  FetchContent_MakeAvailable(absl)
   list(POP_BACK CMAKE_MESSAGE_INDENT)
   message(CHECK_PASS "fetched")
 endif()
@@ -102,6 +102,7 @@ if(BUILD_Protobuf)
   set(protobuf_BUILD_SHARED_LIBS OFF)
   set(protobuf_BUILD_EXPORT OFF)
   set(protobuf_MSVC_STATIC_RUNTIME OFF)
+  #set(protobuf_BUILD_LIBUPB ON)
   FetchContent_Declare(
     Protobuf
     GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
@@ -169,7 +170,7 @@ if(BUILD_PYTHON AND BUILD_pybind11)
   FetchContent_Declare(
     pybind11
     GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
-    GIT_TAG "v2.12.0"
+    GIT_TAG "v2.13.1"
     PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11.patch"
   )
   FetchContent_MakeAvailable(pybind11)
@@ -183,7 +184,7 @@ if(BUILD_PYTHON AND BUILD_pybind11_abseil)
   FetchContent_Declare(
     pybind11_abseil
     GIT_REPOSITORY "https://github.com/pybind/pybind11_abseil.git" # 2024/01/11
-    GIT_TAG "52f27398876a3177049977249e004770bd869e61"
+    GIT_TAG "v202402.0"
     PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_abseil.patch"
   )
   FetchContent_MakeAvailable(pybind11_abseil)
@@ -197,7 +198,7 @@ if(BUILD_PYTHON AND BUILD_pybind11_protobuf)
   FetchContent_Declare(
     pybind11_protobuf
     GIT_REPOSITORY "https://github.com/pybind/pybind11_protobuf.git"
-    GIT_TAG "3b11990a99dea5101799e61d98a82c4737d240cc" # 2024/01/04
+    GIT_TAG "e90f33efeb2ae5c4e85ef83b22298f58e1e30894" # 2024/06/21
     PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/pybind11_protobuf.patch"
   )
   FetchContent_MakeAvailable(pybind11_protobuf)

patches/protobuf-v27.2.patch

@@ -54,15 +54,3 @@ index 9b51e9722..33c1021d4 100644
    ${protobuf_BINARY_DIR}
    # Support #include-ing other top-level directories, i.e. upb_generator.
    ${protobuf_SOURCE_DIR}
-diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
-index 11c09b1bc..fdea9ce16 100644
---- a/cmake/libprotobuf.cmake
-+++ b/cmake/libprotobuf.cmake
-@@ -28,6 +28,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
- endif()
- target_include_directories(libprotobuf PUBLIC
-   $<BUILD_INTERFACE:${protobuf_SOURCE_DIR}/src>
-+  $<BUILD_INTERFACE:${protobuf_SOURCE_DIR}>
-   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
- )
- target_link_libraries(libprotobuf PUBLIC ${protobuf_ABSL_USED_TARGETS})

patches/pybind11_abseil.patch

@@ -55,7 +55,7 @@ index ceb65a8..e142837 100644
  include_directories(${TOP_LEVEL_DIR} ${pybind11_INCLUDE_DIRS})
 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
 new file mode 100644
-index 0000000..ffe4d38
+index 0000000..826eda8
 --- /dev/null
 +++ b/cmake/dependencies/CMakeLists.txt
 @@ -0,0 +1,15 @@
@@ -64,7 +64,7 @@ index 0000000..ffe4d38
 +set(ABSL_PROPAGATE_CXX_STD ON)
 +set(BUILD_TESTING OFF)
 +FetchContent_Declare(
-+  abseil-cpp
++  absl
 +  URL https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz
 +  URL_HASH
 +    SHA256=59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5)
@@ -73,9 +73,9 @@ index 0000000..ffe4d38
 +  pybind11
 +  URL https://github.com/pybind/pybind11/archive/refs/heads/master.tar.gz)
 +
-+FetchContent_MakeAvailable(abseil-cpp pybind11)
++FetchContent_MakeAvailable(absl pybind11)
 diff --git a/pybind11_abseil/BUILD b/pybind11_abseil/BUILD
-index 4cff8b7..33e614a 100644
+index 791c245..33e614a 100644
 --- a/pybind11_abseil/BUILD
 +++ b/pybind11_abseil/BUILD
 @@ -25,43 +25,39 @@ pybind_library(
@@ -90,7 +90,7 @@ index 4cff8b7..33e614a 100644
      visibility = ["//visibility:public"],
      deps = [
          "@com_google_absl//absl/status",
--        "@local_config_python//:python_headers",  # buildcleaner: keep
+-        "@rules_python//python/cc:current_py_cc_headers",  # buildcleaner: keep
      ],
  )
 
@@ -101,7 +101,7 @@ index 4cff8b7..33e614a 100644
      visibility = ["//visibility:private"],
      deps = [
          ":ok_status_singleton_lib",
--        "@local_config_python//:python_headers",  # buildcleaner: keep
+-        "@rules_python//python/cc:current_py_cc_headers",  # buildcleaner: keep
      ],
  )
 
@@ -113,7 +113,7 @@ index 4cff8b7..33e614a 100644
 -    linkshared = 1,
      deps = [
          ":ok_status_singleton_pyinit_google3",
--        "@local_config_python//:python_headers",  # buildcleaner: keep
+-        "@rules_python//python/cc:current_py_cc_headers",  # buildcleaner: keep
      ],
  )
 
@@ -149,7 +149,7 @@ index 4cff8b7..33e614a 100644
 -    linkshared = 1,
      deps = [
          ":status_pyinit_google3",
--        "@local_config_python//:python_headers",  # buildcleaner: keep
+-        "@rules_python//python/cc:current_py_cc_headers",  # buildcleaner: keep
      ],
  )
 

patches/pybind11_protobuf.patch

@@ -60,15 +60,6 @@ diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.t
 index 111b34f..f78e946 100644
 --- a/cmake/dependencies/CMakeLists.txt
 +++ b/cmake/dependencies/CMakeLists.txt
-@@ -7,7 +7,7 @@ if(NOT absl_FOUND)
-   set(ABSL_PROPAGATE_CXX_STD ON)
-   set(ABSL_ENABLE_INSTALL ON)
-   FetchContent_Declare(
--    absl
-+    abseil-cpp
-     GIT_REPOSITORY ${_absl_repository}
-     GIT_TAG ${_absl_tag})
- endif()
 @@ -35,17 +35,17 @@ if(NOT pybind11_FOUND)
  endif()
 
@@ -77,11 +68,11 @@ index 111b34f..f78e946 100644
 +# Make dependencies available
 
 -if(NOT absl_FOUND)
-+if(NOT abseil-cpp_FOUND)
++if(NOT absl_FOUND)
    message(CHECK_START "Fetching Abseil-cpp")
    list(APPEND CMAKE_MESSAGE_INDENT "  ")
 -  FetchContent_MakeAvailable(absl)
-+  FetchContent_MakeAvailable(abseil-cpp)
++  FetchContent_MakeAvailable(absl)
    list(POP_BACK CMAKE_MESSAGE_INDENT)
    message(CHECK_PASS "fetched")
  endif()