diff --git a/FlightGear-2020.3.11-fix_childrenLoaded_assert.patch b/FlightGear-2020.3.11-fix_childrenLoaded_assert.patch new file mode 100644 index 0000000..240c750 --- /dev/null +++ b/FlightGear-2020.3.11-fix_childrenLoaded_assert.patch @@ -0,0 +1,11 @@ +--- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx.orig 2021-11-01 09:55:26.210454089 +0000 ++++ flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx 2021-11-01 09:46:03.555750391 +0000 +@@ -148,7 +148,7 @@ + + void Leaf::insertChild(FGPositioned::Type ty, PositionedID id) + { +- assert(childrenLoaded); ++ assert(_childrenLoaded); + children.insert(children.end(), TypedPositioned(ty, id)); + } + diff --git a/FlightGear.spec b/FlightGear.spec index a549ce4..6aca5ba 100644 --- a/FlightGear.spec +++ b/FlightGear.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: FlightGear -Version: 2020.3.9 -Release: 2mamba +Version: 2020.3.11 +Release: 1mamba Summary: Flight Simulator Group: Graphical Desktop/Applications/Games Vendor: openmamba @@ -10,9 +10,10 @@ Packager: Silvan Calarco URL: https://www.flightgear.org/ Source0: https://downloads.sourceforge.net/project/flightgear/release-%{majver}/flightgear-%{version}.tar.bz2 Source1: https://downloads.sourceforge.net/project/flightgear/release-%{majver}/FlightGear-%{version}-data.txz -Source2: flight.png +#Source2: flight.png Patch0: FlightGear-3.4.0-fgviewer-find-lX11.patch Patch1: FlightGear-2020.3.9-aarch64-rpi.patch +Patch2: FlightGear-2020.3.11-fix_childrenLoaded_assert.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -38,16 +39,17 @@ BuildRequires: libosg-devel BuildRequires: libplib-devel BuildRequires: libpng-devel BuildRequires: libqt5-devel +BuildRequires: libraspberrypi-devel BuildRequires: libspeex-devel BuildRequires: libspeexdsp-devel BuildRequires: libstdc++6-devel BuildRequires: libudev-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END -BuildRequires: libSimGear-devel >= %{version}-2mamba +BuildRequires: libSimGear-devel = %{version} BuildRequires: libfltk-devel >= 1.3.3-2mamba BuildRequires: libosg-devel >= 3.6.5 -Requires: %{name}-data +Requires: %{name}-data = %{?epoch:%epoch:}%{version}-%{release} Requires: alsa-oss %description @@ -61,14 +63,18 @@ Summary: Maps for %{name} The FlightGear flight simulator project is an open-source, multi-platform, cooperative flight simulator development project. This package contains maps and scenary for FlightGear. +%debug_package + %prep %setup -q -a1 -n flightgear-%{version} -#% setup -q -n flightgear-%{version} -D -T +#% setup -q -n flightgear-%{vers#ion} -D -T #:<< _EOF #%patch0 -p1 %patch1 -p1 +%patch2 -p1 %build +#:<< _EOF %cmake -d build \ -DCMAKE_EXE_LINKER_FLAGS="-lX11" @@ -92,8 +98,6 @@ install -D -m0755 ./build/src/GUI/libfgqmluid.so %{buildroot}%{_libdir}/libfgqml %{_bindir}/* %{_libdir}/libfglauncherd.so %{_libdir}/libfgqmluid.so -%dir %{_libdir}/FlightGear -%{_libdir}/FlightGear/* %{_datadir}/applications/org.flightgear.FlightGear.desktop %{_datadir}/metainfo/org.flightgear.FlightGear.metainfo.xml %{_datadir}/bash-completion/completions/fgfs @@ -112,6 +116,9 @@ install -D -m0755 ./build/src/GUI/libfgqmluid.so %{buildroot}%{_libdir}/libfgqml %{_libdir}/%{name}/* %changelog +* Sun Oct 31 2021 Silvan Calarco 2020.3.11-1mamba +- update to 2020.3.11 + * Tue Jun 22 2021 Silvan Calarco 2020.3.9-2mamba - rebuilt with OpenSceneGraph 3.6.5 diff --git a/flight.png b/flight.png deleted file mode 100644 index c9f8034..0000000 Binary files a/flight.png and /dev/null differ