diff options
Diffstat (limited to 'devel/simgear')
-rw-r--r-- | devel/simgear/Makefile | 17 | ||||
-rw-r--r-- | devel/simgear/distinfo | 10 | ||||
-rw-r--r-- | devel/simgear/files/patch-simgear-misc-sg_path.cxx | 12 | ||||
-rw-r--r-- | devel/simgear/files/patch-simgear-package-md5.h | 11 | ||||
-rw-r--r-- | devel/simgear/files/patch-simgear-structure-SGAtomic.cxx | 53 | ||||
-rw-r--r-- | devel/simgear/files/patch-simgear-structure-SGAtomic.hxx | 17 | ||||
-rw-r--r-- | devel/simgear/files/patch-simgear_scene_viewer_Compositor.hxx | 10 | ||||
-rw-r--r-- | devel/simgear/pkg-plist | 47 |
8 files changed, 120 insertions, 57 deletions
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 1dda4632d69e..cc4a39917075 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -1,14 +1,6 @@ PORTNAME= simgear -PORTVERSION= 2020.3.19 -PORTREVISION= 5 +PORTVERSION= 2024.1.1 CATEGORIES= devel games -MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} - -# Fix for CVE-2025-0781 -# See: https://gitlab.com/frougon/flightgear-simgear/-/commits/2020.3.6-minimal-fix-for-CVE-2025-0781 -PATCH_SITES= https://gitlab.com/frougon/flightgear-${PORTNAME}/-/commit/ -PATCHFILES+= bcd6f22586be0058ee58d61ebfd227bd01c1bb1b.patch:-p1 \ - f2e8c8ce3925e62275d97d46c73c32cbc864d80b.patch:-p1 MAINTAINER= martymac@FreeBSD.org COMMENT= Toolkit for 3D games and simulations @@ -25,8 +17,13 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ libcurl.so:ftp/curl -USES= alias cmake compiler:c++11-lib cpe gl jpeg openal:al,alut \ +USES= alias cmake compiler:c++17-lang cpe gl jpeg openal:al,alut \ tar:bzip2 xorg + +USE_GITLAB= yes +GL_ACCOUNT= flightgear +GL_TAGNAME= v${PORTVERSION} + USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo index 03afdfcea491..a2aafb54de7a 100644 --- a/devel/simgear/distinfo +++ b/devel/simgear/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1738150339 -SHA256 (simgear-2020.3.19.tar.bz2) = 3b937c5b94422478e5d79114bdcd6c78e43a0a6ffba97544a86d441c3f9e8c3a -SIZE (simgear-2020.3.19.tar.bz2) = 1427799 -SHA256 (bcd6f22586be0058ee58d61ebfd227bd01c1bb1b.patch) = 4a92971b46dbca3eaefea6e1d0923dbbb169c9e42c8d343ae275c81784651ee6 -SIZE (bcd6f22586be0058ee58d61ebfd227bd01c1bb1b.patch) = 700 -SHA256 (f2e8c8ce3925e62275d97d46c73c32cbc864d80b.patch) = f2d6cf9f622563e0118f77d5dfdcf9785a1e90ce1ce496aeaa1afa145e7fff23 -SIZE (f2e8c8ce3925e62275d97d46c73c32cbc864d80b.patch) = 1865 +TIMESTAMP = 1751316975 +SHA256 (simgear-v2024.1.1.tar.bz2) = b75d3940d923a46c445c9afa6f8eb09f6a944ff23c4b546e72ba75fb5482a794 +SIZE (simgear-v2024.1.1.tar.bz2) = 1775602 diff --git a/devel/simgear/files/patch-simgear-misc-sg_path.cxx b/devel/simgear/files/patch-simgear-misc-sg_path.cxx deleted file mode 100644 index 8e8755f12a75..000000000000 --- a/devel/simgear/files/patch-simgear-misc-sg_path.cxx +++ /dev/null @@ -1,12 +0,0 @@ -Add missing include for unlink(2) call - ---- simgear/misc/sg_path.cxx.orig 2020-05-22 20:11:33 UTC -+++ simgear/misc/sg_path.cxx -@@ -31,6 +31,7 @@ - - #include <cstring> - #include <stdio.h> -+#include <unistd.h> - #include <sys/stat.h> - #include <errno.h> - #include <fstream> diff --git a/devel/simgear/files/patch-simgear-package-md5.h b/devel/simgear/files/patch-simgear-package-md5.h deleted file mode 100644 index 2489649f8e1f..000000000000 --- a/devel/simgear/files/patch-simgear-package-md5.h +++ /dev/null @@ -1,11 +0,0 @@ ---- simgear/package/md5.h.orig 2020-05-22 20:11:33 UTC -+++ simgear/package/md5.h -@@ -23,6 +23,8 @@ - typedef unsigned char u_int8_t; - typedef unsigned int u_int32_t; - typedef unsigned __int64 u_int64_t; -+#else -+#include <sys/types.h> - #endif - - #define MD5_BLOCK_LENGTH 64 diff --git a/devel/simgear/files/patch-simgear-structure-SGAtomic.cxx b/devel/simgear/files/patch-simgear-structure-SGAtomic.cxx new file mode 100644 index 000000000000..cb8ae35e2761 --- /dev/null +++ b/devel/simgear/files/patch-simgear-structure-SGAtomic.cxx @@ -0,0 +1,53 @@ +Work around: + +SGAtomic.cxx:48:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + +to fix build on i386 as Simgear uses CMAKE_CXX_STANDARD=17 + +--- simgear/structure/SGAtomic.cxx.orig 2025-06-30 14:48:03 UTC ++++ simgear/structure/SGAtomic.cxx +@@ -29,7 +29,7 @@ + #if defined(_WIN32) + # include <windows.h> + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + #elif defined(SGATOMIC_USE_MUTEX) + # include <mutex> + #else +@@ -43,7 +43,7 @@ SGAtomic::operator++() + return InterlockedIncrement(reinterpret_cast<long volatile*>(&mValue)); + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + return __sync_add_and_fetch(&mValue, 1); +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + register volatile unsigned* mem = reinterpret_cast<volatile unsigned*>(&mValue); + register unsigned result; + __asm__ __volatile__("lock; xadd{l} {%0,%1|%1,%0}" +@@ -64,7 +64,7 @@ SGAtomic::operator--() + return InterlockedDecrement(reinterpret_cast<long volatile*>(&mValue)); + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + return __sync_sub_and_fetch(&mValue, 1); +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + register volatile unsigned* mem = reinterpret_cast<volatile unsigned*>(&mValue); + register unsigned result; + __asm__ __volatile__("lock; xadd{l} {%0,%1|%1,%0}" +@@ -85,7 +85,7 @@ SGAtomic::operator unsigned() const + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + __sync_synchronize(); + return mValue; +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + __asm__ __volatile__("": : : "memory"); + return mValue; + #else +@@ -102,7 +102,7 @@ SGAtomic::compareAndExchange(unsigned oldValue, unsign + return oldValue == InterlockedCompareExchange(lvPtr, newValue, oldValue); + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) + return __sync_bool_compare_and_swap(&mValue, oldValue, newValue); +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + register volatile unsigned* mem = reinterpret_cast<volatile unsigned*>(&mValue); + unsigned before; + __asm__ __volatile__("lock; cmpxchg{l} {%1,%2|%1,%2}" diff --git a/devel/simgear/files/patch-simgear-structure-SGAtomic.hxx b/devel/simgear/files/patch-simgear-structure-SGAtomic.hxx new file mode 100644 index 000000000000..d8e813487dd8 --- /dev/null +++ b/devel/simgear/files/patch-simgear-structure-SGAtomic.hxx @@ -0,0 +1,17 @@ +Work around: + +SGAtomic.cxx:48:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] + +to fix build on i386 as Simgear uses CMAKE_CXX_STANDARD=17 + +--- simgear/structure/SGAtomic.hxx.orig 2025-06-30 15:01:54 UTC ++++ simgear/structure/SGAtomic.hxx +@@ -25,7 +25,7 @@ + defined(__x86_64__) + // No need to include something. Is a Compiler API ... + # define SGATOMIC_USE_GCC4_BUILTINS +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + # define SGATOMIC_USE_LIBRARY_FUNCTIONS + #elif defined(__sgi) && defined(_COMPILER_VERSION) && (_COMPILER_VERSION>=730) + // No need to include something. Is a Compiler API ... diff --git a/devel/simgear/files/patch-simgear_scene_viewer_Compositor.hxx b/devel/simgear/files/patch-simgear_scene_viewer_Compositor.hxx deleted file mode 100644 index cfbe13ebe8ce..000000000000 --- a/devel/simgear/files/patch-simgear_scene_viewer_Compositor.hxx +++ /dev/null @@ -1,10 +0,0 @@ ---- simgear/scene/viewer/Compositor.hxx.orig 2023-03-14 07:49:42 UTC -+++ simgear/scene/viewer/Compositor.hxx -@@ -17,6 +17,7 @@ - #ifndef SG_COMPOSITOR_HXX - #define SG_COMPOSITOR_HXX - -+#include <array> - #include <unordered_map> - #include <vector> - diff --git a/devel/simgear/pkg-plist b/devel/simgear/pkg-plist index 2f4cc5c58e38..e4361525ad6c 100644 --- a/devel/simgear/pkg-plist +++ b/devel/simgear/pkg-plist @@ -18,6 +18,7 @@ include/simgear/bvh/BVHStaticLeaf.hxx include/simgear/bvh/BVHStaticNode.hxx include/simgear/bvh/BVHStaticTriangle.hxx include/simgear/bvh/BVHSubTreeCollector.hxx +include/simgear/bvh/BVHTerrainTile.hxx include/simgear/bvh/BVHTransform.hxx include/simgear/bvh/BVHVisitor.hxx include/simgear/canvas/Canvas.hxx @@ -41,12 +42,14 @@ include/simgear/canvas/elements/CanvasImage.hxx include/simgear/canvas/elements/CanvasMap.hxx include/simgear/canvas/elements/CanvasPath.hxx include/simgear/canvas/elements/CanvasText.hxx +include/simgear/canvas/events/CanvasKeyBinding.hxx include/simgear/canvas/events/CustomEvent.hxx include/simgear/canvas/events/DeviceEvent.hxx include/simgear/canvas/events/KeyboardEvent.hxx include/simgear/canvas/events/MouseEvent.hxx include/simgear/canvas/layout/AlignFlag_values.hxx include/simgear/canvas/layout/BoxLayout.hxx +include/simgear/canvas/layout/GridLayout.hxx include/simgear/canvas/layout/Layout.hxx include/simgear/canvas/layout/LayoutItem.hxx include/simgear/canvas/layout/NasalWidget.hxx @@ -55,11 +58,12 @@ include/simgear/compiler.h include/simgear/constants.h include/simgear/debug/BufferedLogCallback.hxx include/simgear/debug/ErrorReportingCallback.hxx -include/simgear/debug/OsgIoCapture.hxx -include/simgear/debug/debug_types.h -include/simgear/debug/logstream.hxx include/simgear/debug/LogCallback.hxx include/simgear/debug/LogEntry.hxx +include/simgear/debug/Reporting.hxx +include/simgear/debug/debug_types.h +include/simgear/debug/logdelta.hxx +include/simgear/debug/logstream.hxx include/simgear/embedded_resources/EmbeddedResource.hxx include/simgear/embedded_resources/EmbeddedResourceManager.hxx include/simgear/embedded_resources/EmbeddedResourceProxy.hxx @@ -101,6 +105,7 @@ include/simgear/io/lowlevel.hxx include/simgear/io/raw_socket.hxx include/simgear/io/sg_binobj.hxx include/simgear/io/sg_file.hxx +include/simgear/io/sg_mmap.hxx include/simgear/io/sg_netBuffer.hxx include/simgear/io/sg_netChannel.hxx include/simgear/io/sg_netChat.hxx @@ -138,7 +143,7 @@ include/simgear/math/beziercurve.hxx include/simgear/math/interpolater.hxx include/simgear/math/leastsqs.hxx include/simgear/math/sg_geodesy.hxx -include/simgear/math/sg_random.h +include/simgear/math/sg_random.hxx include/simgear/math/sg_types.hxx include/simgear/math/simd.hxx include/simgear/math/simd4x4.hxx @@ -148,6 +153,8 @@ include/simgear/misc/ResourceManager.hxx include/simgear/misc/SVGpreserveAspectRatio.hxx include/simgear/misc/SimpleMarkdown.hxx include/simgear/misc/argparse.hxx +include/simgear/misc/inputcolor.hxx +include/simgear/misc/inputvalue.hxx include/simgear/misc/interpolator.hxx include/simgear/misc/lru_cache.hxx include/simgear/misc/make_new.hxx @@ -161,10 +168,10 @@ include/simgear/misc/strutils.hxx include/simgear/misc/tabbed_values.hxx include/simgear/misc/test_macros.hxx include/simgear/misc/texcoord.hxx +include/simgear/nasal/NasalEmesaryInterface.hxx include/simgear/nasal/cppbind/Ghost.hxx include/simgear/nasal/cppbind/NasalCallContext.hxx include/simgear/nasal/cppbind/NasalContext.hxx -include/simgear/nasal/cppbind/NasalEmesaryInterface.hxx include/simgear/nasal/cppbind/NasalHash.hxx include/simgear/nasal/cppbind/NasalMe.hxx include/simgear/nasal/cppbind/NasalMethodHolder.hxx @@ -184,6 +191,7 @@ include/simgear/package/Catalog.hxx include/simgear/package/Delegate.hxx include/simgear/package/Install.hxx include/simgear/package/Package.hxx +include/simgear/package/PackageCommon.hxx include/simgear/package/Root.hxx include/simgear/props/AtomicChangeListener.hxx include/simgear/props/ExtendedPropertyAdapter.hxx @@ -199,6 +207,7 @@ include/simgear/props/props_io.hxx include/simgear/props/propsfwd.hxx include/simgear/props/tiedpropertylist.hxx include/simgear/props/vectorPropTemplates.hxx +include/simgear/scene/material/Atlas.hxx include/simgear/scene/material/Effect.hxx include/simgear/scene/material/EffectBuilder.hxx include/simgear/scene/material/EffectCullVisitor.hxx @@ -218,11 +227,13 @@ include/simgear/scene/model/CheckSceneryVisitor.hxx include/simgear/scene/model/ConditionNode.hxx include/simgear/scene/model/ModelRegistry.hxx include/simgear/scene/model/PrimitiveCollector.hxx +include/simgear/scene/model/ReaderWriterGLTF.hxx include/simgear/scene/model/SGClipGroup.hxx include/simgear/scene/model/SGInteractionAnimation.hxx include/simgear/scene/model/SGLight.hxx include/simgear/scene/model/SGMaterialAnimation.hxx include/simgear/scene/model/SGOffsetTransform.hxx +include/simgear/scene/model/SGPBRAnimation.hxx include/simgear/scene/model/SGPickAnimation.hxx include/simgear/scene/model/SGReaderWriterXML.hxx include/simgear/scene/model/SGRotateTransform.hxx @@ -240,13 +251,19 @@ include/simgear/scene/sky/CloudShaderGeometry.hxx include/simgear/scene/sky/cloud.hxx include/simgear/scene/sky/cloudfield.hxx include/simgear/scene/sky/dome.hxx +include/simgear/scene/sky/galaxy.hxx include/simgear/scene/sky/moon.hxx include/simgear/scene/sky/newcloud.hxx include/simgear/scene/sky/oursun.hxx include/simgear/scene/sky/sky.hxx include/simgear/scene/sky/sphere.hxx include/simgear/scene/sky/stars.hxx +include/simgear/scene/tgdb/AreaFeatureBin.hxx +include/simgear/scene/tgdb/CoastlineBin.hxx include/simgear/scene/tgdb/GroundLightManager.hxx +include/simgear/scene/tgdb/LightBin.hxx +include/simgear/scene/tgdb/LineFeatureBin.hxx +include/simgear/scene/tgdb/ObjectInstanceBin.hxx include/simgear/scene/tgdb/ReaderWriterSPT.hxx include/simgear/scene/tgdb/ReaderWriterSTG.hxx include/simgear/scene/tgdb/SGBuildingBin.hxx @@ -264,6 +281,13 @@ include/simgear/scene/tgdb/SGVasiDrawable.hxx include/simgear/scene/tgdb/SGVertexArrayBin.hxx include/simgear/scene/tgdb/ShaderGeometry.hxx include/simgear/scene/tgdb/TreeBin.hxx +include/simgear/scene/tgdb/VPBBufferData.hxx +include/simgear/scene/tgdb/VPBElevationSlice.hxx +include/simgear/scene/tgdb/VPBLineFeatureRenderer.hxx +include/simgear/scene/tgdb/VPBMaterialHandler.hxx +include/simgear/scene/tgdb/VPBRasterRenderer.hxx +include/simgear/scene/tgdb/VPBTechnique.hxx +include/simgear/scene/tgdb/VPBTileBounds.hxx include/simgear/scene/tgdb/apt_signs.hxx include/simgear/scene/tgdb/obj.hxx include/simgear/scene/tgdb/pt_lights.hxx @@ -272,14 +296,18 @@ include/simgear/scene/tsync/terrasync.hxx include/simgear/scene/util/ColorInterpolator.hxx include/simgear/scene/util/CopyOp.hxx include/simgear/scene/util/DeletionManager.hxx +include/simgear/scene/util/MemoryBarrier.hxx include/simgear/scene/util/NodeAndDrawableVisitor.hxx include/simgear/scene/util/Noise.hxx include/simgear/scene/util/OptionsReadFileCallback.hxx include/simgear/scene/util/OrthophotoManager.hxx include/simgear/scene/util/OsgDebug.hxx +include/simgear/scene/util/OsgIoCapture.hxx include/simgear/scene/util/OsgMath.hxx include/simgear/scene/util/OsgSingleton.hxx +include/simgear/scene/util/OsgUtils.hxx include/simgear/scene/util/PrimitiveUtils.hxx +include/simgear/scene/util/ProjectionMatrix.hxx include/simgear/scene/util/QuadTreeBuilder.hxx include/simgear/scene/util/RenderConstants.hxx include/simgear/scene/util/SGDebugDrawCallback.hxx @@ -299,6 +327,8 @@ include/simgear/scene/util/SplicingVisitor.hxx include/simgear/scene/util/StateAttributeFactory.hxx include/simgear/scene/util/UpdateOnceCallback.hxx include/simgear/scene/util/VectorArrayAdapter.hxx +include/simgear/scene/util/color_space.hxx +include/simgear/scene/util/load_shader.hxx include/simgear/scene/util/parse_color.hxx include/simgear/scene/util/project.hxx include/simgear/scene/viewer/ClusteredShading.hxx @@ -310,6 +340,7 @@ include/simgear/screen/colors.hxx include/simgear/screen/extensions.hxx include/simgear/screen/screen-dump.hxx include/simgear/screen/tr.h +include/simgear/screen/video-encoder.hxx include/simgear/serial/serial.hxx include/simgear/sg_inlines.h include/simgear/simgear_config.h @@ -321,8 +352,6 @@ include/simgear/sound/soundmgr.hxx include/simgear/sound/xmlsound.hxx include/simgear/std/integer_sequence.hxx include/simgear/std/type_traits.hxx -include/simgear/structure/OSGUtils.hxx -include/simgear/structure/OSGVersion.hxx include/simgear/structure/SGAtomic.hxx include/simgear/structure/SGBinding.hxx include/simgear/structure/SGExpression.hxx @@ -331,6 +360,7 @@ include/simgear/structure/SGReferenced.hxx include/simgear/structure/SGSharedPtr.hxx include/simgear/structure/SGSmplhist.hxx include/simgear/structure/SGSmplstat.hxx +include/simgear/structure/SGSourceLocation.hxx include/simgear/structure/SGWeakPtr.hxx include/simgear/structure/SGWeakReferenced.hxx include/simgear/structure/Singleton.hxx @@ -349,11 +379,14 @@ include/simgear/threads/SGGuard.hxx include/simgear/threads/SGQueue.hxx include/simgear/threads/SGThread.hxx include/simgear/timing/lowleveltime.h +include/simgear/timing/rawprofile.hxx include/simgear/timing/sg_time.hxx include/simgear/timing/timestamp.hxx include/simgear/timing/timezone.h +include/simgear/timing/zonedetect.h include/simgear/version.h include/simgear/xml/easyxml.hxx +lib/cmake/SimGear/CreateOSGImportedTargets.cmake lib/cmake/SimGear/SimGearConfig.cmake lib/cmake/SimGear/SimGearConfigVersion.cmake lib/cmake/SimGear/SimGearTargets-%%CMAKE_BUILD_TYPE%%.cmake |