diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 1dda4632d69e..cc4a39917075 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -1,53 +1,50 @@ 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 WWW= https://www.flightgear.org/ LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libosg.so:graphics/osg \ 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 USE_LDCONFIG= yes LDFLAGS_gcc= -losgDB LDFLAGS+= ${LDFLAGS_${CHOSEN_COMPILER_TYPE}} CMAKE_ARGS+= -DSYSTEM_EXPAT:BOOL=ON \ -DENABLE_TESTS:BOOL=OFF PLIST_SUB= PORTVERSION=${PORTVERSION} .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DENABLE_SIMD:BOOL=OFF .endif post-patch: # Avoid conflict with C++20 - used version file is simgear-version @${RM} ${WRKSRC}/version .include 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 - #include -+#include - #include - #include - #include 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 - #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 + #elif defined(GCC_ATOMIC_BUILTINS_FOUND) +-#elif defined(__GNUC__) && defined(__i386__) ++#elif (__cplusplus < 201703L) && defined(__GNUC__) && defined(__i386__) + #elif defined(SGATOMIC_USE_MUTEX) + # include + #else +@@ -43,7 +43,7 @@ SGAtomic::operator++() + return InterlockedIncrement(reinterpret_cast(&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(&mValue); + register unsigned result; + __asm__ __volatile__("lock; xadd{l} {%0,%1|%1,%0}" +@@ -64,7 +64,7 @@ SGAtomic::operator--() + return InterlockedDecrement(reinterpret_cast(&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(&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(&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 - #include - #include - 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 @@ -1,364 +1,397 @@ include/simgear/bucket/newbucket.hxx include/simgear/bvh/BVHBoundingBoxVisitor.hxx include/simgear/bvh/BVHGroup.hxx include/simgear/bvh/BVHLineGeometry.hxx include/simgear/bvh/BVHLineSegmentVisitor.hxx include/simgear/bvh/BVHMaterial.hxx include/simgear/bvh/BVHMotionTransform.hxx include/simgear/bvh/BVHNearestPointVisitor.hxx include/simgear/bvh/BVHNode.hxx include/simgear/bvh/BVHPageNode.hxx include/simgear/bvh/BVHPageRequest.hxx include/simgear/bvh/BVHPager.hxx include/simgear/bvh/BVHStaticBinary.hxx include/simgear/bvh/BVHStaticData.hxx include/simgear/bvh/BVHStaticGeometry.hxx include/simgear/bvh/BVHStaticGeometryBuilder.hxx 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 include/simgear/canvas/CanvasEvent.hxx include/simgear/canvas/CanvasEventManager.hxx include/simgear/canvas/CanvasEventTypes.hxx include/simgear/canvas/CanvasEventVisitor.hxx include/simgear/canvas/CanvasMgr.hxx include/simgear/canvas/CanvasObjectPlacement.hxx include/simgear/canvas/CanvasPlacement.hxx include/simgear/canvas/CanvasSystemAdapter.hxx include/simgear/canvas/CanvasWindow.hxx include/simgear/canvas/ODGauge.hxx include/simgear/canvas/ShivaVG/openvg.h include/simgear/canvas/ShivaVG/vgu.h include/simgear/canvas/VGInitOperation.hxx include/simgear/canvas/canvas_fwd.hxx include/simgear/canvas/elements/CanvasElement.hxx include/simgear/canvas/elements/CanvasGroup.hxx 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 include/simgear/canvas/layout/SpacerItem.hxx 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 include/simgear/emesary/Emesary.hxx include/simgear/emesary/INotification.hxx include/simgear/emesary/IReceiver.hxx include/simgear/emesary/ITransmitter.hxx include/simgear/emesary/ReceiptStatus.hxx include/simgear/emesary/Transmitter.hxx include/simgear/emesary/notifications.hxx include/simgear/environment/metar.hxx include/simgear/environment/precipitation.hxx include/simgear/ephemeris/celestialBody.hxx include/simgear/ephemeris/ephemeris.hxx include/simgear/ephemeris/jupiter.hxx include/simgear/ephemeris/mars.hxx include/simgear/ephemeris/mercury.hxx include/simgear/ephemeris/moonpos.hxx include/simgear/ephemeris/neptune.hxx include/simgear/ephemeris/pluto.hxx include/simgear/ephemeris/saturn.hxx include/simgear/ephemeris/star.hxx include/simgear/ephemeris/stardata.hxx include/simgear/ephemeris/uranus.hxx include/simgear/ephemeris/venus.hxx include/simgear/io/DNSClient.hxx include/simgear/io/HTTPClient.hxx include/simgear/io/HTTPFileRequest.hxx include/simgear/io/HTTPMemoryRequest.hxx include/simgear/io/HTTPRepository.hxx include/simgear/io/HTTPRequest.hxx include/simgear/io/iochannel.hxx include/simgear/io/iostreams/CharArrayStream.hxx include/simgear/io/iostreams/gzcontainerfile.hxx include/simgear/io/iostreams/gzfstream.hxx include/simgear/io/iostreams/sgstream.hxx include/simgear/io/iostreams/zlibstream.hxx 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 include/simgear/io/sg_serial.hxx include/simgear/io/sg_socket.hxx include/simgear/io/sg_socket_udp.hxx include/simgear/io/untar.hxx include/simgear/magvar/coremag.hxx include/simgear/magvar/magvar.hxx include/simgear/math/SGBox.hxx include/simgear/math/SGCMath.hxx include/simgear/math/SGGeoc.hxx include/simgear/math/SGGeod.hxx include/simgear/math/SGGeodesy.hxx include/simgear/math/SGGeometry.hxx include/simgear/math/SGGeometryFwd.hxx include/simgear/math/SGIntersect.hxx include/simgear/math/SGLimits.hxx include/simgear/math/SGLineSegment.hxx include/simgear/math/SGLocation.hxx include/simgear/math/SGMath.hxx include/simgear/math/SGMathFwd.hxx include/simgear/math/SGMatrix.hxx include/simgear/math/SGMisc.hxx include/simgear/math/SGPlane.hxx include/simgear/math/SGQuat.hxx include/simgear/math/SGRay.hxx include/simgear/math/SGRect.hxx include/simgear/math/SGSphere.hxx include/simgear/math/SGTriangle.hxx include/simgear/math/SGVec2.hxx include/simgear/math/SGVec3.hxx include/simgear/math/SGVec4.hxx 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 include/simgear/misc/CSSBorder.hxx include/simgear/misc/ListDiff.hxx 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 include/simgear/misc/sg_dir.hxx include/simgear/misc/sg_hash.hxx include/simgear/misc/sg_path.hxx include/simgear/misc/simgear_optional.hxx include/simgear/misc/stdint.hxx include/simgear/misc/stopwatch.hxx 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 include/simgear/nasal/cppbind/NasalObject.hxx include/simgear/nasal/cppbind/NasalObjectHolder.hxx include/simgear/nasal/cppbind/NasalString.hxx include/simgear/nasal/cppbind/cppbind_fwd.hxx include/simgear/nasal/cppbind/detail/from_nasal_helper.hxx include/simgear/nasal/cppbind/detail/nasal_traits.hxx include/simgear/nasal/cppbind/detail/to_nasal_helper.hxx include/simgear/nasal/cppbind/from_nasal.hxx include/simgear/nasal/cppbind/to_nasal.hxx include/simgear/nasal/iolib.h include/simgear/nasal/naref.h include/simgear/nasal/nasal.h 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 include/simgear/props/PropertyBasedElement.hxx include/simgear/props/PropertyBasedMgr.hxx include/simgear/props/PropertyInterpolationMgr.hxx include/simgear/props/PropertyInterpolator.hxx include/simgear/props/condition.hxx include/simgear/props/easing_functions.hxx include/simgear/props/propertyObject.hxx include/simgear/props/props.hxx 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 include/simgear/scene/material/EffectGeode.hxx include/simgear/scene/material/Pass.hxx include/simgear/scene/material/Technique.hxx include/simgear/scene/material/TextureBuilder.hxx include/simgear/scene/material/mat.hxx include/simgear/scene/material/matlib.hxx include/simgear/scene/material/matmodel.hxx include/simgear/scene/material/mipmap.hxx include/simgear/scene/material/parseBlendFunc.hxx include/simgear/scene/model/BVHDebugCollectVisitor.hxx include/simgear/scene/model/BVHPageNodeOSG.hxx include/simgear/scene/model/BoundingVolumeBuildVisitor.hxx 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 include/simgear/scene/model/SGScaleTransform.hxx include/simgear/scene/model/SGText.hxx include/simgear/scene/model/SGTrackToAnimation.hxx include/simgear/scene/model/SGTranslateTransform.hxx include/simgear/scene/model/animation.hxx include/simgear/scene/model/model.hxx include/simgear/scene/model/modellib.hxx include/simgear/scene/model/particles.hxx include/simgear/scene/model/persparam.hxx include/simgear/scene/model/placement.hxx 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 include/simgear/scene/tgdb/SGDirectionalLightBin.hxx include/simgear/scene/tgdb/SGLightBin.hxx include/simgear/scene/tgdb/SGModelBin.hxx include/simgear/scene/tgdb/SGNodeTriangles.hxx include/simgear/scene/tgdb/SGOceanTile.hxx include/simgear/scene/tgdb/SGReaderWriterBTG.hxx include/simgear/scene/tgdb/SGTexturedTriangleBin.hxx include/simgear/scene/tgdb/SGTileDetailsCallback.hxx include/simgear/scene/tgdb/SGTileGeometryBin.hxx include/simgear/scene/tgdb/SGTriangleBin.hxx 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 include/simgear/scene/tgdb/userdata.hxx 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 include/simgear/scene/util/SGEnlargeBoundingBox.hxx include/simgear/scene/util/SGImageUtils.hxx include/simgear/scene/util/SGNodeMasks.hxx include/simgear/scene/util/SGPickCallback.hxx include/simgear/scene/util/SGProgram.hxx include/simgear/scene/util/SGReaderWriterOptions.hxx include/simgear/scene/util/SGSceneFeatures.hxx include/simgear/scene/util/SGSceneUserData.hxx include/simgear/scene/util/SGStateAttributeVisitor.hxx include/simgear/scene/util/SGTextureStateAttributeVisitor.hxx include/simgear/scene/util/SGTransientModelData.hxx include/simgear/scene/util/SGUpdateVisitor.hxx 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 include/simgear/scene/viewer/Compositor.hxx include/simgear/scene/viewer/CompositorBuffer.hxx include/simgear/scene/viewer/CompositorPass.hxx include/simgear/scene/viewer/CompositorUtil.hxx 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 include/simgear/sound/filters.hxx include/simgear/sound/readwav.hxx include/simgear/sound/sample.hxx include/simgear/sound/sample_group.hxx 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 include/simgear/structure/SGPerfMon.hxx 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 include/simgear/structure/StateMachine.hxx include/simgear/structure/StringTable.hxx include/simgear/structure/callback.hxx include/simgear/structure/commands.hxx include/simgear/structure/event_mgr.hxx include/simgear/structure/exception.hxx include/simgear/structure/function_list.hxx include/simgear/structure/intern.hxx include/simgear/structure/map.hxx include/simgear/structure/singleton.hpp include/simgear/structure/subsystem_mgr.hxx 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 lib/cmake/SimGear/SimGearTargets.cmake lib/libSimGearCore.so lib/libSimGearCore.so.%%PORTVERSION%% lib/libSimGearScene.so lib/libSimGearScene.so.%%PORTVERSION%% diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile index 311701746ad5..58b518c95fd8 100644 --- a/games/flightgear-data/Makefile +++ b/games/flightgear-data/Makefile @@ -1,42 +1,42 @@ PORTNAME= flightgear-data -PORTVERSION= 2020.3.19 +PORTVERSION= 2024.1.1 CATEGORIES= games -MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} +MASTER_SITES= https://download.flightgear.org/release-${PORTVERSION:R}/ DISTNAME= FlightGear-${PORTVERSION}-data MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear scenery, textures, and aircraft models WWW= https://www.flightgear.org/ LICENSE= GPLv2 BROKEN_mips64= fails to install: runaway process USES= tar:txz NO_BUILD= yes NO_ARCH= yes -WRKSRC= ${WRKDIR}/fgdata +WRKSRC= ${WRKDIR}/fgdata_${PORTVERSION:R:S/./_/} DATADIR= ${PREFIX}/share/flightgear PLIST= ${WRKDIR}/pkg-plist PLIST_DIRS= %%DATADIR%% post-patch: @${RM} ${WRKSRC}/COPYING pre-install: @${RM} ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type d -empty | ${SORT} \ | ${SED} -e 's|^|@preexec ${MKDIR} %D/share/flightgear/|' >> ${PLIST} && \ - ${FIND} * -type f | ${SORT} \ - | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ + ${FIND} . -type f ! -name .gitignore | ${SORT} \ + | ${SED} -e 's|^\./||' -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} -r \ | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! ( -name .git -o -name .gitignore )") .include diff --git a/games/flightgear-data/distinfo b/games/flightgear-data/distinfo index 5661f6a43ffd..e391413765b3 100644 --- a/games/flightgear-data/distinfo +++ b/games/flightgear-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697745291 -SHA256 (FlightGear-2020.3.19-data.txz) = f3adc49cd054fab6137711f0315e876c1bbdf653ba1f798a1aecae9a6e984795 -SIZE (FlightGear-2020.3.19-data.txz) = 1789370768 +TIMESTAMP = 1751317078 +SHA256 (FlightGear-2024.1.1-data.txz) = 44c48bd03440f6ece07b26d095d9185cec22fc159e5cc1cf451adbc5ebd7953e +SIZE (FlightGear-2024.1.1-data.txz) = 1873735848 diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index cdf052278f47..0347a14ef942 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -1,71 +1,69 @@ PORTNAME= flightgear -PORTVERSION= 2020.3.19 -PORTREVISION= 7 +PORTVERSION= 2024.1.1 CATEGORIES= games -MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} - -# Fix for CVE-2025-0781 -# See: https://gitlab.com/frougon/flightgear-flightgear/-/commits/2020.3.6-minimal-fix-for-CVE-2025-0781 -PATCH_SITES= https://gitlab.com/frougon/flightgear-${PORTNAME}/-/commit/ -PATCHFILES+= cf99dc921aadab502ff90a1dd943d8bbb897de91.patch:-p1 MAINTAINER= martymac@FreeBSD.org COMMENT= FlightGear flight simulator WWW= https://www.flightgear.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libboost_thread.so:devel/boost-libs \ libfltk.so:x11-toolkits/fltk \ libfreetype.so:print/freetype2 \ libosg.so:graphics/osg \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ libcurl.so:ftp/curl \ libudev.so:devel/libudev-devd \ libexpat.so:textproc/expat2 \ libSimGearCore.so:devel/simgear BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data # Disable ninja, see https://sourceforge.net/p/flightgear/codetickets/2118/ -USES= alias cmake:noninja compiler:c++11-lang cpe dos2unix gl jpeg \ +USES= alias cmake:noninja compiler:c++17-lang cpe dos2unix gl jpeg \ openal:al,alut sqlite tar:bzip2 xorg + +USE_GITLAB= yes +GL_ACCOUNT= flightgear +GL_TAGNAME= v${PORTVERSION} + USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DSYSTEM_SQLITE:BOOL=ON \ -DENABLE_HID_INPUT:BOOL=OFF \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DBUS QT5 OPTIONS_DEFAULT= DBUS QT5 DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_USES= pkgconfig DBUS_CMAKE_ON= -DUSE_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF QT5_CMAKE_ON= -DENABLE_QT:BOOL=ON QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF QT5_USES= qt:5 QT5_USE= QT=core,buildtools,linguisttools,gui,declarative,network,qmake,widgets,svg post-patch: # Avoid conflict with C++20 - used version file is flightgear-version @${RM} ${WRKSRC}/version .include .if ${COMPILER_TYPE} == "clang" LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations .endif .include diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo index c0feffc003ac..e63b85adfa79 100644 --- a/games/flightgear/distinfo +++ b/games/flightgear/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1738150411 -SHA256 (flightgear-2020.3.19.tar.bz2) = 167d08de9cc0f72218b379b23cd7e56c7f6ee18d7d559512da51a3bd67f38e6e -SIZE (flightgear-2020.3.19.tar.bz2) = 8935152 -SHA256 (cf99dc921aadab502ff90a1dd943d8bbb897de91.patch) = c3cf18bec3510b870bcdb8cb3a833c58f63d33aa9d071d11ac893f90d6e2fe60 -SIZE (cf99dc921aadab502ff90a1dd943d8bbb897de91.patch) = 2178 +TIMESTAMP = 1751317021 +SHA256 (flightgear-v2024.1.1.tar.bz2) = a3b1fea7064caa18964828e79cc1ec663f6aabf0fb5eb4f7f7fb82635fc8a937 +SIZE (flightgear-v2024.1.1.tar.bz2) = 9463832 diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp new file mode 100644 index 000000000000..7eecac47aedb --- /dev/null +++ b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp @@ -0,0 +1,11 @@ +--- src/FDM/JSBSim/input_output/FGfdmSocket.cpp.orig 2025-06-26 10:55:02 UTC ++++ src/FDM/JSBSim/input_output/FGfdmSocket.cpp +@@ -40,7 +40,7 @@ INCLUDES + + #if defined(_MSC_VER) || defined(__MINGW32__) + #include +-#elif defined(__OpenBSD__) ++#elif defined(__OpenBSD__) || defined(__FreeBSD__) + #include + #include + #include diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h new file mode 100644 index 000000000000..5374e4735279 --- /dev/null +++ b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h @@ -0,0 +1,11 @@ +--- src/FDM/JSBSim/input_output/FGfdmSocket.h.orig 2025-06-26 10:59:25 UTC ++++ src/FDM/JSBSim/input_output/FGfdmSocket.h +@@ -44,6 +44,8 @@ INCLUDES + #if defined(_MSC_VER) || defined(__MINGW32__) + #include + #include ++#elif defined(__FreeBSD__) ++ #include + #else + #include + #endif diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist index 94cc162d5aab..9876f7bea073 100644 --- a/games/flightgear/pkg-plist +++ b/games/flightgear/pkg-plist @@ -1,41 +1,39 @@ bin/GPSsmooth bin/JSBSim bin/MIDGsmooth bin/UGsmooth bin/fgcom bin/fgelev bin/fgfs bin/fgjs -bin/fgpanel bin/fgtraffic bin/fgviewer bin/js_demo bin/metar +bin/nasal bin/yasim bin/yasim-proptest share/man/it/man1/GPSsmooth.1.gz share/man/it/man1/JSBSim.1.gz share/man/it/man1/MIDGsmooth.1.gz share/man/it/man1/UGsmooth.1.gz share/man/it/man1/fgcom.1.gz share/man/it/man1/fgelev.1.gz share/man/it/man1/fgfs.1.gz share/man/it/man1/fgjs.1.gz -share/man/it/man1/fgpanel.1.gz share/man/it/man1/fgviewer.1.gz share/man/it/man1/js_demo.1.gz share/man/it/man1/metar.1.gz share/man/it/man5/fgfsrc.5.gz share/man/man1/GPSsmooth.1.gz share/man/man1/JSBSim.1.gz share/man/man1/MIDGsmooth.1.gz share/man/man1/UGsmooth.1.gz share/man/man1/fgcom.1.gz share/man/man1/fgelev.1.gz share/man/man1/fgfs.1.gz share/man/man1/fgjs.1.gz -share/man/man1/fgpanel.1.gz share/man/man1/fgviewer.1.gz share/man/man1/js_demo.1.gz share/man/man1/metar.1.gz share/man/man5/fgfsrc.5.gz