From 264a0704e6fa5cc8df21c7200fddc2088df1f269 Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Mon, 27 Nov 2023 23:06:47 -0500 Subject: Bump to C++14 standard --- debian/changelog | 4 +++- debian/patches/0003-Use-C-14.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0003-Use-C-14.patch diff --git a/debian/changelog b/debian/changelog index 0c39d40..b0b7623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ libgav1 (0.19.0-1) unstable; urgency=medium * debian/patches/0001-Unbundle-abseil.patch: Refresh the patch. * debian/patches/0002-Use-system-googletest.patch: Try to enable googletest. + * debian/patches/0003-Use-C-14.patch: Force C++14 standard to avoid + FTBFS with googletest. - -- Boyuan Yang Mon, 27 Nov 2023 23:03:34 -0500 + -- Boyuan Yang Mon, 27 Nov 2023 23:08:53 -0500 libgav1 (0.18.0-1) unstable; urgency=medium diff --git a/debian/patches/0003-Use-C-14.patch b/debian/patches/0003-Use-C-14.patch new file mode 100644 index 0000000..a4f4e10 --- /dev/null +++ b/debian/patches/0003-Use-C-14.patch @@ -0,0 +1,21 @@ +From: Boyuan Yang +Date: Mon, 27 Nov 2023 23:08:49 -0500 +Subject: Use C++14 + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e9bb9b0..abc3b41 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,7 +16,7 @@ + cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR) + + # libgav1 requires C++11. +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 14) + set(ABSL_CXX_STANDARD 11) + # libgav1 requires C99. + set(CMAKE_C_STANDARD 99) diff --git a/debian/patches/series b/debian/patches/series index 32467a3..86f5773 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Unbundle-abseil.patch 0002-Use-system-googletest.patch +0003-Use-C-14.patch -- cgit v1.2.3