Control: tags 1112921 + patch Control: tags 1112921 + pending
Dear maintainer, I've prepared an NMU for flightgear (versioned as 1:2020.3.19+dfsg-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. This is an updated version with the following changes: * Backport upstream fix for FTBFS with GCC 15. (Closes: #1096639) * Fix FTBFS with CMake 4. (Closes: #1112921) * debian/control: Update Homepage. cu Adrian
diffstat for flightgear-2020.3.19+dfsg flightgear-2020.3.19+dfsg changelog | 9 + control | 2 patches/0001-3rdparty-iaxclient-fix-declaration-of-openal_initial.patch | 65 ++++++++++ patches/cmake-4.patch | 21 +++ patches/series | 2 5 files changed, 98 insertions(+), 1 deletion(-) diff -Nru flightgear-2020.3.19+dfsg/debian/changelog flightgear-2020.3.19+dfsg/debian/changelog --- flightgear-2020.3.19+dfsg/debian/changelog 2025-01-26 14:23:50.000000000 +0200 +++ flightgear-2020.3.19+dfsg/debian/changelog 2025-10-03 20:54:04.000000000 +0300 @@ -1,3 +1,12 @@ +flightgear (1:2020.3.19+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with GCC 15. (Closes: #1096639) + * Fix FTBFS with CMake 4. (Closes: #1112921) + * debian/control: Update Homepage. + + -- Adrian Bunk <[email protected]> Fri, 03 Oct 2025 20:54:04 +0300 + flightgear (1:2020.3.19+dfsg-1) unstable; urgency=medium * Team upload. diff -Nru flightgear-2020.3.19+dfsg/debian/control flightgear-2020.3.19+dfsg/debian/control --- flightgear-2020.3.19+dfsg/debian/control 2025-01-26 14:23:29.000000000 +0200 +++ flightgear-2020.3.19+dfsg/debian/control 2025-10-03 20:54:04.000000000 +0300 @@ -41,7 +41,7 @@ Standards-Version: 4.7.0 Vcs-Browser: https://salsa.debian.org/debian/flightgear Vcs-Git: https://salsa.debian.org/debian/flightgear.git -Homepage: https://home.flightgear.org/ +Homepage: https://flightgear.org/ Rules-Requires-Root: no Package: flightgear diff -Nru flightgear-2020.3.19+dfsg/debian/patches/0001-3rdparty-iaxclient-fix-declaration-of-openal_initial.patch flightgear-2020.3.19+dfsg/debian/patches/0001-3rdparty-iaxclient-fix-declaration-of-openal_initial.patch --- flightgear-2020.3.19+dfsg/debian/patches/0001-3rdparty-iaxclient-fix-declaration-of-openal_initial.patch 1970-01-01 02:00:00.000000000 +0200 +++ flightgear-2020.3.19+dfsg/debian/patches/0001-3rdparty-iaxclient-fix-declaration-of-openal_initial.patch 2025-09-23 21:05:20.000000000 +0300 @@ -0,0 +1,65 @@ +From 9bdee0b09061bf5ed079a3db0449020df7c92c08 Mon Sep 17 00:00:00 2001 +From: Florent Rougon <[email protected]> +Date: Wed, 7 May 2025 14:46:31 +0200 +Subject: 3rdparty/iaxclient: fix declaration of openal_initialize() + +In audio_openal.h, openal_initialize() was declared without any +parameter specified, however the definition takes two. This was valid in +pre-ANSI C (K&R function declarations) but was removed in C23 and is +apparently already causing problems: + + https://sourceforge.net/p/flightgear/mailman/message/59181327/ + +Also move #include "audio_openal.h" from iaxclient_lib.h to where it is +actually needed (iaxclient_lib.c). +--- + 3rdparty/iaxclient/lib/audio_openal.h | 2 +- + 3rdparty/iaxclient/lib/iaxclient_lib.c | 4 ++++ + 3rdparty/iaxclient/lib/iaxclient_lib.h | 4 ---- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/3rdparty/iaxclient/lib/audio_openal.h b/3rdparty/iaxclient/lib/audio_openal.h +index a698235ad..de7cbc866 100644 +--- a/3rdparty/iaxclient/lib/audio_openal.h ++++ b/3rdparty/iaxclient/lib/audio_openal.h +@@ -1,6 +1,6 @@ + #ifndef _AUDIO_OPENAL_H + #define _AUDIO_OPENAL_H + +-int openal_initialize(); ++int openal_initialize(struct iaxc_audio_driver *d, int sample_rate); + + #endif +diff --git a/3rdparty/iaxclient/lib/iaxclient_lib.c b/3rdparty/iaxclient/lib/iaxclient_lib.c +index 9ffa0ece2..35b5b6c77 100644 +--- a/3rdparty/iaxclient/lib/iaxclient_lib.c ++++ b/3rdparty/iaxclient/lib/iaxclient_lib.c +@@ -47,6 +47,10 @@ + #include "audio_alsa.h" + #endif + ++#ifdef AUDIO_OPENAL ++ #include "audio_openal.h" ++#endif ++ + #define IAXC_ERROR IAXC_TEXT_TYPE_ERROR + #define IAXC_STATUS IAXC_TEXT_TYPE_STATUS + #define IAXC_NOTICE IAXC_TEXT_TYPE_NOTICE +diff --git a/3rdparty/iaxclient/lib/iaxclient_lib.h b/3rdparty/iaxclient/lib/iaxclient_lib.h +index 91776c335..d98dc4516 100644 +--- a/3rdparty/iaxclient/lib/iaxclient_lib.h ++++ b/3rdparty/iaxclient/lib/iaxclient_lib.h +@@ -242,10 +242,6 @@ struct iaxc_call { + + #include "audio_file.h" + +-#ifdef AUDIO_OPENAL +- #include "audio_openal.h" +-#endif +- + extern int iaxci_audio_output_mode; + + int iaxci_post_event_callback(iaxc_event e); +-- +2.30.2 + diff -Nru flightgear-2020.3.19+dfsg/debian/patches/cmake-4.patch flightgear-2020.3.19+dfsg/debian/patches/cmake-4.patch --- flightgear-2020.3.19+dfsg/debian/patches/cmake-4.patch 1970-01-01 02:00:00.000000000 +0200 +++ flightgear-2020.3.19+dfsg/debian/patches/cmake-4.patch 2025-10-03 20:54:04.000000000 +0300 @@ -0,0 +1,21 @@ +Description: Fix FTBFS with CMake 4 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1112921 +Origin: backport, https://gitlab.com/flightgear/flightgear/-/commit/6f962581c1cfb5c789fb21d846a19b8153c826bc + +--- flightgear-2020.3.19+dfsg.orig/CMakeLists.txt ++++ flightgear-2020.3.19+dfsg/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.0) ++cmake_minimum_required (VERSION 3.5) + + include (CheckFunctionExists) + include (CheckVariableExists) +--- flightgear-2020.3.19+dfsg.orig/utils/fgqcanvas/CMakeLists.txt ++++ flightgear-2020.3.19+dfsg/utils/fgqcanvas/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED YES) + diff -Nru flightgear-2020.3.19+dfsg/debian/patches/series flightgear-2020.3.19+dfsg/debian/patches/series --- flightgear-2020.3.19+dfsg/debian/patches/series 2025-01-26 14:18:02.000000000 +0200 +++ flightgear-2020.3.19+dfsg/debian/patches/series 2025-10-03 20:54:04.000000000 +0300 @@ -13,3 +13,5 @@ fix-atomic-build-riscv64.patch Fix-build-with-64-bit-time_t-on-32-bit-architectures.patch Move-checkIORules-to-SGPathNasalIORulesChecker.patch +0001-3rdparty-iaxclient-fix-declaration-of-openal_initial.patch +cmake-4.patch
