From a4293c1e692786ad5189aa58b2e1f46e14bc90c0 Mon Sep 17 00:00:00 2001
From: toge <toge.mail@gmail.com>
Date: Fri, 20 Sep 2024 09:08:19 +0900
Subject: [PATCH] update 4.1.5

---
 ...1-cmake-shared-use-conan-add-install.patch | 44 +++++++++++++++++++
 .../3.21.23-0002-revert-c++14-constexpr.patch | 19 ++++++++
 recipes/roaring/all/conandata.yml             |  6 +--
 recipes/roaring/config.yml                    |  2 +-
 4 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 recipes/eastl/all/patches/3.21.23-0001-cmake-shared-use-conan-add-install.patch
 create mode 100644 recipes/eastl/all/patches/3.21.23-0002-revert-c++14-constexpr.patch

diff --git a/recipes/eastl/all/patches/3.21.23-0001-cmake-shared-use-conan-add-install.patch b/recipes/eastl/all/patches/3.21.23-0001-cmake-shared-use-conan-add-install.patch
new file mode 100644
index 0000000000000..3ced0e595a701
--- /dev/null
+++ b/recipes/eastl/all/patches/3.21.23-0001-cmake-shared-use-conan-add-install.patch
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a5870f8..d30aa93 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,17 +70,15 @@ target_include_directories(EASTL PUBLIC include)
+ #-------------------------------------------------------------------------------------------
+ # Dependencies
+ #-------------------------------------------------------------------------------------------
+-FetchContent_Declare(
+-  EABase
+-  GIT_REPOSITORY https://github.com/electronicarts/EABase.git
+-  GIT_TAG        123363eb82e132c0181ac53e43226d8ee76dea12
+-  GIT_SUBMODULES "" # This should be temporary until we update the cyclic submodule dependencies in EABase.
+-)
+-
+-FetchContent_MakeAvailable(EABase)
+-
+-target_link_libraries(EASTL EABase)
+-
++find_package(EABase REQUIRED CONFIG)
++target_link_libraries(EASTL EABase::EABase)
++
++if(BUILD_SHARED_LIBS)
++  target_compile_definitions(EASTL PUBLIC EASTL_DLL)
++  if(MSVC OR CYGWIN)
++    target_compile_definitions(EASTL PRIVATE "EASTL_API=__declspec(dllexport)")
++  endif()
++endif()
+ #-------------------------------------------------------------------------------------------
+ # Deprecations
+ #-------------------------------------------------------------------------------------------
+@@ -98,7 +96,11 @@ endif()
+ #-------------------------------------------------------------------------------------------
+ # Installation
+ #-------------------------------------------------------------------------------------------
+-install(TARGETS EASTL DESTINATION lib)
++include(GNUInstallDirs)
++install(TARGETS EASTL
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(DIRECTORY include/EASTL DESTINATION include)
+ 
+ if (MSVC)
diff --git a/recipes/eastl/all/patches/3.21.23-0002-revert-c++14-constexpr.patch b/recipes/eastl/all/patches/3.21.23-0002-revert-c++14-constexpr.patch
new file mode 100644
index 0000000000000..874e400a0a68c
--- /dev/null
+++ b/recipes/eastl/all/patches/3.21.23-0002-revert-c++14-constexpr.patch
@@ -0,0 +1,19 @@
+diff --git a/include/EASTL/internal/config.h b/include/EASTL/internal/config.h
+index 6c13117..9a31f1c 100644
+--- a/include/EASTL/internal/config.h
++++ b/include/EASTL/internal/config.h
+@@ -144,7 +144,13 @@
+ // http://en.wikipedia.org/wiki/C%2B%2B14#Relaxed_constexpr_restrictions
+ //
+ #if !defined(EA_CPP14_CONSTEXPR)
+-	#if defined(EA_COMPILER_CPP14_ENABLED)
++	#if defined(EA_COMPILER_MSVC_2015)
++		#define EA_CPP14_CONSTEXPR  // not supported
++		#define EA_NO_CPP14_CONSTEXPR 
++	#elif defined(__GNUC__) && (EA_COMPILER_VERSION < 9000)   // Before GCC 9.0
++		#define EA_CPP14_CONSTEXPR  // not supported
++		#define EA_NO_CPP14_CONSTEXPR 
++	#elif defined(EA_COMPILER_CPP14_ENABLED)
+ 		#define EA_CPP14_CONSTEXPR constexpr
+ 	#else
+ 		#define EA_CPP14_CONSTEXPR  // not supported
diff --git a/recipes/roaring/all/conandata.yml b/recipes/roaring/all/conandata.yml
index df432725d3cb7..c703d1594be72 100644
--- a/recipes/roaring/all/conandata.yml
+++ b/recipes/roaring/all/conandata.yml
@@ -1,7 +1,7 @@
 sources:
-  "4.1.4":
-    url: "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.1.4.tar.gz"
-    sha256: "fc15ac958e3c7778c6bed713fde849c09e8526f6274140d25ed4adc92331fa68"
+  "4.1.5":
+    url: "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.1.5.tar.gz"
+    sha256: "7eafa9fd0dace499e80859867a6ba5a010816cf6e914dd9350ad1d44c0fc83eb"
   "4.1.2":
     url: "https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.1.2.tar.gz"
     sha256: "dd9e9d9a28dcf9ba1622fb4a3a7b4d7f5e12732bb35e99a7cb028b7512731a7b"
diff --git a/recipes/roaring/config.yml b/recipes/roaring/config.yml
index 2384bfeb95fb4..f0c93632ef714 100644
--- a/recipes/roaring/config.yml
+++ b/recipes/roaring/config.yml
@@ -1,5 +1,5 @@
 versions:
-  "4.1.4":
+  "4.1.5":
     folder: all
   "4.1.2":
     folder: all