From 02021259f0ac46070e9cdfeb41dad1a61dbfe889 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Mon, 3 Jun 2024 21:54:13 +0200
Subject: [PATCH] Remove Mapbox optional (#2462)

---
 CMakeLists.txt                 |  1 -
 platform/android/android.cmake |  1 -
 vendor/BUILD.bazel             | 11 -----------
 vendor/csscolorparser.cmake    |  2 +-
 vendor/mapbox-base             |  2 +-
 vendor/mapbox-base.cmake       |  9 ---------
 6 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70dd79194..753152499 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1392,7 +1392,6 @@ export(TARGETS
     mapbox-base-geojson.hpp
     mapbox-base-geometry.hpp
     mapbox-base-jni.hpp
-    mapbox-base-optional
     mapbox-base-pixelmatch-cpp
     mapbox-base-shelf-pack-cpp
     mapbox-base-supercluster.hpp
diff --git a/platform/android/android.cmake b/platform/android/android.cmake
index 5b46a4878..89582be86 100644
--- a/platform/android/android.cmake
+++ b/platform/android/android.cmake
@@ -110,7 +110,6 @@ target_link_libraries(
     PRIVATE
         GLESv3
         Mapbox::Base
-        Mapbox::Base::optional
         log
         mbgl-compiler-options
 )
diff --git a/vendor/BUILD.bazel b/vendor/BUILD.bazel
index 070cf325a..66815d83b 100644
--- a/vendor/BUILD.bazel
+++ b/vendor/BUILD.bazel
@@ -44,7 +44,6 @@ cc_library(
         "mapbox-base/include",
     ],
     visibility = ["//visibility:public"],
-    deps = ["optional"],
 )
 
 # vendor/parsedate
@@ -57,15 +56,6 @@ cc_library(
     visibility = ["//visibility:public"],
 )
 
-# vendor/optional
-cc_library(
-    name = "optional",
-    hdrs = glob(["mapbox-base/deps/optional/*.hpp"]),
-    copts = CPP_FLAGS,
-    includes = ["mapbox-base/deps/optional"],
-    visibility = ["//visibility:public"],
-)
-
 # vendor/csscolorparser
 cc_library(
     name = "csscolorparser",
@@ -78,7 +68,6 @@ cc_library(
     copts = CPP_FLAGS,
     includes = ["csscolorparser"],
     visibility = ["//visibility:public"],
-    deps = ["optional"],
 )
 
 # vendor/wagyu-files.json
diff --git a/vendor/csscolorparser.cmake b/vendor/csscolorparser.cmake
index 0c570655e..1a45f97af 100644
--- a/vendor/csscolorparser.cmake
+++ b/vendor/csscolorparser.cmake
@@ -15,7 +15,7 @@ target_sources(
 
 target_link_libraries(
     mbgl-vendor-csscolorparser
-    PRIVATE Mapbox::Base::optional mbgl-compiler-options
+    PRIVATE mbgl-compiler-options
 )
 
 target_include_directories(
diff --git a/vendor/mapbox-base b/vendor/mapbox-base
index 3094c1eff..8990092c3 160000
--- a/vendor/mapbox-base
+++ b/vendor/mapbox-base
@@ -1 +1 @@
-Subproject commit 3094c1eff0a9631db6e07770dfc135683bbcc9c3
+Subproject commit 8990092c304cbe72f3ffdf109ac4e150bde52782
diff --git a/vendor/mapbox-base.cmake b/vendor/mapbox-base.cmake
index b912bd567..4abeb8481 100644
--- a/vendor/mapbox-base.cmake
+++ b/vendor/mapbox-base.cmake
@@ -76,15 +76,6 @@ set_target_properties(
         INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geometry.hpp/LICENSE
 )
 
-set_target_properties(
-    mapbox-base-optional
-    PROPERTIES
-        INTERFACE_MAPBOX_NAME "Optional"
-        INTERFACE_MAPBOX_URL "https://github.com/akrzemi1/Optional"
-        INTERFACE_MAPBOX_AUTHOR "Andrzej Krzemienski"
-        INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/optional/LICENSE
-)
-
 set_target_properties(
     mapbox-base
     PROPERTIES