From 103e21eacc48c451f1349a7dde788a139c2f22a6 Mon Sep 17 00:00:00 2001 From: pascal Date: Mon, 12 Jul 2021 20:52:43 +0000 Subject: [PATCH] Update to SimGear 2020.3.9. --- graphics/simgear/Makefile | 14 ++-- graphics/simgear/distinfo | 4 +- graphics/simgear/patches/patch-CMakeLists_txt | 26 -------- ...atch-simgear_canvas_ShivaVG_src_shConfig_h | 12 ---- .../patch-simgear_canvas_ShivaVG_src_shDefs_h | 12 ---- .../simgear/patches/patch-simgear_compiler_h | 8 +-- .../patches/patch-simgear_misc_sg_path_cxx | 9 +-- .../patches/patch-simgear_misc_strutils_cxx | 13 ---- .../patch-simgear_nasal_cppbind_Ghost_hxx | 10 +-- .../patches/patch-simgear_props_props_cxx | 37 ----------- .../patch-simgear_scene_material_Effect_cxx | 30 --------- .../patch-simgear_scene_material_Effect_hxx | 25 -------- graphics/simgear/pkg/PLIST | 64 +++++++++++++------ 13 files changed, 69 insertions(+), 195 deletions(-) delete mode 100644 graphics/simgear/patches/patch-CMakeLists_txt delete mode 100644 graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig_h delete mode 100644 graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs_h delete mode 100644 graphics/simgear/patches/patch-simgear_misc_strutils_cxx delete mode 100644 graphics/simgear/patches/patch-simgear_props_props_cxx delete mode 100644 graphics/simgear/patches/patch-simgear_scene_material_Effect_cxx delete mode 100644 graphics/simgear/patches/patch-simgear_scene_material_Effect_hxx diff --git a/graphics/simgear/Makefile b/graphics/simgear/Makefile index 0ca5ba7cf45..36afc03f883 100644 --- a/graphics/simgear/Makefile +++ b/graphics/simgear/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2021/05/22 05:11:50 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.18 2021/07/12 20:52:43 pascal Exp $ COMMENT = library set for simulations, games and visualizations -DISTNAME = simgear-2016.3.1 -REVISION = 3 +DISTNAME = simgear-2020.3.9 -SHARED_LIBS += SimGearCore 4.0 # 2.10 -SHARED_LIBS += SimGearScene 4.0 # 2.10 +SHARED_LIBS += SimGearCore 5.0 # 2.10 +SHARED_LIBS += SimGearScene 5.0 # 2.10 CATEGORIES = graphics @@ -20,8 +19,9 @@ PERMIT_PACKAGE = Yes MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=flightgear/} EXTRACT_SUFX = .tar.bz2 -WANTLIB += GL GLU OpenThreads curl expat m openal osg osgDB osgGA osgParticle -WANTLIB += osgSim osgText osgUtil osgViewer pthread z ${COMPILER_LIBCXX} +WANTLIB += GL GLU OpenThreads curl expat lzma m openal osg osgDB osgGA +WANTLIB += osgParticle osgSim osgText osgUtil osgViewer pthread z +WANTLIB += ${COMPILER_LIBCXX} MODULES = devel/cmake COMPILER = base-clang ports-gcc diff --git a/graphics/simgear/distinfo b/graphics/simgear/distinfo index 3a9ad72016e..439036f23a5 100644 --- a/graphics/simgear/distinfo +++ b/graphics/simgear/distinfo @@ -1,2 +1,2 @@ -SHA256 (simgear-2016.3.1.tar.bz2) = rkbhJzZzvkECjukS0YJuhxhatZQFPEk3B/nb3upRWd0= -SIZE (simgear-2016.3.1.tar.bz2) = 1199016 +SHA256 (simgear-2020.3.9.tar.bz2) = XaRojgSTiXk77XsmVTmfG8AQnHuwY4neZoRxljlCTmw= +SIZE (simgear-2020.3.9.tar.bz2) = 1409436 diff --git a/graphics/simgear/patches/patch-CMakeLists_txt b/graphics/simgear/patches/patch-CMakeLists_txt deleted file mode 100644 index 56d6c66e172..00000000000 --- a/graphics/simgear/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.5 2019/06/19 15:29:47 naddy Exp $ - -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -29,17 +29,17 @@ if(CMAKE_VERSION VERSION_LESS "3.1") - set (CMAKE_CXX_FLAGS "-std=gnu++98 ${CMAKE_CXX_FLAGS}") - endif() - else() -- set (CMAKE_CXX_STANDARD 98) -+ set (CMAKE_CXX_STANDARD 11) - endif() - - project(SimGear) - - # read 'version' file into a variable (stripping any newlines or spaces) --file(READ version versionFile) -+file(READ version.txt versionFile) - string(STRIP ${versionFile} SIMGEAR_VERSION) - - # add a dependency on the versino file --set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS version) -+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS version.txt) - - set(FIND_LIBRARY_USE_LIB64_PATHS ON) - diff --git a/graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig_h b/graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig_h deleted file mode 100644 index 278b7017c32..00000000000 --- a/graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shConfig_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-simgear_canvas_ShivaVG_src_shConfig_h,v 1.1.1.1 2013/11/24 21:59:15 pascal Exp $ ---- simgear/canvas/ShivaVG/src/shConfig.h.orig Fri Jul 5 11:23:31 2013 -+++ simgear/canvas/ShivaVG/src/shConfig.h Fri Jul 5 11:23:57 2013 -@@ -26,7 +26,7 @@ - // MacOS - #define VG_API_MACOSX - --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) - - // FreeBSD - #define VG_API_FREEBSD diff --git a/graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs_h b/graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs_h deleted file mode 100644 index 1e83b3208bd..00000000000 --- a/graphics/simgear/patches/patch-simgear_canvas_ShivaVG_src_shDefs_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-simgear_canvas_ShivaVG_src_shDefs_h,v 1.3 2015/03/17 17:20:17 pascal Exp $ ---- simgear/canvas/ShivaVG/src/shDefs.h.orig Wed Feb 18 21:10:39 2015 -+++ simgear/canvas/ShivaVG/src/shDefs.h Tue Mar 17 18:18:32 2015 -@@ -34,7 +34,7 @@ - #include - #include - --#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__) -+#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__) - # include - #endif - diff --git a/graphics/simgear/patches/patch-simgear_compiler_h b/graphics/simgear/patches/patch-simgear_compiler_h index 18e13d068d2..fdf4e248915 100644 --- a/graphics/simgear/patches/patch-simgear_compiler_h +++ b/graphics/simgear/patches/patch-simgear_compiler_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-simgear_compiler_h,v 1.2 2016/09/19 22:38:50 pascal Exp $ ---- simgear/compiler.h.orig Thu Sep 8 08:52:42 2016 -+++ simgear/compiler.h Mon Sep 19 16:14:31 2016 -@@ -184,7 +184,8 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= +$OpenBSD: patch-simgear_compiler_h,v 1.3 2021/07/12 20:52:43 pascal Exp $ +--- simgear/compiler.h.orig Tue Nov 22 10:06:52 2016 ++++ simgear/compiler.h Fri Dec 2 12:07:44 2016 +@@ -105,7 +105,8 @@ # define SG_WINDOWS #endif diff --git a/graphics/simgear/patches/patch-simgear_misc_sg_path_cxx b/graphics/simgear/patches/patch-simgear_misc_sg_path_cxx index 5aa9de8ddeb..654511b9313 100644 --- a/graphics/simgear/patches/patch-simgear_misc_sg_path_cxx +++ b/graphics/simgear/patches/patch-simgear_misc_sg_path_cxx @@ -1,7 +1,8 @@ -$OpenBSD: patch-simgear_misc_sg_path_cxx,v 1.2 2016/09/19 22:38:50 pascal Exp $ ---- simgear/misc/sg_path.cxx.orig Thu Sep 8 08:52:42 2016 -+++ simgear/misc/sg_path.cxx Mon Sep 19 16:14:31 2016 -@@ -32,6 +32,7 @@ +$OpenBSD: patch-simgear_misc_sg_path_cxx,v 1.3 2021/07/12 20:52:43 pascal Exp $ +Index: simgear/misc/sg_path.cxx +--- simgear/misc/sg_path.cxx.orig ++++ simgear/misc/sg_path.cxx +@@ -33,6 +33,7 @@ #include #include #include diff --git a/graphics/simgear/patches/patch-simgear_misc_strutils_cxx b/graphics/simgear/patches/patch-simgear_misc_strutils_cxx deleted file mode 100644 index 040790848f5..00000000000 --- a/graphics/simgear/patches/patch-simgear_misc_strutils_cxx +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-simgear_misc_strutils_cxx,v 1.2 2016/09/19 22:38:50 pascal Exp $ ---- simgear/misc/strutils.cxx.orig Thu Sep 8 08:52:42 2016 -+++ simgear/misc/strutils.cxx Mon Sep 19 16:15:00 2016 -@@ -639,7 +639,8 @@ std::string error_string(int errnum) - retcode = strerror_s(buf, sizeof(buf), errnum); - #elif defined(_GNU_SOURCE) - return std::string(strerror_r(errnum, buf, sizeof(buf))); --#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) -+#elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) \ -+ || defined(__OpenBSD__) - int retcode; - // POSIX.1-2001 and POSIX.1-2008 - retcode = strerror_r(errnum, buf, sizeof(buf)); diff --git a/graphics/simgear/patches/patch-simgear_nasal_cppbind_Ghost_hxx b/graphics/simgear/patches/patch-simgear_nasal_cppbind_Ghost_hxx index 32c8bacc43f..a1c91f39549 100644 --- a/graphics/simgear/patches/patch-simgear_nasal_cppbind_Ghost_hxx +++ b/graphics/simgear/patches/patch-simgear_nasal_cppbind_Ghost_hxx @@ -1,14 +1,14 @@ -$OpenBSD: patch-simgear_nasal_cppbind_Ghost_hxx,v 1.1 2017/08/21 17:55:37 rsadowski Exp $ +$OpenBSD: patch-simgear_nasal_cppbind_Ghost_hxx,v 1.2 2021/07/12 20:52:43 pascal Exp $ Index: simgear/nasal/cppbind/Ghost.hxx --- simgear/nasal/cppbind/Ghost.hxx.orig +++ simgear/nasal/cppbind/Ghost.hxx -@@ -36,6 +36,8 @@ - #include - #include +@@ -32,6 +32,8 @@ + #include + #include +#include + #include + #include - template diff --git a/graphics/simgear/patches/patch-simgear_props_props_cxx b/graphics/simgear/patches/patch-simgear_props_props_cxx deleted file mode 100644 index edd88780868..00000000000 --- a/graphics/simgear/patches/patch-simgear_props_props_cxx +++ /dev/null @@ -1,37 +0,0 @@ -$OpenBSD: patch-simgear_props_props_cxx,v 1.1 2021/05/22 05:11:50 rsadowski Exp $ - -Support Boost v1.75. - -Index: simgear/props/props.cxx ---- simgear/props/props.cxx.orig -+++ simgear/props/props.cxx -@@ -531,23 +531,15 @@ find_node (SGPropertyNode * current, - } - } - #else --template --SGPropertyNode* --find_node (SGPropertyNode * current, -- const Range& path, -- bool create, -- int last_index = -1) --{ -+template -+SGPropertyNode *find_node(SGPropertyNode *current, const Range &path, -+ bool create, int last_index = -1) { - using namespace boost; -- typedef split_iterator::type> -- PathSplitIterator; -- -- PathSplitIterator itr -- = make_split_iterator(path, first_finder("/", is_equal())); -+ auto itr = make_split_iterator(path, first_finder("/", is_equal())); - if (*path.begin() == '/') - return find_node_aux(current->getRootNode(), itr, create, last_index); -- else -- return find_node_aux(current, itr, create, last_index); -+ else -+ return find_node_aux(current, itr, create, last_index); - } - #endif - diff --git a/graphics/simgear/patches/patch-simgear_scene_material_Effect_cxx b/graphics/simgear/patches/patch-simgear_scene_material_Effect_cxx deleted file mode 100644 index c19e473f94a..00000000000 --- a/graphics/simgear/patches/patch-simgear_scene_material_Effect_cxx +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-simgear_scene_material_Effect_cxx,v 1.1 2017/12/26 19:19:15 rsadowski Exp $ - -Index: simgear/scene/material/Effect.cxx ---- simgear/scene/material/Effect.cxx.orig -+++ simgear/scene/material/Effect.cxx -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - #include - #include -@@ -832,13 +832,13 @@ size_t hash_value(const ProgramKey& key) - - // XXX Should these be protected by a mutex? Probably - --typedef tr1::unordered_map, -+typedef std::unordered_map, - boost::hash, ProgramKey::EqualTo> - ProgramMap; - ProgramMap programMap; - ProgramMap resolvedProgramMap; // map with resolved shader file names - --typedef tr1::unordered_map, boost::hash > -+typedef std::unordered_map, boost::hash > - ShaderMap; - ShaderMap shaderMap; - diff --git a/graphics/simgear/patches/patch-simgear_scene_material_Effect_hxx b/graphics/simgear/patches/patch-simgear_scene_material_Effect_hxx deleted file mode 100644 index 238ae3a2ae2..00000000000 --- a/graphics/simgear/patches/patch-simgear_scene_material_Effect_hxx +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-simgear_scene_material_Effect_hxx,v 1.1 2017/12/26 19:19:15 rsadowski Exp $ - -Index: simgear/scene/material/Effect.hxx ---- simgear/scene/material/Effect.hxx.orig -+++ simgear/scene/material/Effect.hxx -@@ -19,7 +19,7 @@ - - #include - #include --#include -+#include - - #include - -@@ -127,8 +127,8 @@ class Effect : public osg::Object (protected) - bool operator()(const Key& lhs, const Key& rhs) const; - }; - }; -- typedef std::tr1::unordered_map, -- boost::hash, Key::EqualTo> Cache; -+ typedef std::unordered_map, -+ boost::hash, Key::EqualTo> Cache; - Cache* getCache() - { - if (!_cache) diff --git a/graphics/simgear/pkg/PLIST b/graphics/simgear/pkg/PLIST index c3d5005ea1b..43da62868eb 100644 --- a/graphics/simgear/pkg/PLIST +++ b/graphics/simgear/pkg/PLIST @@ -1,12 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.6 2018/01/20 09:13:35 landry Exp $ +@comment $OpenBSD: PLIST,v 1.7 2021/07/12 20:52:43 pascal Exp $ include/simgear/ -include/simgear/3rdparty/ -include/simgear/3rdparty/utf8/ -include/simgear/3rdparty/utf8/utf8/ -include/simgear/3rdparty/utf8/utf8.h -include/simgear/3rdparty/utf8/utf8/checked.h -include/simgear/3rdparty/utf8/utf8/core.h -include/simgear/3rdparty/utf8/utf8/unchecked.h include/simgear/bucket/ include/simgear/bucket/newbucket.hxx include/simgear/bvh/ @@ -55,8 +48,6 @@ 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/elements/detail/ -include/simgear/canvas/elements/detail/add_segment_variadic.hxx include/simgear/canvas/events/ include/simgear/canvas/events/CustomEvent.hxx include/simgear/canvas/events/DeviceEvent.hxx @@ -73,8 +64,24 @@ include/simgear/compiler.h include/simgear/constants.h include/simgear/debug/ include/simgear/debug/BufferedLogCallback.hxx +include/simgear/debug/ErrorReportingCallback.hxx +include/simgear/debug/LogCallback.hxx +include/simgear/debug/LogEntry.hxx +include/simgear/debug/OsgIoCapture.hxx include/simgear/debug/debug_types.h include/simgear/debug/logstream.hxx +include/simgear/embedded_resources/ +include/simgear/embedded_resources/EmbeddedResource.hxx +include/simgear/embedded_resources/EmbeddedResourceManager.hxx +include/simgear/embedded_resources/EmbeddedResourceProxy.hxx +include/simgear/emesary/ +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/ include/simgear/environment/metar.hxx include/simgear/environment/precipitation.hxx @@ -100,6 +107,12 @@ include/simgear/io/HTTPMemoryRequest.hxx include/simgear/io/HTTPRepository.hxx include/simgear/io/HTTPRequest.hxx include/simgear/io/iochannel.hxx +include/simgear/io/iostreams/ +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 @@ -145,39 +158,43 @@ include/simgear/math/leastsqs.hxx include/simgear/math/sg_geodesy.hxx include/simgear/math/sg_random.h include/simgear/math/sg_types.hxx +include/simgear/math/simd.hxx +include/simgear/math/simd4x4.hxx include/simgear/misc/ 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/gzcontainerfile.hxx +include/simgear/misc/argparse.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/sgstream.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/misc/zfstream.hxx include/simgear/nasal/ include/simgear/nasal/cppbind/ 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/ -include/simgear/nasal/cppbind/detail/NasalObject_callMethod_templates.hxx -include/simgear/nasal/cppbind/detail/from_nasal_function_templates.hxx include/simgear/nasal/cppbind/detail/from_nasal_helper.hxx -include/simgear/nasal/cppbind/detail/functor_templates.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 @@ -230,6 +247,7 @@ include/simgear/scene/model/ModelRegistry.hxx include/simgear/scene/model/PrimitiveCollector.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/SGPickAnimation.hxx @@ -296,6 +314,7 @@ 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/SGReaderWriterOptions.hxx @@ -303,6 +322,7 @@ 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 @@ -310,6 +330,12 @@ include/simgear/scene/util/UpdateOnceCallback.hxx include/simgear/scene/util/VectorArrayAdapter.hxx include/simgear/scene/util/parse_color.hxx include/simgear/scene/util/project.hxx +include/simgear/scene/viewer/ +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/ include/simgear/screen/colors.hxx include/simgear/screen/extensions.hxx @@ -320,11 +346,15 @@ include/simgear/serial/serial.hxx include/simgear/sg_inlines.h include/simgear/simgear_config.h include/simgear/sound/ +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/ +include/simgear/std/integer_sequence.hxx +include/simgear/std/type_traits.hxx include/simgear/structure/ include/simgear/structure/OSGUtils.hxx include/simgear/structure/OSGVersion.hxx @@ -343,8 +373,6 @@ include/simgear/structure/StateMachine.hxx include/simgear/structure/StringTable.hxx include/simgear/structure/callback.hxx include/simgear/structure/commands.hxx -include/simgear/structure/detail/ -include/simgear/structure/detail/function_list_template.hxx include/simgear/structure/event_mgr.hxx include/simgear/structure/exception.hxx include/simgear/structure/function_list.hxx