From a6e7ddefe7cf72e2d383e508c49b6e66a56e26e5 Mon Sep 17 00:00:00 2001
From: wangmy <wangmy@fujitsu.com>
Date: Tue, 25 Jan 2022 21:19:03 +0800
Subject: [PATCH] libcereal: upgrade 1.3.0 -> 1.3.1

License-Update: year updated to 2022

0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch
removed since it is included in 1.3.1

Changelog:
=========
Highlighted fixes and enhancements include:
------------------------------------------
Github actions in place of Travis CI
Doctest updates (and upstream patches!) to support all targeted compilers
Cmake modernization

Bug fixes and minor enhancements:
---------------------------------
Fix typo in docs in #597
Add MSVC 2019 to build, default ctor for static object
Fix json.hpp compilation issue when int32_t is a long
[cpp20] explicitly capture 'this' as copy
Fix rapidjson for Clang 10
Fixes to prevent clang-diagnostic errors
cleanup cmake files to be a little more moderen
CVE-2020-11105: Store a copy of each serialized shared_ptr within the archive to prevent the shared_ptr to be freed to early
add license files for components of cereal
Catch short documents in JSON input
C++17: use inline globals for StaticObjects
Use std::variant::emplace when loading
Use std::optional::emplace() when loading non-empty optional
Fix itsNextName not clearing when not found + style change
Update doctest to 2.4.6 + local fixes slated for upstream
Fixed loading of std::vector
Update license to match BSD template
Update doctest to 2.4.7
Use GNUInstallDirs instead of hard wiring install directories

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...rs-instead-of-hard-wiring-install-di.patch | 37 -------------------
 ...{libcereal_1.3.0.bb => libcereal_1.3.1.bb} |  8 ++--
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch
 rename meta-oe/recipes-support/libcereal/{libcereal_1.3.0.bb => libcereal_1.3.1.bb} (79%)

diff --git a/meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch b/meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch
deleted file mode 100644
index 93114dadd6..0000000000
--- a/meta-oe/recipes-support/libcereal/libcereal/0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c9e60ed064aa2938f71f2cacf79f0bb337812bf8 Mon Sep 17 00:00:00 2001
-From: Anton Blanchard <anton@ozlabs.org>
-Date: Tue, 17 Aug 2021 09:32:43 +1000
-Subject: [PATCH] Use GNUInstallDirs instead of hard wiring install directories
-
-On a multilib setup cmake files should go into lib64.
-
-Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/710]
----
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b97c1f59..ad574290 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -70,14 +70,15 @@ endif()
- 
- option(CEREAL_INSTALL "Generate the install target" ${CEREAL_MASTER_PROJECT})
- if(CEREAL_INSTALL)
-+    include(GNUInstallDirs)
-     include(CMakePackageConfigHelpers)
- 
-     install(TARGETS cereal EXPORT ${PROJECT_NAME}Targets)
--    install(DIRECTORY include/cereal DESTINATION include)
-+    install(DIRECTORY include/cereal DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
-     set(configFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake)
-     set(versionFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake)
--    set(configInstallDestination lib/cmake/${PROJECT_NAME})
-+    set(configInstallDestination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
- 
-     configure_package_config_file(
-         ${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
--- 
-2.31.1
-
diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb
similarity index 79%
rename from meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb
rename to meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb
index 0dbd5204d7..c905b74d6e 100644
--- a/meta-oe/recipes-support/libcereal/libcereal_1.3.0.bb
+++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 
 LICENSE = "BSD-3-Clause & MIT & BSL-1.0"
 LIC_FILES_CHKSUM = "\
-    file://LICENSE;md5=e612690af2f575dfd02e2e91443cea23 \
+    file://LICENSE;md5=4921372a1fb38469e667c38b17a1c4b3 \
     file://include/cereal/external/rapidxml/license.txt;md5=d63ab70ba21ca0544b03284958324301 \
     file://include/cereal/external/LICENSE;md5=b07578c9df99c0b8b45eb041efd4a645 \
     file://include/cereal/external/rapidjson/LICENSE;md5=e7abb663111d4ac17cf00323698aff08 \
@@ -15,10 +15,8 @@ LIC_FILES_CHKSUM = "\
 PROVIDES += "${PN}-dev"
 
 PV .= "+git${SRCPV}"
-SRCREV = "64f50dbd5cecdaba785217e2b0aeea3a4f1cdfab"
-SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \
-           file://0001-Use-GNUInstallDirs-instead-of-hard-wiring-install-di.patch \
-           "
+SRCREV = "1de8fe89471d69ea392ea260ce74e079d5f4b415"
+SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"