commit: 94d0465a437d2bc1e54a7e93da4b1b6eda354d31
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 1 23:56:04 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 08:01:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d0465a
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 5227e4fdf24..72ad632f696 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 5227e4fdf24..72ad632f696 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)"
