From 4f4a2c9cdd36e80296964daae0d3f0eafd7651c8 Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Mon, 2 Oct 2017 09:36:46 +0200 Subject: [PATCH] download_and_compile.sh: add two optional deps required for the built-in launcher Declare qtdeclarative5-private-dev and qml-module-qtquick2 as optional dependencies, because they are needed for the built-in launcher, starting from FG commit 3a8d3506d651b770e3173841a034e6203528f465 (committed to FG on 2017-09-26). People who can't install these packages (oldish systems, etc.) should still be able to build and run FlightGear, but without the built-in launcher. See discussion around this message: https://sourceforge.net/p/flightgear/mailman/message/36059892/ --- download_and_compile.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/download_and_compile.sh b/download_and_compile.sh index 739cc2e..60a394f 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -331,6 +331,10 @@ _mandatory_pkg_alternative libopenscenegraph-3.4-dev libopenscenegraph-dev \ # FG PKG="$PKG libopenal-dev libudev-dev qt5-default qtdeclarative5-dev libdbus-1-dev libplib-dev" _mandatory_pkg_alternative libpng-dev libpng12-dev libpng16-dev +# Those two are needed for the built-in launcher, starting from FG commit +# 3a8d3506d651b770e3173841a034e6203528f465 (committed to FG on 2017-09-26). +_optional_pkg_alternative qtdeclarative5-private-dev +_optional_pkg_alternative qml-module-qtquick2 # FGPanel PKG="$PKG fluid libbz2-dev libfltk1.3-dev libxi-dev libxmu-dev" # FGAdmin