Add flightgear 2024.1.3
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing

Signed-off-by: Manuel Friedli <manuel@fritteli.ch>
This commit is contained in:
Manuel Friedli 2026-01-04 16:26:30 +01:00
parent 017e8c454d
commit b65f88b1c8
Signed by: manuel
GPG key ID: 41D08ABA75634DA1
20 changed files with 1266 additions and 0 deletions

View file

@ -0,0 +1,5 @@
AUX 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch 1133 BLAKE2B c149bd4d1be4038bbbd18627755947542f72d9f80314555bd2749d0c7ba6a859bba8237bc1a295661ca5d1ba4cf698ecf72dce55cb9b3c343d95cb9cb8a08eec SHA512 11e5bc51ad5452c0f09d3953d67262e0a646478f1b4bc29e782b87802f9b48712bc033364e36a250b7272ad363ad911d2fe51cb3dc509171c50fe9b2f3ecf90d
AUX 0002-fix-support-for-aarch64.patch 819 BLAKE2B 54ad2da897398ae39864b04b156ee784f9a9a325ebea702c590d5029671135035ac95b645e7a5d0f0d75d4a91c935039add3124755199899b49d40a4fb1a6d08 SHA512 f21c22adff9bda15142281c349adacda8b223399831d320a2c0b2d38af4741e486bc5a701e470a12ed981599e526a877e974ef105aea668b9410c448f29903af
AUX simgear-2024.1.3-boost.patch 426 BLAKE2B 98d01e06980e4b9506d54f10edb3f71aa3e12b7dfcd1fcd61f2fb46d1b65cd4ad4a5694fde5705f5b1d40a82a3dc7eff341c6275d7ea657273fd31857657685e SHA512 d9ddf1da745132de3fb2c101ebb284028b272989998fed971aa03cd67ea5137bfe3641a1fc6eb80e23ccd5517c09246a7cae45489633356d51ac4f457e0e873d
DIST simgear-2024.1.3.tar.bz2 1783857 BLAKE2B d4a6227ea74afdac8767280eacecc43cd80b8f28dbe54fec0d27a18936008ba71804438e86a81c4a01a66d9b66d9a4a050552281e0943638daa63f1faf0f68ee SHA512 23d97b9837fe67f35a0bdb6f8e6e466fdfc7774762d0c6006d6fec4f472bde1654571532bf9bc5cee8dd35c3a362727b347474ea605d4c87939edd8511e6fea7
EBUILD simgear-2024.1.3.ebuild 1584 BLAKE2B 4f544bfdcf217349e061bbb5ca713f140d038378fbf3bf3ce45c8a0a538d83c73b0e4bc1ecac462c1fbc2f206ecb4bbf5a007d94adb01a927664493d0ef89edf SHA512 e5f4191225fb367d92cfb1d2767ce3eac1b76af804db915fdf5e13ce9a08143e63101791fac6d63de493db9b6abfdb231ef46cbfc37d9e7d11d49fef3224ba9a

View file

@ -0,0 +1,34 @@
From 9465f10110e02686b3f8a860520a7e8f3c6a7936 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice@bellet.info>
Date: Sun, 22 Sep 2013 11:56:12 +0200
Subject: [PATCH 0/1] check to be sure that %n is not being set as format type
(CVE-2012-2090)
---
simgear/scene/model/SGText.cxx | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/simgear/scene/model/SGText.cxx b/simgear/scene/model/SGText.cxx
index 08e84439..bc673511 100644
--- a/simgear/scene/model/SGText.cxx
+++ b/simgear/scene/model/SGText.cxx
@@ -73,6 +73,16 @@ void SGText::UpdateCallback::operator()(osg::Node * node, osg::NodeVisitor *nv )
// FIXME:
// hopefully the users never specifies bad formats here
// this should better be something more robust
+ // It is never safe for format.c_str to be %n.
+ string unsafe ("%n");
+ size_t found;
+
+ found=format.find(unsafe);
+ if (found!=string::npos) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "format type contained %n, but this is unsafe, reverting to %s");
+ format = "%s";
+ }
+
char buf[256];
if( numeric ) {
double d = property->getDoubleValue() * scale + offset;
--
2.48.1

View file

@ -0,0 +1,25 @@
From 560be7700e03b20e5f252fed371ac14a0e7a7c17 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice@bellet.info>
Date: Fri, 19 Feb 2016 15:57:19 +0100
Subject: [PATCH 1/1] fix support for aarch64
---
simgear/nasal/naref.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/simgear/nasal/naref.h b/simgear/nasal/naref.h
index 21f766f5..7e269a1f 100644
--- a/simgear/nasal/naref.h
+++ b/simgear/nasal/naref.h
@@ -18,7 +18,7 @@
# endif
#elif defined(_M_IX86) || defined(__i386) || defined(__x86_64) || \
defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \
- defined(_M_X64) || defined(_M_ARM) || \
+ defined(_M_X64) || defined(_M_ARM) || defined(__aarch64__) || \
defined(__e2k__)
# define NASAL_LE
#elif defined(__sparc) || defined(__ARMEB__) || \
--
2.48.1

View 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"

View file

@ -0,0 +1,66 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake
DESCRIPTION="Development library for simulation games"
HOMEPAGE="https://www.flightgear.org/"
#SRC_URI="https://gitlab.com/flightgear/fgmeta/-/jobs/9264813015/artifacts/raw/sgbuild/${P}.tar.bz2"
SRC_URI="https://gitlab.com/flightgear/simgear/-/archive/${PV}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cpu_flags_x86_sse2 debug ffmpeg gdal subversion test"
RESTRICT="!test? ( test )"
# TODO AeonWave, CycloneDDS
COMMON_DEPEND="
app-arch/xz-utils
dev-libs/expat
dev-games/openscenegraph
media-libs/openal
net-libs/udns
net-misc/curl
virtual/zlib:=
virtual/opengl
ffmpeg? ( media-video/ffmpeg:0 )
gdal? ( sci-libs/gdal:= )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
"
RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
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() {
local mycmakeargs=(
-DENABLE_ASAN=OFF
-DENABLE_CYCLONE=OFF
-DENABLE_GDAL=$(usex gdal)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DENABLE_TSAN=OFF
-DENABLE_VIDEO_RECORD=$(usex ffmpeg)
-DSIMGEAR_HEADLESS=OFF
-DSIMGEAR_SHARED=ON
-DSYSTEM_EXPAT=ON
-DSYSTEM_UDNS=ON
-DUSE_AEONWAVE=OFF
-DUSE_OPENALSOFT=ON
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
)
cmake_src_configure
}