From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1141927-garchives=archives.gentoo.org@lists.gentoo.org>
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 A8EE5138351
for <garchives@archives.gentoo.org>; Sat, 1 Feb 2020 01:02:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 31B53E0887;
Sat, 1 Feb 2020 01:02:16 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 0E102E0887
for <gentoo-commits@lists.gentoo.org>; Sat, 1 Feb 2020 01:02:15 +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 5887934E528
for <gentoo-commits@lists.gentoo.org>; Sat, 1 Feb 2020 01:02:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F6A910C
for <gentoo-commits@lists.gentoo.org>; Sat, 1 Feb 2020 01:02:12 +0000 (UTC)
From: "Maciej Mrozowski" <reavertm@gentoo.org>
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" <reavertm@gentoo.org>
Message-ID: <1580518695.85d10adb3b7e1ce2c3191b718a0b60de53af70da.reavertm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-simulation/flightgear/Manifest games-simulation/flightgear/flightgear-2018.3.1.ebuild games-simulation/flightgear/flightgear-2018.3.2.ebuild 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: 85d10adb3b7e1ce2c3191b718a0b60de53af70da
X-VCS-Branch: master
Date: Sat, 1 Feb 2020 01:02:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 591c7876-8d97-4858-9d4f-923369c7207b
X-Archives-Hash: 73be0bf3db64b59c4c851a82dc1c5c9e
commit: 85d10adb3b7e1ce2c3191b718a0b60de53af70da
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 00:55:50 2020 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 00:58:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d10adb
games-simulation/flightgear: Version bump, remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
games-simulation/flightgear/Manifest | 3 +-
.../flightgear/flightgear-2018.3.1.ebuild | 159 ---------------------
...-2018.3.2.ebuild => flightgear-2019.1.1.ebuild} | 3 +-
games-simulation/flightgear/flightgear-9999.ebuild | 6 +-
4 files changed, 8 insertions(+), 163 deletions(-)
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 006bb29ae93..ea3c7817887 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,2 +1 @@
-DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
-DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
+DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce SHA512 edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
deleted file mode 100644
index 6e3aa9ddb61..00000000000
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="https://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="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
-RESTRICT="test"
-
-# zlib is some strange auto-dep from simgear
-COMMON_DEPEND="
- dev-db/sqlite:3
- <dev-games/openscenegraph-3.5.6:=[jpeg,png]
- ~dev-games/simgear-${PV}[gdal=]
- media-libs/openal
- >=media-libs/speex-1.2.0:0
- media-libs/speexdsp:0
- media-sound/gsm
- sys-libs/zlib
- virtual/glu
- x11-libs/libX11
- dbus? ( >=sys-apps/dbus-1.6.18-r1 )
- gdal? ( >=sci-libs/gdal-2.0.0:0 )
- qt5? (
- >=dev-qt/qtcore-5.7.1:5
- >=dev-qt/qtdeclarative-5.7.1:5
- >=dev-qt/qtgui-5.7.1:5
- >=dev-qt/qtnetwork-5.7.1:5
- >=dev-qt/qtwidgets-5.7.1:5
- )
- udev? ( virtual/udev )
- utils? (
- media-libs/freeglut
- media-libs/freetype:2
- media-libs/glew:0
- media-libs/libpng:0
- virtual/opengl
- qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
- )
-"
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
- >=media-libs/plib-1.8.5
- utils? (
- x11-libs/libXi
- x11-libs/libXmu
- )
-"
-RDEPEND="${COMMON_DEPEND}
- ~games-simulation/${PN}-data-${PV}
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
- use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_AUTOTESTING=OFF
- -DENABLE_FGCOM=$(usex utils)
- -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)
- -DENABLE_JS_DEMO=$(usex utils)
- -DENABLE_JSBSIM=ON
- -DENABLE_LARCSIM=ON
- -DENABLE_METAR=$(usex utils)
- -DENABLE_OPENMP=$(usex openmp)
- -DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
- -DENABLE_PROFILE=OFF
- -DENABLE_QT=$(usex qt5)
- -DENABLE_RTI=OFF
- -DENABLE_STGMERGE=ON
- -DENABLE_TERRASYNC=$(usex utils)
- -DENABLE_TRAFFIC=$(usex utils)
- -DENABLE_UIUC_MODEL=ON
- -DENABLE_YASIM=ON
- -DEVENT_INPUT=$(usex udev)
- -DFG_BUILD_TYPE=Release
- -DFG_DATA_DIR=/usr/share/${PN}
- -DJSBSIM_TERRAIN=ON
- -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_SPEEX=ON
- -DSYSTEM_GSM=ON
- -DSYSTEM_SQLITE=ON
- -DUSE_AEONWAVE=OFF
- -DUSE_DBUS=$(usex dbus)
- -DWITH_FGPANEL=$(usex utils)
- )
- if use gdal && use utils; then
- mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
- else
- mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
- fi
- if use qt5 && use utils; then
- mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
- else
- mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # Install bash completion (TODO zsh)
- # Uncomment below when scripts stops writing files...
-# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
-# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
-# newbashcomp scripts/completion/fg-completion.bash ${PN}
-
- # Install examples and other misc files
- if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins -r scripts/java scripts/perl scripts/python
- insinto /usr/share/doc/"${PF}"/examples/c++
- doins -r scripts/example/*
- insinto /usr/share/doc/"${PF}"/tools
- doins -r scripts/atis scripts/tools/*
- fi
-
- # Install nasal script syntax
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins scripts/syntax/{ac3d,nasal}.vim
- insinto /usr/share/vim/vimfiles/ftdetect/
- doins "${FILESDIR}"/{ac3d,nasal}.vim
- fi
-}
-
-pkg_postinst() {
- einfo "Please note that data files location changed to /usr/share/flightgear"
- if use qt5; then
- einfo "To use launcher, run fgfs with '--launcher' parameter"
- fi
-}
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
similarity index 98%
rename from games-simulation/flightgear/flightgear-2018.3.2.ebuild
rename to games-simulation/flightgear/flightgear-2019.1.1.ebuild
index 7b68e8112ef..5eb17e2184a 100644
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
dev-db/sqlite:3
- <dev-games/openscenegraph-3.5.6:=[jpeg,png]
+ dev-games/openscenegraph[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
@@ -74,6 +74,7 @@ pkg_pretend() {
src_configure() {
local mycmakeargs=(
-DENABLE_AUTOTESTING=OFF
+ -DENABLE_COMPOSITOR=OFF
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 1dcf521d629..6303c1ab598 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -23,7 +23,7 @@ RESTRICT="test"
# zlib is some strange auto-dep from simgear
COMMON_DEPEND="
dev-db/sqlite:3
- <dev-games/openscenegraph-3.5.6:=[jpeg,png]
+ dev-games/openscenegraph[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
@@ -76,6 +76,7 @@ pkg_pretend() {
src_configure() {
local mycmakeargs=(
-DENABLE_AUTOTESTING=OFF
+ -DENABLE_COMPOSITOR=OFF
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
@@ -114,6 +115,9 @@ src_configure() {
-DUSE_DBUS=$(usex dbus)
-DWITH_FGPANEL=$(usex utils)
)
+ if use cpu_flags_x86_sse2; then
+ append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+ fi
if use gdal && use utils; then
mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
else