update to 2020.3.11 [release 2020.3.11-1mamba;Sun Oct 31 2021]

This commit is contained in:
Silvan Calarco 2024-01-05 17:43:26 +01:00
parent c01cffb1bc
commit 6419d81f7d
3 changed files with 26 additions and 8 deletions

View File

@ -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));
}

View File

@ -1,7 +1,7 @@
%define majver %(echo %version | cut -d. -f1-2) %define majver %(echo %version | cut -d. -f1-2)
Name: FlightGear Name: FlightGear
Version: 2020.3.9 Version: 2020.3.11
Release: 2mamba Release: 1mamba
Summary: Flight Simulator Summary: Flight Simulator
Group: Graphical Desktop/Applications/Games Group: Graphical Desktop/Applications/Games
Vendor: openmamba Vendor: openmamba
@ -10,9 +10,10 @@ Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://www.flightgear.org/ URL: https://www.flightgear.org/
Source0: https://downloads.sourceforge.net/project/flightgear/release-%{majver}/flightgear-%{version}.tar.bz2 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 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 Patch0: FlightGear-3.4.0-fgviewer-find-lX11.patch
Patch1: FlightGear-2020.3.9-aarch64-rpi.patch Patch1: FlightGear-2020.3.9-aarch64-rpi.patch
Patch2: FlightGear-2020.3.11-fix_childrenLoaded_assert.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -38,16 +39,17 @@ BuildRequires: libosg-devel
BuildRequires: libplib-devel BuildRequires: libplib-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libqt5-devel BuildRequires: libqt5-devel
BuildRequires: libraspberrypi-devel
BuildRequires: libspeex-devel BuildRequires: libspeex-devel
BuildRequires: libspeexdsp-devel BuildRequires: libspeexdsp-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libz-devel BuildRequires: libz-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: libSimGear-devel >= %{version}-2mamba BuildRequires: libSimGear-devel = %{version}
BuildRequires: libfltk-devel >= 1.3.3-2mamba BuildRequires: libfltk-devel >= 1.3.3-2mamba
BuildRequires: libosg-devel >= 3.6.5 BuildRequires: libosg-devel >= 3.6.5
Requires: %{name}-data Requires: %{name}-data = %{?epoch:%epoch:}%{version}-%{release}
Requires: alsa-oss Requires: alsa-oss
%description %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. The FlightGear flight simulator project is an open-source, multi-platform, cooperative flight simulator development project.
This package contains maps and scenary for FlightGear. This package contains maps and scenary for FlightGear.
%debug_package
%prep %prep
%setup -q -a1 -n flightgear-%{version} %setup -q -a1 -n flightgear-%{version}
#% setup -q -n flightgear-%{version} -D -T #% setup -q -n flightgear-%{vers#ion} -D -T
#:<< _EOF #:<< _EOF
#%patch0 -p1 #%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
#:<< _EOF
%cmake -d build \ %cmake -d build \
-DCMAKE_EXE_LINKER_FLAGS="-lX11" -DCMAKE_EXE_LINKER_FLAGS="-lX11"
@ -92,8 +98,6 @@ install -D -m0755 ./build/src/GUI/libfgqmluid.so %{buildroot}%{_libdir}/libfgqml
%{_bindir}/* %{_bindir}/*
%{_libdir}/libfglauncherd.so %{_libdir}/libfglauncherd.so
%{_libdir}/libfgqmluid.so %{_libdir}/libfgqmluid.so
%dir %{_libdir}/FlightGear
%{_libdir}/FlightGear/*
%{_datadir}/applications/org.flightgear.FlightGear.desktop %{_datadir}/applications/org.flightgear.FlightGear.desktop
%{_datadir}/metainfo/org.flightgear.FlightGear.metainfo.xml %{_datadir}/metainfo/org.flightgear.FlightGear.metainfo.xml
%{_datadir}/bash-completion/completions/fgfs %{_datadir}/bash-completion/completions/fgfs
@ -112,6 +116,9 @@ install -D -m0755 ./build/src/GUI/libfgqmluid.so %{buildroot}%{_libdir}/libfgqml
%{_libdir}/%{name}/* %{_libdir}/%{name}/*
%changelog %changelog
* Sun Oct 31 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2020.3.11-1mamba
- update to 2020.3.11
* Tue Jun 22 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2020.3.9-2mamba * Tue Jun 22 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2020.3.9-2mamba
- rebuilt with OpenSceneGraph 3.6.5 - rebuilt with OpenSceneGraph 3.6.5

Binary file not shown.

Before

Width:  |  Height:  |  Size: 763 B