summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2020-12-29 22:26:41 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2020-12-29 22:26:41 +0000
commitd51c9acbfd8ea08f970d8edd55b49c649004d9c4 (patch)
tree35f85d17100901bc0de3a2df617e1b22ba0915ac
parentUpdate to 1.17.0 (diff)
multimedia/libgav1: Sync -std= with devel/abseil to match ABI
PR: 250376 Approved by: jbeich
Notes
Notes: svn path=/head/; revision=559624
-rw-r--r--multimedia/libgav1/Makefile3
-rw-r--r--multimedia/libgav1/files/patch-CMakeLists.txt12
2 files changed, 14 insertions, 1 deletions
diff --git a/multimedia/libgav1/Makefile b/multimedia/libgav1/Makefile
index 2e9297e1ac38..295a131052bd 100644
--- a/multimedia/libgav1/Makefile
+++ b/multimedia/libgav1/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libgav1
DISTVERSIONPREFIX= v
DISTVERSION= 0.16.0
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
@@ -12,7 +13,7 @@ LICENSE= APACHE20
LIB_DEPENDS= libabsl_synchronization.so:devel/abseil
-USES= cmake compiler:c++11-lib localbase:ldflags
+USES= cmake compiler:c++17-lang localbase:ldflags
USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= jbeich # mirror
diff --git a/multimedia/libgav1/files/patch-CMakeLists.txt b/multimedia/libgav1/files/patch-CMakeLists.txt
index 8467b18720a4..412ece1b78af 100644
--- a/multimedia/libgav1/files/patch-CMakeLists.txt
+++ b/multimedia/libgav1/files/patch-CMakeLists.txt
@@ -1,7 +1,19 @@
+- Sync -std= with devel/abseil to match ABI
- Avoid leaking abseil dependency to shared library consumers
--- CMakeLists.txt.orig 2020-07-15 02:27:54 UTC
+++ CMakeLists.txt
+@@ -16,8 +16,8 @@
+ cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR)
+
+ # libgav1 requires C++11.
+-set(CMAKE_CXX_STANDARD 11)
+-set(ABSL_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
++set(ABSL_CXX_STANDARD 17)
+
+ project(libgav1 CXX)
+
@@ -107,8 +107,11 @@ if(NOT "${LIBGAV1_EXE_LINKER_FLAGS}" STREQUAL "")
separate_arguments(LIBGAV1_EXE_LINKER_FLAGS)
endif()