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 26E31138350 for ; Thu, 6 Feb 2020 01:13:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DC5DE088D; Thu, 6 Feb 2020 01:13:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C2A7DE088D for ; Thu, 6 Feb 2020 01:13:16 +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 0BCE634E7D7 for ; Thu, 6 Feb 2020 01:13:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98F24116 for ; Thu, 6 Feb 2020 01:13:12 +0000 (UTC) From: "Maciej Mrozowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Mrozowski" Message-ID: <1580951536.e17ea23a40c1fcdb092d14d118ea10352078b34c.reavertm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/flightgear/flightgear-2019.1.1.ebuild games-simulation/flightgear/flightgear-9999.ebuild X-VCS-Directories: games-simulation/flightgear/ X-VCS-Committer: reavertm X-VCS-Committer-Name: Maciej Mrozowski X-VCS-Revision: e17ea23a40c1fcdb092d14d118ea10352078b34c X-VCS-Branch: master Date: Thu, 6 Feb 2020 01:13:12 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 76b8f471-8296-4633-83a2-e61ef461b825 X-Archives-Hash: 908f588a7290541d2ba08c0c3f8499bb commit: e17ea23a40c1fcdb092d14d118ea10352078b34c Author: Maciej Mrozowski gentoo org> AuthorDate: Thu Feb 6 01:09:45 2020 +0000 Commit: Maciej Mrozowski gentoo org> CommitDate: Thu Feb 6 01:12:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17ea23a games-simulation/flightgear: Do not add flags unrelated cpu_flags_x86_sse2, fix live ebuild Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Maciej Mrozowski gentoo.org> games-simulation/flightgear/flightgear-2019.1.1.ebuild | 4 +++- games-simulation/flightgear/flightgear-9999.ebuild | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild b/games-simulation/flightgear/flightgear-2019.1.1.ebuild index 5eb17e2184a..a8847f1ad50 100644 --- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild +++ b/games-simulation/flightgear/flightgear-2019.1.1.ebuild @@ -92,6 +92,8 @@ src_configure() { -DENABLE_PROFILE=OFF -DENABLE_QT=$(usex qt5) -DENABLE_RTI=OFF + -DENABLE_SIMD=OFF # see CPU_FLAGS + -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) -DENABLE_STGMERGE=ON -DENABLE_TERRASYNC=$(usex utils) -DENABLE_TRAFFIC=$(usex utils) @@ -114,7 +116,7 @@ src_configure() { -DWITH_FGPANEL=$(usex utils) ) if use cpu_flags_x86_sse2; then - append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize + append-flags -msse2 -mfpmath=sse fi if use gdal && use utils; then mycmakeargs+=(-DENABLE_DEMCONVERT=ON) diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild index 6303c1ab598..ce6c889aeb7 100644 --- a/games-simulation/flightgear/flightgear-9999.ebuild +++ b/games-simulation/flightgear/flightgear-9999.ebuild @@ -14,7 +14,7 @@ EGIT_BRANCH="next" LICENSE="GPL-2" KEYWORDS="" SLOT="0" -IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" +IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax" # Needs --fg-root with path to flightgear-data passed to test runner passed, # not really worth patching @@ -81,7 +81,6 @@ src_configure() { -DENABLE_FGELEV=$(usex utils) -DENABLE_FGJS=$(usex utils) -DENABLE_FGVIEWER=$(usex utils) - -DENABLE_FLITE=OFF -DENABLE_GDAL=$(usex gdal) -DENABLE_GPSSMOOTH=$(usex utils) -DENABLE_HID_INPUT=$(usex udev) @@ -94,6 +93,8 @@ src_configure() { -DENABLE_PROFILE=OFF -DENABLE_QT=$(usex qt5) -DENABLE_RTI=OFF + -DENABLE_SIMD=OFF # see CPU_FLAGS + -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2) -DENABLE_STGMERGE=ON -DENABLE_TERRASYNC=$(usex utils) -DENABLE_TRAFFIC=$(usex utils) @@ -106,8 +107,8 @@ src_configure() { -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear -DSP_FDMS=ON -DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway - -DSYSTEM_FLITE=ON - -DSYSTEM_HTS_ENGINE=ON + -DSYSTEM_FLITE=OFF + -DSYSTEM_HTS_ENGINE=OFF -DSYSTEM_SPEEX=ON -DSYSTEM_GSM=ON -DSYSTEM_SQLITE=ON @@ -116,7 +117,7 @@ src_configure() { -DWITH_FGPANEL=$(usex utils) ) if use cpu_flags_x86_sse2; then - append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize + append-flags -msse2 -mfpmath=sse fi if use gdal && use utils; then mycmakeargs+=(-DENABLE_DEMCONVERT=ON)