Skip to content

Commit

Permalink
games-util/atlas: Fix -Wnarrowing failures for GCC 6
Browse files Browse the repository at this point in the history
Bug: https://bugs.gentoo.org/show_bug.cgi?id=612986
Package-Manager: Portage-2.3.5, Repoman-2.3.2
  • Loading branch information
SoapGentoo committed Apr 17, 2017
1 parent 1c88638 commit 8654aff
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

EAPI=6

inherit autotools eutils
inherit autotools

MY_PN=atlas-hgcode
MY_PV=e183e3b3a0412b504edcb3664445b3e04fd484a2
Expand All @@ -20,12 +20,12 @@ IUSE=""

COMMON_DEPEND="
media-libs/freeglut
media-libs/glew:0
>=media-libs/libpng-1.5:0
media-libs/glew:0=
media-libs/libpng:0=
net-misc/curl
sys-libs/zlib
virtual/glu
virtual/jpeg:*
virtual/jpeg:0
virtual/opengl
"
DEPEND="${COMMON_DEPEND}
Expand All @@ -42,25 +42,25 @@ PATCHES=(
"${FILESDIR}/${P}-simgear-compilation.patch"
)

DOCS=(AUTHORS NEWS README)

src_prepare() {
default_src_prepare
default

# -Wnarrowing failure, #612986
sed -i -e 's:0x:(char)0x:g' src/tiles.h || die

eautoreconf
}

src_configure() {
econf \
--datadir=/usr/share/flightgear \
--disable-dependency-tracking \
--datadir="${EPREFIX}"/usr/share/flightgear \
--enable-simgear-shared \
--with-fgbase=/usr/share/flightgear
--with-fgbase="${EPREFIX}"/usr/share/flightgear
}

pkg_postinst() {
elog "To run Atlas concurrently with FlightGear use the following:"
elog "Atlas --path=[path of map images] --udp=[port number]"
elog "and start fgfs with the following switch (or in .fgfsrc):"
elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp"
echo
}

0 comments on commit 8654aff

Please sign in to comment.