* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear/files/
@ 2018-06-06 23:18 Maciej Mrozowski
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski @ 2018-06-06 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 97527901e870dcf1eca6d8651887352c68ed63fa
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 23:14:47 2018 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 23:15:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97527901
games-simulation/flightgear: tests should be optional, fix bug 657350
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../flightgear/files/flightgear-2018.2.1-cmake.patch | 11 +++++++++++
games-simulation/flightgear/flightgear-2018.2.1.ebuild | 2 ++
2 files changed, 13 insertions(+)
diff --git a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
new file mode 100644
index 00000000000..eca04212833
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
@@ -0,0 +1,11 @@
+diff -ruN flightgear-2018.2.1/CMakeLists.txt my/CMakeLists.txt
+--- flightgear-2018.2.1/CMakeLists.txt 2018-06-03 09:47:23.000000000 +0200
++++ my/CMakeLists.txt 2018-06-07 01:09:14.621303443 +0200
+@@ -596,4 +596,6 @@
+
+
+ # The test suite.
+-add_subdirectory(test_suite EXCLUDE_FROM_ALL)
++if(ENABLE_TESTS)
++ add_subdirectory(test_suite EXCLUDE_FROM_ALL)
++endif()
diff --git a/games-simulation/flightgear/flightgear-2018.2.1.ebuild b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
index 69d28c39ce7..15be88e6c57 100644
--- a/games-simulation/flightgear/flightgear-2018.2.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
@@ -59,6 +59,8 @@ RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
+PATCHES=("${FILESDIR}/${P}-cmake.patch")
+
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear/files/
@ 2018-12-29 1:29 Maciej Mrozowski
0 siblings, 0 replies; 2+ messages in thread
From: Maciej Mrozowski @ 2018-12-29 1:29 UTC (permalink / raw
To: gentoo-commits
commit: cf47a4133927024cd913c2d1fbce221a07025c68
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 01:20:56 2018 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 01:24:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf47a413
games-simulation/flightgear: Restrict >=osg-3.5.6, bug 673822. Remove old.
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
games-simulation/flightgear/Manifest | 2 -
.../files/flightgear-2018.2.1-cmake.patch | 11 --
.../flightgear/flightgear-2018.1.1.ebuild | 144 --------------------
.../flightgear/flightgear-2018.2.1.ebuild | 150 ---------------------
.../flightgear/flightgear-2018.3.1.ebuild | 2 +-
games-simulation/flightgear/flightgear-9999.ebuild | 2 +-
6 files changed, 2 insertions(+), 309 deletions(-)
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 5aa37127dd3..0d282499cf9 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,3 +1 @@
-DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
-DIST flightgear-2018.2.1.tar.bz2 8344999 BLAKE2B fc5fbd43bcc2e40ed3245aa5059b0e5a40918a707cbddc8383de191e29f6cdfaa6960f6cfffb201b20ad10f5da0f343a693768d38be2788fd2582f7b5dc2419c SHA512 d308eebf6d6017794c086d534f6543c03a54e55bd7f48caf8359d5a84776406eac8cd8f32252efb2cd8bbb82c9c15fe4d7e3229ff2483e7a9772bd532331be03
DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
diff --git a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
deleted file mode 100644
index eca04212833..00000000000
--- a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN flightgear-2018.2.1/CMakeLists.txt my/CMakeLists.txt
---- flightgear-2018.2.1/CMakeLists.txt 2018-06-03 09:47:23.000000000 +0200
-+++ my/CMakeLists.txt 2018-06-07 01:09:14.621303443 +0200
-@@ -596,4 +596,6 @@
-
-
- # The test suite.
--add_subdirectory(test_suite EXCLUDE_FROM_ALL)
-+if(ENABLE_TESTS)
-+ add_subdirectory(test_suite EXCLUDE_FROM_ALL)
-+endif()
diff --git a/games-simulation/flightgear/flightgear-2018.1.1.ebuild b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
deleted file mode 100644
index 596290c956b..00000000000
--- a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 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="http://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 test +udev +utils vim-syntax"
-
-# zlib is some strange auto-dep from simgear
-COMMON_DEPEND="
- dev-db/sqlite:3
- >=dev-games/openscenegraph-3.2.0:=[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_DEMCONVERT=$(usex gdal && usex utils)
- -DENABLE_FGCOM=$(usex utils)
- -DENABLE_FGELEV=$(usex utils)
- -DENABLE_FGJS=$(usex utils)
- -DENABLE_FGQCANVAS=$(usex qt5 && 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_PROFILE=OFF
- -DENABLE_QT=$(usex qt5)
- -DENABLE_RTI=OFF
- -DENABLE_TERRASYNC=$(usex utils)
- -DENABLE_TESTS=$(usex test)
- -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_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)
- )
-
- 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.2.1.ebuild b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
deleted file mode 100644
index f9b21c91e09..00000000000
--- a/games-simulation/flightgear/flightgear-2018.2.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 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="http://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 test +udev +utils vim-syntax"
-
-# zlib is some strange auto-dep from simgear
-COMMON_DEPEND="
- dev-db/sqlite:3
- >=dev-games/openscenegraph-3.2.0:=[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
- )
- test? ( dev-util/cppunit )
-"
-RDEPEND="${COMMON_DEPEND}
- ~games-simulation/${PN}-data-${PV}
-"
-
-PATCHES=("${FILESDIR}/${P}-cmake.patch")
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
- use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_AUTOTESTING=OFF
- -DENABLE_DEMCONVERT=$(usex gdal && usex utils)
- -DENABLE_FGCOM=$(usex utils)
- -DENABLE_FGELEV=$(usex utils)
- -DENABLE_FGJS=$(usex utils)
- -DENABLE_FGQCANVAS=$(usex qt5 && 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_TERRASYNC=$(usex utils)
- -DENABLE_TESTS=$(usex test)
- -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=ON
- -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)
- )
-
- 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.1.ebuild b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
index 4605cdbeecb..0a793b2009a 100644
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.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.2.0:=[jpeg,png]
+ <dev-games/openscenegraph-3.5.6:=[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 2f9f42b418e..7dd168e9627 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.2.0:=[jpeg,png]
+ <dev-games/openscenegraph-3.5.6:=[jpeg,png]
~dev-games/simgear-${PV}[gdal=]
media-libs/openal
>=media-libs/speex-1.2.0:0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-29 1:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-29 1:29 [gentoo-commits] repo/gentoo:master commit in: games-simulation/flightgear/, games-simulation/flightgear/files/ Maciej Mrozowski
-- strict thread matches above, loose matches on Subject: below --
2018-06-06 23:18 Maciej Mrozowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox