flightgear: update to 2020.1.3

This commit is contained in:
Jürgen Buchmüller 2020-08-23 11:11:36 +02:00
parent 368b0ee18c
commit ca37a8a3b4
2 changed files with 22 additions and 31 deletions

View File

@ -1,22 +0,0 @@
--- src/Main/bootstrap.cxx 2017-03-17 09:52:07.474706542 +0100
+++ src/Main/bootstrap.cxx 2017-03-17 09:53:40.361793507 +0100
@@ -141,7 +141,7 @@
}
#endif
-#if defined(__GNUC__)
+#if defined(__GNUC__) && defined(__GLIBC__)
#include <execinfo.h>
#include <cxxabi.h>
void segfault_handler(int signo) {
@@ -244,8 +244,10 @@
signal(SIGPIPE, SIG_IGN);
# ifndef NDEBUG
+# ifdef __GLIBC__
signal(SIGSEGV, segfault_handler);
# endif
+# endif
#endif
_bootstrap_OSInit = 0;

View File

@ -1,13 +1,15 @@
# Template file for 'flightgear' # Template file for 'flightgear'
pkgname=flightgear pkgname=flightgear
version=2019.1.1 version=2020.1.3
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata -DSYSTEM_SQLITE=1" configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
hostmakedepends="fltk pkg-config" -DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations"
makedepends="MesaLib-devel boost-devel freealut-devel libfreeglut-devel fltk-devel hostmakedepends="fltk gettext pkg-config $(vopt_if qt qt5-tools)"
libgsm-devel glew-devel speex-devel sqlite-devel osg-devel plib-devel libcurl-devel makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
simgear $(vopt_if qt 'qt5-devel qt5-declarative-devel qt5-svg-devel')" libfreeglut-devel fltk-devel libglvnd-devel libgsm-devel glew-devel speex-devel
sqlite-devel osg-devel plib-devel libcurl-devel simgear
$(vopt_if qt 'qt5-devel qt5-tools-devel qt5-declarative-devel qt5-svg-devel')"
depends="flightgear-data>=${version}" depends="flightgear-data>=${version}"
short_desc="Sophisticated flight simulator" short_desc="Sophisticated flight simulator"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>" maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
@ -17,8 +19,8 @@ distfiles="
$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2 $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2
$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.tar.bz2"
checksum=" checksum="
d1dff396b9ee96d454dbce8e9ab1aedee9829ced5fd57bcaf999a68b00553ca1 1f07e8ef2c558dae3b9738e313b57e711d38e569f85d49fc2c5ae647e3949a17
0ee261a4f916554e47ccc2acf889e0825fc22e0cc3880399278a2da83f04f593" 2196f4ffcdeaae3a8b0a2b6ebf62a456bfd0198abb6c0619f763204d89804a03"
python_version=2 python_version=2
nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio
@ -31,6 +33,17 @@ fi
# Suppress warnings regarding auto_ptr # Suppress warnings regarding auto_ptr
CXXFLAGS="-Wno-deprecated-declarations" CXXFLAGS="-Wno-deprecated-declarations"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo"
fi
post_extract() {
if [ -d "${wrksrc}/../fgdata" ]; then
mv ${wrksrc}/../fgdata ${wrksrc}
fi
}
post_install() { post_install() {
vinstall package/org.flightgear.FlightGear.desktop 644 usr/share/applications vinstall package/org.flightgear.FlightGear.desktop 644 usr/share/applications
vinstall package/flightgear.ico 644 usr/share/icons vinstall package/flightgear.ico 644 usr/share/icons
@ -44,6 +57,6 @@ flightgear-data_package() {
archs=noarch archs=noarch
pkg_install() { pkg_install() {
vmkdir usr/share/flightgear vmkdir usr/share/flightgear
mv ${XBPS_BUILDDIR}/fgdata ${PKGDESTDIR}/usr/share/flightgear mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear
} }
} }