From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 292CC1396D0 for ; Wed, 4 Oct 2017 08:02:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9171EE0E8C; Wed, 4 Oct 2017 08:02:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 704F9E0E8C for ; Wed, 4 Oct 2017 08:02:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B32433417B8 for ; Wed, 4 Oct 2017 08:02:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA143909E for ; Wed, 4 Oct 2017 08:02:13 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1507104103.94d0465a437d2bc1e54a7e93da4b1b6eda354d31.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/avidemux/avidemux-2.6.20.ebuild media-video/avidemux/avidemux-9999.ebuild X-VCS-Directories: media-video/avidemux/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 94d0465a437d2bc1e54a7e93da4b1b6eda354d31 X-VCS-Branch: master Date: Wed, 4 Oct 2017 08:02:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 61f2382a-0d4d-498d-bbda-2586067deb07 X-Archives-Hash: a03ae85a0d34c0ca096d6d6f0eccc5f9 commit: 94d0465a437d2bc1e54a7e93da4b1b6eda354d31 Author: Peter Levine gmail com> AuthorDate: Sun Oct 1 23:56:04 2017 +0000 Commit: Alexis Ballier gentoo 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)"