mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-16 14:29:05 -07:00
games-simulation/flightgear: support boost-1.88, #956438
Closes: https://bugs.gentoo.org/956438 Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>
This commit is contained in:
13
dev-games/simgear/files/simgear-2024.1.1-boost.patch
Normal file
13
dev-games/simgear/files/simgear-2024.1.1-boost.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
|
||||
index 54efc2c5194f9c6fa8c52a528aff56228c576d90..1734adf682e0614671675c5dad2f9dfd5d91838d 100644
|
||||
--- a/simgear/nasal/cppbind/NasalHash.hxx
|
||||
+++ b/simgear/nasal/cppbind/NasalHash.hxx
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef SG_NASAL_HASH_HXX_
|
||||
#define SG_NASAL_HASH_HXX_
|
||||
|
||||
+#include <boost/mpl/if.hpp>
|
||||
+
|
||||
#include "from_nasal.hxx"
|
||||
#include "to_nasal.hxx"
|
||||
|
||||
@@ -38,6 +38,7 @@ RDEPEND="${COMMON_DEPEND}
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch"
|
||||
"${FILESDIR}/0002-fix-support-for-aarch64.patch"
|
||||
"${FILESDIR}/${P}-boost.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
From 4effb8ca7a0faa2cd7fac58f29b37e32227e487d Mon Sep 17 00:00:00 2001
|
||||
From: Florent Rougon <f.rougon@frougon.net>
|
||||
Date: Wed, 7 May 2025 14:46:31 +0200
|
||||
Subject: [PATCH] 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 a698235adb..de7cbc866c 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 761dee42b9..ae2c43f3ca 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 91776c3351..d98dc45167 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);
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -69,6 +69,7 @@ PATCHES=(
|
||||
"${FILESDIR}/0003-make-fglauncher-a-static-library.patch"
|
||||
"${FILESDIR}/0005-make-fgqmlui-a-static-library.patch"
|
||||
"${FILESDIR}/0006-fgviewer-fix-crash-on-exit.patch"
|
||||
"${FILESDIR}/${P}-openal-init-decl.patch"
|
||||
)
|
||||
|
||||
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
|
||||
|
||||
Reference in New Issue
Block a user