From 94d0465a437d2bc1e54a7e93da4b1b6eda354d31 Mon Sep 17 00:00:00 2001 From: Peter Levine Date: Sun, 1 Oct 2017 19:56:04 -0400 Subject: [PATCH] media-video/avidemux: Fix building with GCC-5 Force -std=c++14 since the build uses a header with 'nullptr' which is invalid in GCC-5's default -std=c++98 dialect. Package-Manager: Portage-2.3.10, Repoman-2.3.3 --- media-video/avidemux/avidemux-2.6.20.ebuild | 4 ++++ media-video/avidemux/avidemux-9999.ebuild | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild index 5227e4fdf241..72ad632f6969 100644 --- a/media-video/avidemux/avidemux-2.6.20.ebuild +++ b/media-video/avidemux/avidemux-2.6.20.ebuild @@ -81,6 +81,10 @@ src_configure() { # See bug 432322. use x86 && replace-flags -O0 -O1 + # The build relies on an avidemux-core header that uses 'nullptr' + # which is from >=C++11. Let's use the GCC-6 default C++ dialect. + append-cxxflags -std=c++14 + local mycmakeargs=( -DAVIDEMUX_SOURCE_DIR='${S}' -DGETTEXT="$(usex nls)" diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild index 5227e4fdf241..72ad632f6969 100644 --- a/media-video/avidemux/avidemux-9999.ebuild +++ b/media-video/avidemux/avidemux-9999.ebuild @@ -81,6 +81,10 @@ src_configure() { # See bug 432322. use x86 && replace-flags -O0 -O1 + # The build relies on an avidemux-core header that uses 'nullptr' + # which is from >=C++11. Let's use the GCC-6 default C++ dialect. + append-cxxflags -std=c++14 + local mycmakeargs=( -DAVIDEMUX_SOURCE_DIR='${S}' -DGETTEXT="$(usex nls)" -- 2.26.2