flightgear: update to 2020.3.13

- Fix cross builds
- Start with --launcher in .desktop
- Build with system sqlite and flite
- Remove qt option
- Remove time64.patch
- Various cleanups

Closes: #37106 [via git-merge-pr]
This commit is contained in:
Roberto Ricci 2022-05-13 16:56:37 +02:00 committed by Andrew Benson
parent 0ea1c9d82e
commit 3f268c1bc0
3 changed files with 16 additions and 44 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

View file

@ -1,13 +0,0 @@
--- a/src/Input/FGLinuxEventInput.cxx 2020-06-26 00:08:15.000000000 +0200
+++ b/src/Input/FGLinuxEventInput.cxx 2020-12-07 07:51:45.332825252 +0100
@@ -415,8 +415,8 @@
evt.type=typeCode.type;
evt.code = typeCode.code;
evt.value = (long)value;
- evt.time.tv_sec = 0;
- evt.time.tv_usec = 0;
+ evt.input_event_sec = 0;
+ evt.input_event_usec = 0;
size_t bytes_written = write(fd, &evt, sizeof(evt));
if( bytes_written == sizeof(evt) )

View file

@ -1,61 +1,46 @@
# Template file for 'flightgear' # Template file for 'flightgear'
pkgname=flightgear pkgname=flightgear
version=2020.3.11 version=2020.3.13
revision=1 revision=1
# XXX: always keep in sync with simgear version!
build_style=cmake build_style=cmake
build_helper="qemu"
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
-DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${wrksrc}/fgdata/Translations" -DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/fgdata/Translations
hostmakedepends="fltk gettext pkg-config $(vopt_if qt qt5-tools)" -DSYSTEM_SQLITE=ON -DSYSTEM_FLITE=ON"
hostmakedepends="gettext pkg-config qt5-tools"
makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
libfreeglut-devel fltk-devel libglvnd-devel libgsm-devel glew-devel speex-devel libfreeglut-devel libglvnd-devel libgsm-devel glew-devel speex-devel
sqlite-devel osg-devel plib-devel libcurl-devel simgear sqlite-devel osg-devel plib-devel libcurl-devel simgear-devel flite-devel
$(vopt_if qt 'qt5-devel qt5-tools-devel qt5-declarative-devel qt5-svg-devel')" 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="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://www.flightgear.org/" homepage="https://www.flightgear.org/"
changelog="https://wiki.flightgear.org/Changelog_2020.3"
distfiles=" 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.txz" $SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/FlightGear-${version}-data.txz"
checksum="fe2706c7707ea73abc5114773de45f29861ab0f8f535656af0428ed049ca4a97 checksum="661abfaf475abc8cfd1bab57559469efa662bc6d03f58e8d977385003fe5aa8c
123f151b2c0f4220f0dd55e875ca57a4ec38a94f71f8c04c58caeac077e2b558" 0b7894540ec8250efb39d5dc6819d2a43a613058e61599a7d27a3342f7714893"
python_version=2 python_version=2
# the test suite doesn't get built, if enabled it segfaults
make_check=no make_check=no
nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio
build_options="qt"
build_options_default="qt"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools $(vopt_if qt 'qt5-devel qt5-declarative-devel')" hostmakedepends+=" qt5-host-tools qt5-devel qt5-declarative-devel"
fi fi
# Suppress warnings regarding auto_ptr
CXXFLAGS="-Wno-deprecated-declarations"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel" makedepends+=" libexecinfo-devel"
configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo" configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo"
fi fi
post_extract() {
if [ -d "${wrksrc}/../fgdata" ]; then
mv ${wrksrc}/../fgdata ${wrksrc}
fi
}
post_install() {
vinstall package/org.flightgear.FlightGear.desktop 644 usr/share/applications
vinstall package/flightgear.ico 644 usr/share/icons
vinstall ${FILESDIR}/flightgear.png 644 usr/share/pixmaps
sed -i ${DESTDIR}/usr/share/applications/*.desktop \
-e "s;Exec=.*;Exec=fgfs --fg-root=/usr/share/flightgear/fgdata;"
}
flightgear-data_package() { flightgear-data_package() {
short_desc+=" - data files" short_desc+=" - data files"
pkg_install() { pkg_install() {
vmkdir usr/share/flightgear vmkdir usr/share/flightgear
mv ${wrksrc}/fgdata ${PKGDESTDIR}/usr/share/flightgear mv ${XBPS_BUILDDIR}/fgdata ${PKGDESTDIR}/usr/share/flightgear
} }
} }