From c01cffb1bc7ae6a298fd88d79bf027e208961adf Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:43:26 +0100 Subject: [PATCH] rebuilt with OpenSceneGraph 3.6.5 [release 2020.3.9-2mamba;Tue Jun 22 2021] --- FlightGear-2020.3.9-aarch64-rpi.patch | 11 +++++++++++ FlightGear.spec | 18 +++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 FlightGear-2020.3.9-aarch64-rpi.patch diff --git a/FlightGear-2020.3.9-aarch64-rpi.patch b/FlightGear-2020.3.9-aarch64-rpi.patch new file mode 100644 index 0000000..1c255b7 --- /dev/null +++ b/FlightGear-2020.3.9-aarch64-rpi.patch @@ -0,0 +1,11 @@ +--- flightgear-2020.3.9/utils/fgpanel/CMakeLists.txt 2021-06-10 15:16:55.000000000 +0100 ++++ flightgear-2020.3.9.patched/utils/fgpanel/CMakeLists.txt 2021-07-05 21:16:21.391728643 +0100 +@@ -117,7 +117,7 @@ + SimGearCore + ${PNG_LIBRARIES} + ${FREETYPE_LIBRARIES} +- -lbrcmGLESv2 -lbrcmEGL -lm -lbcm_host -L/opt/vc/lib ++ -lGLESv2 -lEGL -lm -lvchostif -lbcm_host -L/opt/vc/lib + ) + + target_compile_definitions(fgpanel-egl PUBLIC diff --git a/FlightGear.spec b/FlightGear.spec index e5bd7de..a549ce4 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: 1mamba +Release: 2mamba Summary: Flight Simulator Group: Graphical Desktop/Applications/Games Vendor: openmamba @@ -9,16 +9,13 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://www.flightgear.org/ Source0: https://downloads.sourceforge.net/project/flightgear/release-%{majver}/flightgear-%{version}.tar.bz2 -#Source0: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-%{version}.tar.bz2 Source1: https://downloads.sourceforge.net/project/flightgear/release-%{majver}/FlightGear-%{version}-data.txz -#Source1: http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/%{name}-data-%{majver}.0.tar.bz2 Source2: flight.png Patch0: FlightGear-3.4.0-fgviewer-find-lX11.patch +Patch1: FlightGear-2020.3.9-aarch64-rpi.patch License: GPL ## AUTOBUILDREQ-BEGIN -BuildRequires: OpenSceneGraph BuildRequires: glibc-devel -BuildRequires: libGL-devel BuildRequires: libGLU-devel BuildRequires: libICE-devel BuildRequires: libSM-devel @@ -33,20 +30,23 @@ BuildRequires: libfreeglut-devel BuildRequires: libfreetype-devel BuildRequires: libgcc BuildRequires: libglew-devel +BuildRequires: libglvnd-devel BuildRequires: libgsm-devel BuildRequires: liblzma-devel BuildRequires: libopenal-devel +BuildRequires: libosg-devel BuildRequires: libplib-devel BuildRequires: libpng-devel BuildRequires: libqt5-devel BuildRequires: libspeex-devel +BuildRequires: libspeexdsp-devel BuildRequires: libstdc++6-devel BuildRequires: libudev-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END -BuildRequires: libSimGear-devel >= %{version} +BuildRequires: libSimGear-devel >= %{version}-2mamba BuildRequires: libfltk-devel >= 1.3.3-2mamba -BuildRequires: OpenSceneGraph >= 3.4.0 +BuildRequires: libosg-devel >= 3.6.5 Requires: %{name}-data Requires: alsa-oss @@ -66,6 +66,7 @@ This package contains maps and scenary for FlightGear. #% setup -q -n flightgear-%{version} -D -T #:<< _EOF #%patch0 -p1 +%patch1 -p1 %build %cmake -d build \ @@ -111,6 +112,9 @@ install -D -m0755 ./build/src/GUI/libfgqmluid.so %{buildroot}%{_libdir}/libfgqml %{_libdir}/%{name}/* %changelog +* Tue Jun 22 2021 Silvan Calarco 2020.3.9-2mamba +- rebuilt with OpenSceneGraph 3.6.5 + * Sat Jun 19 2021 Automatic Build System 2020.3.9-1mamba - automatic version update by autodist