Merge branch 'release/2022.1.0'

shiguredo · Jan 17, 2022 · 0eec2f6 · 0eec2f6
2 parents 8c295b3 + 8d79afa
commit 0eec2f6
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,19 @@
 
 ## develop
 
+## 2022.1.0
+
+- [UPDATE] 依存ライブラリの更新
+    - `boost` を `1.78.0` に
+    - `CLI11` を `2.1.2` に
+    - `fmt` を `8.0.1` に
+    - `spdlog` を `1.9.2` に
+    - `rapidcsv` を `8.53` に
+    - @haruyama
+- [FIX] 宇宙船演算子を利用している箇所に #include <compare> を追加
+    - @haruyama
+    - https://github.com/shiguredo/cpp-mp4/pull/12
+
 ## 2021.3
 
 - [UPDATE] `boost` を `1.76.0` に

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,11 +11,11 @@ set(CMAKE_CXX_COMPILER clang++)
 include(cmake/env.cmake)
 include(cmake/tools.cmake)
 
-set_cache_string_from_env(BOOST_VERSION 1.76.0 "Boost のバージョン")
-set_cache_string_from_env(CLI11_VERSION 1.9.1 "CLI11 のバージョン")
-set_cache_string_from_env(FMT_VERSION 7.1.3 "fmt のバージョン")
-set_cache_string_from_env(RAPIDCSV_VERSION 8.48 "rapidcsv のバージョン")
-set_cache_string_from_env(SPDLOG_VERSION 1.8.2 "spdlog のバージョン")
+set_cache_string_from_env(BOOST_VERSION 1.78.0 "Boost のバージョン")
+set_cache_string_from_env(CLI11_VERSION 2.1.2 "CLI11 のバージョン")
+set_cache_string_from_env(FMT_VERSION 8.0.1 "fmt のバージョン")
+set_cache_string_from_env(RAPIDCSV_VERSION 8.53 "rapidcsv のバージョン")
+set_cache_string_from_env(SPDLOG_VERSION 1.9.2 "spdlog のバージョン")
 
 add_compile_options(
     -Wall

diff --git a/include/shiguredo/mp4/box.hpp b/include/shiguredo/mp4/box.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <compare>  // NOLINT
 #include <cstdint>
 #include <istream>
 #include <string>

diff --git a/include/shiguredo/mp4/box/co64.hpp b/include/shiguredo/mp4/box/co64.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <compare>
 #include <cstdint>
 #include <istream>
 #include <string>

diff --git a/include/shiguredo/mp4/box/stco.hpp b/include/shiguredo/mp4/box/stco.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <compare>
 #include <cstdint>
 #include <istream>
 #include <string>

diff --git a/include/shiguredo/mp4/box/stsc.hpp b/include/shiguredo/mp4/box/stsc.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <compare>
 #include <cstdint>
 #include <istream>
 #include <string>

diff --git a/include/shiguredo/mp4/box/stts.hpp b/include/shiguredo/mp4/box/stts.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <compare>
 #include <cstdint>
 #include <istream>
 #include <string>

diff --git a/include/shiguredo/mp4/box_header.hpp b/include/shiguredo/mp4/box_header.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <compare>
 #include <cstdint>
 #include <istream>
 #include <string>

diff --git a/include/shiguredo/mp4/box_type.hpp b/include/shiguredo/mp4/box_type.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <array>
+#include <compare>  // NOLINT
 #include <cstdint>
 #include <string>
 

diff --git a/src/version.cpp b/src/version.cpp
@@ -8,7 +8,7 @@
 namespace shiguredo::mp4 {
 
 std::string get_version_string() {
-  return "2021.3";
+  return "2022.1.0";
 }
 
 }  // namespace shiguredo::mp4
diff --git a/src/writer/faststart_writer.cpp b/src/writer/faststart_writer.cpp
@@ -204,4 +204,3 @@ std::filesystem::path FaststartWriter::getIntermediateFilePath() {
 }
 
 }  // namespace shiguredo::mp4::writer
-
diff --git a/test/version.cpp b/test/version.cpp
@@ -7,7 +7,7 @@
 BOOST_AUTO_TEST_SUITE(version)
 
 BOOST_AUTO_TEST_CASE(version_string) {
-  BOOST_REQUIRE_EQUAL("2021.3", shiguredo::mp4::get_version_string());
+  BOOST_REQUIRE_EQUAL("2022.1.0", shiguredo::mp4::get_version_string());
 }
 
 BOOST_AUTO_TEST_SUITE_END()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -204,4 +204,3 @@ std::filesystem::path FaststartWriter::getIntermediateFilePath() {
		}

		} // namespace shiguredo::mp4::writer