FreeBSD Bugzilla – Attachment 195989 Details for
Bug 230442
graphics/osg: updating to 3.6.x
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
osg.patch
osg.patch (text/plain), 55.22 KB, created by
Val Packett
on 2018-08-07 19:46:02 UTC
(
hide
)
Description:
osg.patch
Filename:
MIME Type:
Creator:
Val Packett
Created:
2018-08-07 19:46:02 UTC
Size:
55.22 KB
patch
obsolete
>commit e3f6e3b8ce2022ede27dbbe6ca9a3bbf4bcea8da >Author: Greg V <greg@unrelenting.technology> >Date: Tue Aug 7 16:20:34 2018 +0300 > > graphics/osg: update to 3.6.2, keep 3.4 as osg34 > >diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile >index a4b4b957bf61..2e4607fde01a 100644 >--- a/devel/simgear/Makefile >+++ b/devel/simgear/Makefile >@@ -14,7 +14,7 @@ LICENSE= GPLv2 > 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 >+ libosg.so:graphics/osg34 > > USES= alias cmake compiler:c++11-lib cpe jpeg openal:al,alut tar:bzip2 > USE_XORG= ice sm x11 xext xi xmu xt >diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile >index 9c120da549a5..9ce2b7874063 100644 >--- a/games/flightgear/Makefile >+++ b/games/flightgear/Makefile >@@ -16,7 +16,7 @@ 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 \ >+ libosg.so:graphics/osg34 \ > libspeex.so:audio/speex \ > libspeexdsp.so:audio/speexdsp \ > libcurl.so:ftp/curl \ >diff --git a/graphics/osg-devel/distinfo b/graphics/osg-devel/distinfo >deleted file mode 100644 >index 781441f5edd4..000000000000 >--- a/graphics/osg-devel/distinfo >+++ /dev/null >@@ -1,3 +0,0 @@ >-TIMESTAMP = 1482850076 >-SHA256 (OpenSceneGraph-3.5.1.zip) = c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0 >-SIZE (OpenSceneGraph-3.5.1.zip) = 8353019 >diff --git a/graphics/osg-devel/files/patch-CMakeLists.txt b/graphics/osg-devel/files/patch-CMakeLists.txt >deleted file mode 100644 >index 36c0ee62ec06..000000000000 >--- a/graphics/osg-devel/files/patch-CMakeLists.txt >+++ /dev/null >@@ -1,20 +0,0 @@ >---- CMakeLists.txt.orig 2014-12-18 20:47:08.000000000 +0300 >-+++ CMakeLists.txt 2015-01-24 21:51:57.000000000 +0300 >-@@ -805,7 +805,7 @@ >- >- IF(UNIX AND NOT WIN32 AND NOT APPLE) >- IF(CMAKE_SIZEOF_VOID_P MATCHES "8") >-- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") >-+ SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement") >- MARK_AS_ADVANCED(LIB_POSTFIX) >- ENDIF() >- ENDIF() >-@@ -1234,7 +1234,7 @@ >- ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc >- @ONLY >- ) >-- INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) >-+ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION libdata/pkgconfig COMPONENT libopenscenegraph-dev) >- ENDFOREACH(PKGCONFIG_FILE) >- >- >diff --git a/graphics/osg-devel/files/patch-ffmpeg3 b/graphics/osg-devel/files/patch-ffmpeg3 >deleted file mode 100644 >index f3f1a2c73de3..000000000000 >--- a/graphics/osg-devel/files/patch-ffmpeg3 >+++ /dev/null >@@ -1,157 +0,0 @@ >-Description: Replace deprecated FFmpeg API >-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> >-Last-Update: <2015-11-02> >- >---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp.orig >-+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp >-@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream * >- findAspectRatio(); >- >- // Find out whether we support Alpha channel >-- m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P); >-+ m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P); >- >- // Find out the framerate >- m_frame_rate = av_q2d(stream->avg_frame_rate); >-@@ -91,20 +91,19 @@ void FFmpegDecoderVideo::open(AVStream * >- throw std::runtime_error("avcodec_open() failed"); >- >- // Allocate video frame >-- m_frame.reset(avcodec_alloc_frame()); >-+ m_frame.reset(av_frame_alloc()); >- >- // Allocate converted RGB frame >-- m_frame_rgba.reset(avcodec_alloc_frame()); >-- m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height())); >-+ m_frame_rgba.reset(av_frame_alloc()); >-+ m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height())); >- m_buffer_rgba[1].resize(m_buffer_rgba[0].size()); >- >- // Assign appropriate parts of the buffer to image planes in m_frame_rgba >-- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height()); >-+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height()); >- >- // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame. >- m_context->opaque = this; >-- m_context->get_buffer = getBuffer; >-- m_context->release_buffer = releaseBuffer; >-+ m_context->get_buffer2 = getBuffer; >- } >- >- >-@@ -263,8 +262,8 @@ int FFmpegDecoderVideo::convert(AVPictur >- #ifdef USE_SWSCALE >- if (m_swscale_ctx==0) >- { >-- m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt, >-- src_width, src_height, (PixelFormat) dst_pix_fmt, >-+ m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt, >-+ src_width, src_height, (AVPixelFormat) dst_pix_fmt, >- /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL); >- } >- >-@@ -311,14 +310,14 @@ void FFmpegDecoderVideo::publishFrame(co >- AVPicture * const dst = (AVPicture *) m_frame_rgba.get(); >- >- // Assign appropriate parts of the buffer to image planes in m_frame_rgba >-- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height()); >-+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height()); >- >- // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine >- >-- if (m_context->pix_fmt == PIX_FMT_YUVA420P) >-+ if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P) >- yuva420pToRgba(dst, src, width(), height()); >- else >-- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height()); >-+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height()); >- >- // Wait 'delay' seconds before publishing the picture. >- int i_delay = static_cast<int>(delay * 1000000 + 0.5); >-@@ -345,7 +344,7 @@ void FFmpegDecoderVideo::publishFrame(co >- >- void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height) >- { >-- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height); >-+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height); >- >- const size_t bpp = 4; >- >-@@ -363,31 +362,28 @@ void FFmpegDecoderVideo::yuva420pToRgba( >- } >- } >- >-- >-- >--int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture) >-+int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags) >- { >-+ AVBufferRef *ref; >- const FFmpegDecoderVideo * const this_ = reinterpret_cast<const FFmpegDecoderVideo*>(context->opaque); >- >-- const int result = avcodec_default_get_buffer(context, picture); >-+ const int result = avcodec_default_get_buffer2(context, picture, flags); >- int64_t * p_pts = reinterpret_cast<int64_t*>( av_malloc(sizeof(int64_t)) ); >- >- *p_pts = this_->m_packet_pts; >- picture->opaque = p_pts; >- >-+ ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags); >-+ picture->buf[0] = ref; >-+ >- return result; >- } >- >-- >-- >--void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture) >-+void FFmpegDecoderVideo::freeBuffer(void *opaque, uint8_t *data) >- { >-- if (picture != 0) >-- av_freep(&picture->opaque); >-- >-- avcodec_default_release_buffer(context, picture); >-+ AVBufferRef *ref = (AVBufferRef *)opaque; >-+ av_buffer_unref(&ref); >-+ av_free(data); >- } >- >-- >-- >- } // namespace osgFFmpeg >---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp.orig >-+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp >-@@ -94,8 +94,8 @@ private: >- int src_pix_fmt, int src_width, int src_height); >- >- >-- static int getBuffer(AVCodecContext * context, AVFrame * picture); >-- static void releaseBuffer(AVCodecContext * context, AVFrame * picture); >-+ static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags); >-+ static void freeBuffer(void * opaque, uint8_t *data); >- >- PacketQueue & m_packets; >- FFmpegClocks & m_clocks; >---- src/osgPlugins/ffmpeg/FFmpegParameters.cpp.orig >-+++ src/osgPlugins/ffmpeg/FFmpegParameters.cpp >-@@ -19,7 +19,7 @@ extern "C" >- #include <libavutil/pixdesc.h> >- } >- >--inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } >-+inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } >- >- >- namespace osgFFmpeg { >---- src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp.orig 2016-02-18 21:25:39.627923629 +0000 >-+++ src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2016-02-18 21:26:17.071140100 +0000 >-@@ -227,8 +227,7 @@ >- if (avcodec_open2(m_context, p_codec, NULL) < 0) >- throw std::runtime_error("avcodec_open() failed"); >- >-- m_context->get_buffer = avcodec_default_get_buffer; >-- m_context->release_buffer = avcodec_default_release_buffer; >-+ m_context->get_buffer2 = avcodec_default_get_buffer2; >- >- } >- >diff --git a/graphics/osg-devel/files/patch-include_osgViewer_View b/graphics/osg-devel/files/patch-include_osgViewer_View >deleted file mode 100644 >index f4caca34ae3a..000000000000 >--- a/graphics/osg-devel/files/patch-include_osgViewer_View >+++ /dev/null >@@ -1,11 +0,0 @@ >---- include/osgViewer/View.orig 2016-04-21 09:54:28.095530000 +0200 >-+++ include/osgViewer/View 2016-04-21 09:55:04.918232000 +0200 >-@@ -127,7 +127,7 @@ >- /** Set the View's image pager.*/ >- void setImagePager(osgDB::ImagePager* ip); >- >-- template<class T> void setImagePager(const osg::ref_ptr<T>* ip) { setImagePager(ip.get()); } >-+ template<class T> void setImagePager(const osg::ref_ptr<T>& ip) { setImagePager(ip.get()); } >- >- /** Get the View's image pager.*/ >- osgDB::ImagePager* getImagePager(); >diff --git a/graphics/osg-devel/pkg-plist b/graphics/osg-devel/pkg-plist >deleted file mode 100644 >index d5ad9d98fa0f..000000000000 >--- a/graphics/osg-devel/pkg-plist >+++ /dev/null >@@ -1,788 +0,0 @@ >-bin/osgarchive >-bin/osgconv >-bin/osgfilecache >-bin/osgversion >-bin/osgviewer >-bin/present3D >-include/OpenThreads/Atomic >-include/OpenThreads/Barrier >-include/OpenThreads/Block >-include/OpenThreads/Condition >-include/OpenThreads/Config >-include/OpenThreads/Exports >-include/OpenThreads/Mutex >-include/OpenThreads/ReadWriteMutex >-include/OpenThreads/ReentrantMutex >-include/OpenThreads/ScopedLock >-include/OpenThreads/Thread >-include/OpenThreads/Version >-include/osg/AlphaFunc >-include/osg/AnimationPath >-include/osg/ApplicationUsage >-include/osg/ArgumentParser >-include/osg/Array >-include/osg/ArrayDispatchers >-include/osg/AudioStream >-include/osg/AutoTransform >-include/osg/Billboard >-include/osg/BlendColor >-include/osg/BlendEquation >-include/osg/BlendEquationi >-include/osg/BlendFunc >-include/osg/BlendFunci >-include/osg/BoundingBox >-include/osg/BoundingSphere >-include/osg/BoundsChecking >-include/osg/BufferIndexBinding >-include/osg/BufferObject >-include/osg/BufferTemplate >-include/osg/Callback >-include/osg/Camera >-include/osg/CameraView >-include/osg/Capability >-include/osg/ClampColor >-include/osg/ClearNode >-include/osg/ClipControl >-include/osg/ClipNode >-include/osg/ClipPlane >-include/osg/ClusterCullingCallback >-include/osg/CollectOccludersVisitor >-include/osg/ColorMask >-include/osg/ColorMaski >-include/osg/ColorMatrix >-include/osg/ComputeBoundsVisitor >-include/osg/Config >-include/osg/ContextData >-include/osg/ConvexPlanarOccluder >-include/osg/ConvexPlanarPolygon >-include/osg/CoordinateSystemNode >-include/osg/CopyOp >-include/osg/CullFace >-include/osg/CullSettings >-include/osg/CullStack >-include/osg/CullingSet >-include/osg/DeleteHandler >-include/osg/Depth >-include/osg/DisplaySettings >-include/osg/DrawPixels >-include/osg/Drawable >-include/osg/Endian >-include/osg/Export >-include/osg/Fog >-include/osg/FragmentProgram >-include/osg/FrameBufferObject >-include/osg/FrameStamp >-include/osg/FrontFace >-include/osg/GL >-include/osg/GL2Extensions >-include/osg/GLBeginEndAdapter >-include/osg/GLDefines >-include/osg/GLExtensions >-include/osg/GLObjects >-include/osg/GLU >-include/osg/Geode >-include/osg/Geometry >-include/osg/GraphicsContext >-include/osg/GraphicsCostEstimator >-include/osg/GraphicsThread >-include/osg/Group >-include/osg/Hint >-include/osg/Image >-include/osg/ImageSequence >-include/osg/ImageStream >-include/osg/ImageUtils >-include/osg/KdTree >-include/osg/LOD >-include/osg/Light >-include/osg/LightModel >-include/osg/LightSource >-include/osg/LineSegment >-include/osg/LineStipple >-include/osg/LineWidth >-include/osg/LogicOp >-include/osg/Material >-include/osg/Math >-include/osg/Matrix >-include/osg/MatrixTransform >-include/osg/Matrixd >-include/osg/Matrixf >-include/osg/MixinVector >-include/osg/Multisample >-include/osg/Node >-include/osg/NodeCallback >-include/osg/NodeTrackerCallback >-include/osg/NodeVisitor >-include/osg/Notify >-include/osg/Object >-include/osg/Observer >-include/osg/ObserverNodePath >-include/osg/OccluderNode >-include/osg/OcclusionQueryNode >-include/osg/OperationThread >-include/osg/PagedLOD >-include/osg/PatchParameter >-include/osg/Plane >-include/osg/Point >-include/osg/PointSprite >-include/osg/PolygonMode >-include/osg/PolygonOffset >-include/osg/PolygonStipple >-include/osg/Polytope >-include/osg/PositionAttitudeTransform >-include/osg/PrimitiveRestartIndex >-include/osg/PrimitiveSet >-include/osg/Program >-include/osg/Projection >-include/osg/ProxyNode >-include/osg/Quat >-include/osg/Referenced >-include/osg/RenderInfo >-include/osg/SampleMaski >-include/osg/Scissor >-include/osg/ScriptEngine >-include/osg/Sequence >-include/osg/ShadeModel >-include/osg/Shader >-include/osg/ShaderAttribute >-include/osg/ShaderComposer >-include/osg/ShadowVolumeOccluder >-include/osg/Shape >-include/osg/ShapeDrawable >-include/osg/State >-include/osg/StateAttribute >-include/osg/StateAttributeCallback >-include/osg/StateSet >-include/osg/Stats >-include/osg/Stencil >-include/osg/StencilTwoSided >-include/osg/Switch >-include/osg/TemplatePrimitiveFunctor >-include/osg/TexEnv >-include/osg/TexEnvCombine >-include/osg/TexEnvFilter >-include/osg/TexGen >-include/osg/TexGenNode >-include/osg/TexMat >-include/osg/Texture >-include/osg/Texture1D >-include/osg/Texture2D >-include/osg/Texture2DArray >-include/osg/Texture2DMultisample >-include/osg/Texture3D >-include/osg/TextureBuffer >-include/osg/TextureCubeMap >-include/osg/TextureRectangle >-include/osg/Timer >-include/osg/TransferFunction >-include/osg/Transform >-include/osg/TriangleFunctor >-include/osg/TriangleIndexFunctor >-include/osg/Types >-include/osg/Uniform >-include/osg/UserDataContainer >-include/osg/ValueObject >-include/osg/Vec2 >-include/osg/Vec2b >-include/osg/Vec2d >-include/osg/Vec2f >-include/osg/Vec2i >-include/osg/Vec2s >-include/osg/Vec2ub >-include/osg/Vec2ui >-include/osg/Vec2us >-include/osg/Vec3 >-include/osg/Vec3b >-include/osg/Vec3d >-include/osg/Vec3f >-include/osg/Vec3i >-include/osg/Vec3s >-include/osg/Vec3ub >-include/osg/Vec3ui >-include/osg/Vec3us >-include/osg/Vec4 >-include/osg/Vec4b >-include/osg/Vec4d >-include/osg/Vec4f >-include/osg/Vec4i >-include/osg/Vec4s >-include/osg/Vec4ub >-include/osg/Vec4ui >-include/osg/Vec4us >-include/osg/Version >-include/osg/VertexAttribDivisor >-include/osg/VertexProgram >-include/osg/View >-include/osg/Viewport >-include/osg/buffered_value >-include/osg/fast_back_stack >-include/osg/io_utils >-include/osg/observer_ptr >-include/osg/ref_ptr >-include/osgAnimation/Action >-include/osgAnimation/ActionAnimation >-include/osgAnimation/ActionBlendIn >-include/osgAnimation/ActionBlendOut >-include/osgAnimation/ActionCallback >-include/osgAnimation/ActionStripAnimation >-include/osgAnimation/ActionVisitor >-include/osgAnimation/Animation >-include/osgAnimation/AnimationManagerBase >-include/osgAnimation/AnimationUpdateCallback >-include/osgAnimation/BasicAnimationManager >-include/osgAnimation/Bone >-include/osgAnimation/BoneMapVisitor >-include/osgAnimation/Channel >-include/osgAnimation/CubicBezier >-include/osgAnimation/EaseMotion >-include/osgAnimation/Export >-include/osgAnimation/FrameAction >-include/osgAnimation/Interpolator >-include/osgAnimation/Keyframe >-include/osgAnimation/LinkVisitor >-include/osgAnimation/MorphGeometry >-include/osgAnimation/RigGeometry >-include/osgAnimation/RigTransform >-include/osgAnimation/RigTransformHardware >-include/osgAnimation/RigTransformSoftware >-include/osgAnimation/Sampler >-include/osgAnimation/Skeleton >-include/osgAnimation/StackedMatrixElement >-include/osgAnimation/StackedQuaternionElement >-include/osgAnimation/StackedRotateAxisElement >-include/osgAnimation/StackedScaleElement >-include/osgAnimation/StackedTransform >-include/osgAnimation/StackedTransformElement >-include/osgAnimation/StackedTranslateElement >-include/osgAnimation/StatsHandler >-include/osgAnimation/StatsVisitor >-include/osgAnimation/Target >-include/osgAnimation/Timeline >-include/osgAnimation/TimelineAnimationManager >-include/osgAnimation/UpdateBone >-include/osgAnimation/UpdateMaterial >-include/osgAnimation/UpdateMatrixTransform >-include/osgAnimation/UpdateUniform >-include/osgAnimation/Vec3Packed >-include/osgAnimation/VertexInfluence >-include/osgDB/Archive >-include/osgDB/AuthenticationMap >-include/osgDB/Callbacks >-include/osgDB/ClassInterface >-include/osgDB/ConvertBase64 >-include/osgDB/ConvertUTF >-include/osgDB/DataTypes >-include/osgDB/DatabasePager >-include/osgDB/DatabaseRevisions >-include/osgDB/DotOsgWrapper >-include/osgDB/DynamicLibrary >-include/osgDB/Export >-include/osgDB/ExternalFileWriter >-include/osgDB/FileCache >-include/osgDB/FileNameUtils >-include/osgDB/FileUtils >-include/osgDB/ImageOptions >-include/osgDB/ImagePager >-include/osgDB/ImageProcessor >-include/osgDB/Input >-include/osgDB/InputStream >-include/osgDB/ObjectCache >-include/osgDB/ObjectWrapper >-include/osgDB/Options >-include/osgDB/Output >-include/osgDB/OutputStream >-include/osgDB/ParameterOutput >-include/osgDB/PluginQuery >-include/osgDB/ReadFile >-include/osgDB/ReaderWriter >-include/osgDB/Registry >-include/osgDB/Serializer >-include/osgDB/SharedStateManager >-include/osgDB/StreamOperator >-include/osgDB/Version >-include/osgDB/WriteFile >-include/osgDB/XmlParser >-include/osgDB/fstream >-include/osgFX/AnisotropicLighting >-include/osgFX/BumpMapping >-include/osgFX/Cartoon >-include/osgFX/Effect >-include/osgFX/Export >-include/osgFX/MultiTextureControl >-include/osgFX/Outline >-include/osgFX/Registry >-include/osgFX/Scribe >-include/osgFX/SpecularHighlights >-include/osgFX/Technique >-include/osgFX/Validator >-include/osgFX/Version >-include/osgGA/AnimationPathManipulator >-include/osgGA/CameraManipulator >-include/osgGA/CameraViewSwitchManipulator >-include/osgGA/Device >-include/osgGA/DriveManipulator >-include/osgGA/Event >-include/osgGA/EventHandler >-include/osgGA/EventQueue >-include/osgGA/EventVisitor >-include/osgGA/Export >-include/osgGA/FirstPersonManipulator >-include/osgGA/FlightManipulator >-include/osgGA/GUIActionAdapter >-include/osgGA/GUIEventAdapter >-include/osgGA/GUIEventHandler >-include/osgGA/KeySwitchMatrixManipulator >-include/osgGA/MultiTouchTrackballManipulator >-include/osgGA/NodeTrackerManipulator >-include/osgGA/OrbitManipulator >-include/osgGA/SphericalManipulator >-include/osgGA/StandardManipulator >-include/osgGA/StateSetManipulator >-include/osgGA/TerrainManipulator >-include/osgGA/TrackballManipulator >-include/osgGA/UFOManipulator >-include/osgGA/Version >-include/osgGA/Widget >-include/osgManipulator/AntiSquish >-include/osgManipulator/Command >-include/osgManipulator/CommandManager >-include/osgManipulator/Constraint >-include/osgManipulator/Dragger >-include/osgManipulator/Export >-include/osgManipulator/Projector >-include/osgManipulator/RotateCylinderDragger >-include/osgManipulator/RotateSphereDragger >-include/osgManipulator/Scale1DDragger >-include/osgManipulator/Scale2DDragger >-include/osgManipulator/ScaleAxisDragger >-include/osgManipulator/Selection >-include/osgManipulator/TabBoxDragger >-include/osgManipulator/TabBoxTrackballDragger >-include/osgManipulator/TabPlaneDragger >-include/osgManipulator/TabPlaneTrackballDragger >-include/osgManipulator/TrackballDragger >-include/osgManipulator/Translate1DDragger >-include/osgManipulator/Translate2DDragger >-include/osgManipulator/TranslateAxisDragger >-include/osgManipulator/TranslatePlaneDragger >-include/osgManipulator/Version >-include/osgParticle/AccelOperator >-include/osgParticle/AngularAccelOperator >-include/osgParticle/AngularDampingOperator >-include/osgParticle/BounceOperator >-include/osgParticle/BoxPlacer >-include/osgParticle/CenteredPlacer >-include/osgParticle/CompositePlacer >-include/osgParticle/ConnectedParticleSystem >-include/osgParticle/ConstantRateCounter >-include/osgParticle/Counter >-include/osgParticle/DampingOperator >-include/osgParticle/DomainOperator >-include/osgParticle/Emitter >-include/osgParticle/ExplosionDebrisEffect >-include/osgParticle/ExplosionEffect >-include/osgParticle/ExplosionOperator >-include/osgParticle/Export >-include/osgParticle/FireEffect >-include/osgParticle/FluidFrictionOperator >-include/osgParticle/FluidProgram >-include/osgParticle/ForceOperator >-include/osgParticle/Interpolator >-include/osgParticle/LinearInterpolator >-include/osgParticle/ModularEmitter >-include/osgParticle/ModularProgram >-include/osgParticle/MultiSegmentPlacer >-include/osgParticle/Operator >-include/osgParticle/OrbitOperator >-include/osgParticle/Particle >-include/osgParticle/ParticleEffect >-include/osgParticle/ParticleProcessor >-include/osgParticle/ParticleSystem >-include/osgParticle/ParticleSystemUpdater >-include/osgParticle/Placer >-include/osgParticle/PointPlacer >-include/osgParticle/PrecipitationEffect >-include/osgParticle/Program >-include/osgParticle/RadialShooter >-include/osgParticle/RandomRateCounter >-include/osgParticle/SectorPlacer >-include/osgParticle/SegmentPlacer >-include/osgParticle/Shooter >-include/osgParticle/SinkOperator >-include/osgParticle/SmokeEffect >-include/osgParticle/SmokeTrailEffect >-include/osgParticle/VariableRateCounter >-include/osgParticle/Version >-include/osgParticle/range >-include/osgPresentation/AnimationMaterial >-include/osgPresentation/CompileSlideCallback >-include/osgPresentation/Cursor >-include/osgPresentation/Export >-include/osgPresentation/KeyEventHandler >-include/osgPresentation/PickEventHandler >-include/osgPresentation/PropertyManager >-include/osgPresentation/SlideEventHandler >-include/osgPresentation/SlideShowConstructor >-include/osgPresentation/Timeout >-%%QT%%include/osgQt/Export >-%%QT%%include/osgQt/GraphicsWindowQt >-%%QT%%include/osgQt/QFontImplementation >-%%QT%%include/osgQt/QGraphicsViewAdapter >-%%QT%%include/osgQt/QWebViewImage >-%%QT%%include/osgQt/QWidgetImage >-%%QT%%include/osgQt/Version >-include/osgShadow/ConvexPolyhedron >-include/osgShadow/DebugShadowMap >-include/osgShadow/Export >-include/osgShadow/LightSpacePerspectiveShadowMap >-include/osgShadow/MinimalCullBoundsShadowMap >-include/osgShadow/MinimalDrawBoundsShadowMap >-include/osgShadow/MinimalShadowMap >-include/osgShadow/OccluderGeometry >-include/osgShadow/ParallelSplitShadowMap >-include/osgShadow/ProjectionShadowMap >-include/osgShadow/ShadowMap >-include/osgShadow/ShadowSettings >-include/osgShadow/ShadowTechnique >-include/osgShadow/ShadowTexture >-include/osgShadow/ShadowVolume >-include/osgShadow/ShadowedScene >-include/osgShadow/SoftShadowMap >-include/osgShadow/StandardShadowMap >-include/osgShadow/Version >-include/osgShadow/ViewDependentShadowMap >-include/osgShadow/ViewDependentShadowTechnique >-include/osgSim/BlinkSequence >-include/osgSim/ColorRange >-include/osgSim/DOFTransform >-include/osgSim/ElevationSlice >-include/osgSim/Export >-include/osgSim/GeographicLocation >-include/osgSim/HeightAboveTerrain >-include/osgSim/Impostor >-include/osgSim/ImpostorSprite >-include/osgSim/InsertImpostorsVisitor >-include/osgSim/LightPoint >-include/osgSim/LightPointNode >-include/osgSim/LightPointSystem >-include/osgSim/LineOfSight >-include/osgSim/MultiSwitch >-include/osgSim/ObjectRecordData >-include/osgSim/OverlayNode >-include/osgSim/ScalarBar >-include/osgSim/ScalarsToColors >-include/osgSim/Sector >-include/osgSim/ShapeAttribute >-include/osgSim/SphereSegment >-include/osgSim/Version >-include/osgSim/VisibilityGroup >-include/osgTerrain/DisplacementMappingTechnique >-include/osgTerrain/Export >-include/osgTerrain/GeometryPool >-include/osgTerrain/GeometryTechnique >-include/osgTerrain/Layer >-include/osgTerrain/Locator >-include/osgTerrain/Terrain >-include/osgTerrain/TerrainTechnique >-include/osgTerrain/TerrainTile >-include/osgTerrain/ValidDataOperator >-include/osgTerrain/Version >-include/osgText/Export >-include/osgText/FadeText >-include/osgText/Font >-include/osgText/Font3D >-include/osgText/Glyph >-include/osgText/KerningType >-include/osgText/String >-include/osgText/Style >-include/osgText/Text >-include/osgText/Text3D >-include/osgText/TextBase >-include/osgText/Version >-include/osgUI/AlignmentSettings >-include/osgUI/Callbacks >-include/osgUI/ColorPalette >-include/osgUI/ComboBox >-include/osgUI/Dialog >-include/osgUI/Export >-include/osgUI/FrameSettings >-include/osgUI/Label >-include/osgUI/LineEdit >-include/osgUI/Popup >-include/osgUI/PushButton >-include/osgUI/Style >-include/osgUI/TabWidget >-include/osgUI/TextSettings >-include/osgUI/Validator >-include/osgUI/Widget >-include/osgUtil/ConvertVec >-include/osgUtil/CubeMapGenerator >-include/osgUtil/CullVisitor >-include/osgUtil/DelaunayTriangulator >-include/osgUtil/DisplayRequirementsVisitor >-include/osgUtil/DrawElementTypeSimplifier >-include/osgUtil/EdgeCollector >-include/osgUtil/Export >-include/osgUtil/GLObjectsVisitor >-include/osgUtil/HalfWayMapGenerator >-include/osgUtil/HighlightMapGenerator >-include/osgUtil/IncrementalCompileOperation >-include/osgUtil/IntersectVisitor >-include/osgUtil/IntersectionVisitor >-include/osgUtil/LineSegmentIntersector >-include/osgUtil/MeshOptimizers >-include/osgUtil/OperationArrayFunctor >-include/osgUtil/Optimizer >-include/osgUtil/PerlinNoise >-include/osgUtil/PlaneIntersector >-include/osgUtil/PolytopeIntersector >-include/osgUtil/PositionalStateContainer >-include/osgUtil/PrintVisitor >-include/osgUtil/RayIntersector >-include/osgUtil/ReflectionMapGenerator >-include/osgUtil/RenderBin >-include/osgUtil/RenderLeaf >-include/osgUtil/RenderStage >-include/osgUtil/ReversePrimitiveFunctor >-include/osgUtil/SceneGraphBuilder >-include/osgUtil/SceneView >-include/osgUtil/ShaderGen >-include/osgUtil/Simplifier >-include/osgUtil/SmoothingVisitor >-include/osgUtil/StateGraph >-include/osgUtil/Statistics >-include/osgUtil/TangentSpaceGenerator >-include/osgUtil/Tessellator >-include/osgUtil/TransformAttributeFunctor >-include/osgUtil/TransformCallback >-include/osgUtil/TriStripVisitor >-include/osgUtil/UpdateVisitor >-include/osgUtil/Version >-include/osgViewer/CompositeViewer >-include/osgViewer/Export >-include/osgViewer/GraphicsWindow >-include/osgViewer/Keystone >-include/osgViewer/Renderer >-include/osgViewer/Scene >-include/osgViewer/Version >-include/osgViewer/View >-include/osgViewer/Viewer >-include/osgViewer/ViewerBase >-include/osgViewer/ViewerEventHandlers >-include/osgViewer/api/X11/GraphicsHandleX11 >-include/osgViewer/api/X11/GraphicsWindowX11 >-include/osgViewer/api/X11/PixelBufferX11 >-include/osgVolume/Export >-include/osgVolume/FixedFunctionTechnique >-include/osgVolume/Layer >-include/osgVolume/Locator >-include/osgVolume/MultipassTechnique >-include/osgVolume/Property >-include/osgVolume/RayTracedTechnique >-include/osgVolume/Version >-include/osgVolume/Volume >-include/osgVolume/VolumeScene >-include/osgVolume/VolumeSettings >-include/osgVolume/VolumeTechnique >-include/osgVolume/VolumeTile >-include/osgWidget/Box >-include/osgWidget/Browser >-include/osgWidget/Canvas >-include/osgWidget/EventInterface >-include/osgWidget/Export >-include/osgWidget/Frame >-include/osgWidget/Input >-include/osgWidget/Label >-include/osgWidget/Lua >-include/osgWidget/PdfReader >-include/osgWidget/Python >-include/osgWidget/ScriptEngine >-include/osgWidget/StyleInterface >-include/osgWidget/StyleManager >-include/osgWidget/Table >-include/osgWidget/Types >-include/osgWidget/UIObjectParent >-include/osgWidget/Util >-include/osgWidget/Version >-include/osgWidget/ViewerEventHandlers >-include/osgWidget/VncClient >-include/osgWidget/Widget >-include/osgWidget/Window >-include/osgWidget/WindowManager >-lib/libOpenThreads.so >-lib/libOpenThreads.so.%%OPENTHREADS_VERSION%% >-lib/libOpenThreads.so.%%OPENTHREADS_SHLIBVER%% >-lib/libosg.so >-lib/libosg.so.%%OSG_VERSION%% >-lib/libosg.so.%%OSG_SHLIBVER%% >-lib/libosgAnimation.so >-lib/libosgAnimation.so.%%OSG_VERSION%% >-lib/libosgAnimation.so.%%OSG_SHLIBVER%% >-lib/libosgDB.so >-lib/libosgDB.so.%%OSG_VERSION%% >-lib/libosgDB.so.%%OSG_SHLIBVER%% >-lib/libosgFX.so >-lib/libosgFX.so.%%OSG_VERSION%% >-lib/libosgFX.so.%%OSG_SHLIBVER%% >-lib/libosgGA.so >-lib/libosgGA.so.%%OSG_VERSION%% >-lib/libosgGA.so.%%OSG_SHLIBVER%% >-lib/libosgManipulator.so >-lib/libosgManipulator.so.%%OSG_VERSION%% >-lib/libosgManipulator.so.%%OSG_SHLIBVER%% >-lib/libosgParticle.so >-lib/libosgParticle.so.%%OSG_VERSION%% >-lib/libosgParticle.so.%%OSG_SHLIBVER%% >-lib/libosgPresentation.so >-lib/libosgPresentation.so.%%OSG_VERSION%% >-lib/libosgPresentation.so.%%OSG_SHLIBVER%% >-%%QT%%lib/libosgQt.so >-%%QT%%lib/libosgQt.so.%%OSG_VERSION%% >-%%QT%%lib/libosgQt.so.%%OSG_SHLIBVER%% >-lib/libosgShadow.so >-lib/libosgShadow.so.%%OSG_VERSION%% >-lib/libosgShadow.so.%%OSG_SHLIBVER%% >-lib/libosgSim.so >-lib/libosgSim.so.%%OSG_VERSION%% >-lib/libosgSim.so.%%OSG_SHLIBVER%% >-lib/libosgTerrain.so >-lib/libosgTerrain.so.%%OSG_VERSION%% >-lib/libosgTerrain.so.%%OSG_SHLIBVER%% >-lib/libosgText.so >-lib/libosgText.so.%%OSG_VERSION%% >-lib/libosgText.so.%%OSG_SHLIBVER%% >-lib/libosgUI.so >-lib/libosgUI.so.%%OSG_VERSION%% >-lib/libosgUI.so.%%OSG_SHLIBVER%% >-lib/libosgUtil.so >-lib/libosgUtil.so.%%OSG_VERSION%% >-lib/libosgUtil.so.%%OSG_SHLIBVER%% >-lib/libosgViewer.so >-lib/libosgViewer.so.%%OSG_VERSION%% >-lib/libosgViewer.so.%%OSG_SHLIBVER%% >-lib/libosgVolume.so >-lib/libosgVolume.so.%%OSG_VERSION%% >-lib/libosgVolume.so.%%OSG_SHLIBVER%% >-lib/libosgWidget.so >-lib/libosgWidget.so.%%OSG_VERSION%% >-lib/libosgWidget.so.%%OSG_SHLIBVER%% >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_3dc.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_3ds.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_ac.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_bmp.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_bsp.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_bvh.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_cfg.so >-%%CURL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_curl.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_dds.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osg.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osganimation.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgfx.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgparticle.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgshadow.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgsim.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgterrain.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgtext.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgviewer.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so >-%%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so >-%%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so >-%%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so >-%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so >-%%GIF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gif.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_gles.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so >-%%GSTREAMER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gstreamer.so >-%%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so >-%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so >-%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so >-%%LIBLAS%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_las.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so >-%%LUA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_lua.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_md2.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_mdl.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_normals.so >-%%NVTT%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_nvtt.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_obj.so >-%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ogr.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_openflight.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osc.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osg.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osga.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgjs.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgshadow.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgterrain.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgtgz.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgviewer.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_p3d.so >-%%PDF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_pdf.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_pic.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_ply.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so >-%%QT4%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_qfont.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so >-%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgga.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgmanipulator.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgparticle.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgshadow.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgsim.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgterrain.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgtext.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgui.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgutil.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so >-%%SVG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_svg.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_tf.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_tga.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_tgz.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_tiff.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_trans.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_trk.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_txf.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so >-%%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_vtf.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so >-%%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_zip.so >-libdata/pkgconfig/openscenegraph-osg.pc >-libdata/pkgconfig/openscenegraph-osgAnimation.pc >-libdata/pkgconfig/openscenegraph-osgDB.pc >-libdata/pkgconfig/openscenegraph-osgFX.pc >-libdata/pkgconfig/openscenegraph-osgGA.pc >-libdata/pkgconfig/openscenegraph-osgManipulator.pc >-libdata/pkgconfig/openscenegraph-osgParticle.pc >-%%QT%%libdata/pkgconfig/openscenegraph-osgQt.pc >-libdata/pkgconfig/openscenegraph-osgShadow.pc >-libdata/pkgconfig/openscenegraph-osgSim.pc >-libdata/pkgconfig/openscenegraph-osgTerrain.pc >-libdata/pkgconfig/openscenegraph-osgText.pc >-libdata/pkgconfig/openscenegraph-osgUtil.pc >-libdata/pkgconfig/openscenegraph-osgViewer.pc >-libdata/pkgconfig/openscenegraph-osgVolume.pc >-libdata/pkgconfig/openscenegraph-osgWidget.pc >-libdata/pkgconfig/openscenegraph.pc >-libdata/pkgconfig/openthreads.pc >diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile >index 40d060d99711..fb0a4cab409f 100644 >--- a/graphics/osg/Makefile >+++ b/graphics/osg/Makefile >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= osg >-PORTVERSION= 3.4.1 >+PORTVERSION= 3.6.2 > DISTVERSIONPREFIX= OpenSceneGraph- > PORTREVISION= 1 > CATEGORIES= graphics >@@ -22,7 +22,7 @@ USE_GITHUB= yes > GH_ACCOUNT= openscenegraph > GH_PROJECT= OpenSceneGraph > >-CONFLICTS= osg-devel-[0-9]* >+CONFLICTS= osg34-[0-9]* osg-devel-[0-9]* > > USES= alias cmake:outsource jpeg pkgconfig > USE_GL= gl glu >@@ -30,9 +30,9 @@ USE_XORG= x11 > USE_LDCONFIG= yes > > PLIST_SUB= OSG_VERSION=${PORTVERSION} \ >- OSG_SHLIBVER=131 \ >- OPENTHREADS_VERSION=3.3.0 \ >- OPENTHREADS_SHLIBVER=20 >+ OSG_SHLIBVER=157 \ >+ OPENTHREADS_VERSION=3.3.1 \ >+ OPENTHREADS_SHLIBVER=21 > > PORTSCOUT= limitw:1,even > >diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo >index 7b8e38def234..1512db8338bc 100644 >--- a/graphics/osg/distinfo >+++ b/graphics/osg/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1506357973 >-SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.4.1_GH0.tar.gz) = 930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5 >-SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.4.1_GH0.tar.gz) = 5686385 >+TIMESTAMP = 1531346421 >+SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.2_GH0.tar.gz) = 762c6601f32a761c7a0556766097558f453f23b983dd75bcf90f922e2d077a34 >+SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.2_GH0.tar.gz) = 5778895 >diff --git a/graphics/osg/files/patch-CMakeLists.txt b/graphics/osg/files/patch-CMakeLists.txt >index d495019fab71..8ed8d28af1aa 100644 >--- a/graphics/osg/files/patch-CMakeLists.txt >+++ b/graphics/osg/files/patch-CMakeLists.txt >@@ -1,15 +1,5 @@ > --- CMakeLists.txt.orig 2017-08-28 16:50:49 UTC > +++ CMakeLists.txt >-@@ -252,6 +252,9 @@ ENDIF() >- >- INCLUDE_DIRECTORIES( >- ${OpenSceneGraph_SOURCE_DIR}/include >-+) >-+ >-+INCLUDE_DIRECTORIES(SYSTEM >- ${OPENGL_INCLUDE_DIR} >- ) >- > @@ -846,7 +849,7 @@ ENDIF() > > IF(UNIX AND NOT WIN32 AND NOT APPLE) >diff --git a/graphics/osg/files/patch-CMakeModules-FindGTA.cmake b/graphics/osg/files/patch-CMakeModules-FindGTA.cmake >deleted file mode 100644 >index 8a648a5ac524..000000000000 >--- a/graphics/osg/files/patch-CMakeModules-FindGTA.cmake >+++ /dev/null >@@ -1,25 +0,0 @@ >---- CMakeModules/FindGTA.cmake.orig 2014-01-19 17:46:13.693927259 +0400 >-+++ CMakeModules/FindGTA.cmake 2014-01-19 18:38:17.868997891 +0400 >-@@ -8,16 +8,6 @@ >- # correspond to the ./configure --prefix=$GTA_DIR >- # used in building libgta. >- >--INCLUDE(FindPkgConfig OPTIONAL) >-- >--IF(PKG_CONFIG_FOUND) >-- >-- INCLUDE(FindPkgConfig) >-- >-- PKG_CHECK_MODULES(GTA gta) >-- >--ELSE(PKG_CONFIG_FOUND) >-- >- FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp >- $ENV{GTA_DIR}/include >- $ENV{GTA_DIR} >-@@ -52,5 +42,3 @@ >- IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) >- SET(GTA_FOUND "YES") >- ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) >-- >--ENDIF(PKG_CONFIG_FOUND) >diff --git a/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp b/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp >index eeaba23f077d..b1623899886b 100644 >--- a/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp >+++ b/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp >@@ -1,5 +1,5 @@ >---- src/OpenThreads/pthreads/PThread.cpp.orig 2011-06-24 00:09:26.000000000 +0400 >-+++ src/OpenThreads/pthreads/PThread.cpp 2012-03-05 05:57:02.886704932 +0400 >+--- src/OpenThreads/pthreads/PThread.cpp.orig 2018-06-29 12:56:35.000000000 +0300 >++++ src/OpenThreads/pthreads/PThread.cpp 2018-07-12 22:10:15.672946000 +0300 > @@ -21,6 +21,7 @@ > #include <sys/types.h> > #include <unistd.h> >@@ -7,31 +7,13 @@ > +#include <pthread_np.h> > #include <limits.h> > >- #if defined __linux || defined __sun || defined __APPLE__ || ANDROID >-@@ -136,7 +137,7 @@ >- #if defined(__sgi) >- pthread_setrunon_np( pd->cpunum ); >- #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) >-- cpu_set_t cpumask; >-+ cpuset_t cpumask; >- CPU_ZERO( &cpumask ); >- CPU_SET( pd->cpunum, &cpumask ); >- >-@@ -569,7 +570,7 @@ >- >- if (pd->isRunning && Thread::CurrentThread()==this) >- { >-- cpu_set_t cpumask; >-+ cpuset_t cpumask; >- CPU_ZERO( &cpumask ); >- CPU_SET( pd->cpunum, &cpumask ); >- #if defined(HAVE_PTHREAD_SETAFFINITY_NP) >-@@ -1031,7 +1032,7 @@ >- else >- { >- #if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) >-- cpu_set_t cpumask; >-+ cpuset_t cpumask; >- CPU_ZERO( &cpumask ); >- CPU_SET( cpunum, &cpumask ); >- #if defined(HAVE_PTHREAD_SETAFFINITY_NP) >+ #if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID >+@@ -113,7 +114,7 @@ >+ static void setAffinity(const Affinity& affinity) >+ { >+ //std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <<std::endl; >+- cpu_set_t cpumask; >++ cpuset_t cpumask; >+ CPU_ZERO( &cpumask ); >+ unsigned int numprocessors = OpenThreads::GetNumberOfProcessors(); >+ if (affinity) >diff --git a/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt b/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt >new file mode 100644 >index 000000000000..cded00e8065d >--- /dev/null >+++ b/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt >@@ -0,0 +1,15 @@ >+--- src/osgViewer/CMakeLists.txt.orig 2018-07-12 22:49:36.402831000 +0300 >++++ src/osgViewer/CMakeLists.txt 2018-07-12 22:51:29.430404000 +0300 >+@@ -214,12 +214,6 @@ >+ ENDIF() >+ ENDIF() >+ >+- IF(OSGVIEWER_USE_XINERAMA) >+- ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA) >+- SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} ) >+- SET(LIB_EXTRA_LIBS -lXinerama ${LIB_EXTRA_LIBS}) >+- ENDIF() >+- >+ # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard >+ IF(APPLE) >+ # hack for finding the iphone opengl es lib >diff --git a/graphics/osg/pkg-plist b/graphics/osg/pkg-plist >index affadfdc7cd0..0ddb277e1dac 100644 >--- a/graphics/osg/pkg-plist >+++ b/graphics/osg/pkg-plist >@@ -4,6 +4,7 @@ bin/osgfilecache > bin/osgversion > bin/osgviewer > bin/present3D >+include/OpenThreads/Affinity > include/OpenThreads/Atomic > include/OpenThreads/Barrier > include/OpenThreads/Block >@@ -21,10 +22,11 @@ include/osg/AnimationPath > include/osg/ApplicationUsage > include/osg/ArgumentParser > include/osg/Array >-include/osg/ArrayDispatchers >+include/osg/AttributeDispatchers > include/osg/AudioStream > include/osg/AutoTransform > include/osg/Billboard >+include/osg/BindImageTexture > include/osg/BlendColor > include/osg/BlendEquation > include/osg/BlendEquationi >@@ -52,6 +54,7 @@ include/osg/ColorMaski > include/osg/ColorMatrix > include/osg/ComputeBoundsVisitor > include/osg/Config >+include/osg/ContextData > include/osg/ConvexPlanarOccluder > include/osg/ConvexPlanarPolygon > include/osg/CoordinateSystemNode >@@ -62,6 +65,8 @@ include/osg/CullStack > include/osg/CullingSet > include/osg/DeleteHandler > include/osg/Depth >+include/osg/DepthRangeIndexed >+include/osg/DispatchCompute > include/osg/DisplaySettings > include/osg/DrawPixels > include/osg/Drawable >@@ -74,7 +79,6 @@ include/osg/FrameStamp > include/osg/FrontFace > include/osg/GL > include/osg/GL2Extensions >-include/osg/GLBeginEndAdapter > include/osg/GLDefines > include/osg/GLExtensions > include/osg/GLObjects >@@ -86,6 +90,7 @@ include/osg/GraphicsCostEstimator > include/osg/GraphicsThread > include/osg/Group > include/osg/Hint >+include/osg/Identifier > include/osg/Image > include/osg/ImageSequence > include/osg/ImageStream >@@ -130,6 +135,7 @@ include/osg/Polytope > include/osg/PositionAttitudeTransform > include/osg/PrimitiveRestartIndex > include/osg/PrimitiveSet >+include/osg/PrimitiveSetIndirect > include/osg/Program > include/osg/Projection > include/osg/ProxyNode >@@ -137,7 +143,9 @@ include/osg/Quat > include/osg/Referenced > include/osg/RenderInfo > include/osg/SampleMaski >+include/osg/Sampler > include/osg/Scissor >+include/osg/ScissorIndexed > include/osg/ScriptEngine > include/osg/Sequence > include/osg/ShadeModel >@@ -156,6 +164,7 @@ include/osg/Stencil > include/osg/StencilTwoSided > include/osg/Switch > include/osg/TemplatePrimitiveFunctor >+include/osg/TemplatePrimitiveIndexFunctor > include/osg/TexEnv > include/osg/TexEnvCombine > include/osg/TexEnvFilter >@@ -180,7 +189,9 @@ include/osg/TriangleLinePointIndexFunctor > include/osg/Types > include/osg/Uniform > include/osg/UserDataContainer >+include/osg/ValueMap > include/osg/ValueObject >+include/osg/ValueStack > include/osg/Vec2 > include/osg/Vec2b > include/osg/Vec2d >@@ -209,14 +220,17 @@ include/osg/Vec4ub > include/osg/Vec4ui > include/osg/Vec4us > include/osg/Version >+include/osg/VertexArrayState > include/osg/VertexAttribDivisor > include/osg/VertexProgram > include/osg/View > include/osg/Viewport >+include/osg/ViewportIndexed > include/osg/buffered_value > include/osg/fast_back_stack > include/osg/io_utils > include/osg/observer_ptr >+include/osg/os_utils > include/osg/ref_ptr > include/osgAnimation/Action > include/osgAnimation/ActionAnimation >@@ -240,6 +254,8 @@ include/osgAnimation/Interpolator > include/osgAnimation/Keyframe > include/osgAnimation/LinkVisitor > include/osgAnimation/MorphGeometry >+include/osgAnimation/MorphTransformHardware >+include/osgAnimation/MorphTransformSoftware > include/osgAnimation/RigGeometry > include/osgAnimation/RigTransform > include/osgAnimation/RigTransformHardware >@@ -437,14 +453,12 @@ include/osgShadow/LightSpacePerspectiveShadowMap > include/osgShadow/MinimalCullBoundsShadowMap > include/osgShadow/MinimalDrawBoundsShadowMap > include/osgShadow/MinimalShadowMap >-include/osgShadow/OccluderGeometry > include/osgShadow/ParallelSplitShadowMap > include/osgShadow/ProjectionShadowMap > include/osgShadow/ShadowMap > include/osgShadow/ShadowSettings > include/osgShadow/ShadowTechnique > include/osgShadow/ShadowTexture >-include/osgShadow/ShadowVolume > include/osgShadow/ShadowedScene > include/osgShadow/SoftShadowMap > include/osgShadow/StandardShadowMap >@@ -692,7 +706,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgviewer.so > lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so > lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so > lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so >-lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so > lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so > %%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so > %%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so >diff --git a/graphics/osg-devel/Makefile b/graphics/osg34/Makefile >similarity index 91% >rename from graphics/osg-devel/Makefile >rename to graphics/osg34/Makefile >index a6331b00c611..35e6fdd04006 100644 >--- a/graphics/osg-devel/Makefile >+++ b/graphics/osg34/Makefile >@@ -2,13 +2,11 @@ > # $FreeBSD$ > > PORTNAME= osg >-PORTVERSION= 3.5.1 >-PORTREVISION= 4 >+PORTVERSION= 3.4.1 >+PKGNAMESUFFIX= 34 >+DISTVERSIONPREFIX= OpenSceneGraph- >+PORTREVISION= 1 > CATEGORIES= graphics >-MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ >- http://mirror.amdmi3.ru/distfiles/ >-PKGNAMESUFFIX= -devel >-DISTNAME= OpenSceneGraph-${PORTVERSION} > > MAINTAINER= amdmi3@FreeBSD.org > COMMENT= C++ OpenGL scene graph library for real-time rendering >@@ -21,19 +19,23 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > LIB_DEPENDS= libpng.so:graphics/png \ > libtiff.so:graphics/tiff > >-CONFLICTS= osg-[0-9]* >+USE_GITHUB= yes >+GH_ACCOUNT= openscenegraph >+GH_PROJECT= OpenSceneGraph > >-USES= alias cmake:outsource jpeg pkgconfig zip >+CONFLICTS= osg-[0-9]* osg-devel-[0-9]* >+ >+USES= alias cmake:outsource jpeg pkgconfig > USE_GL= gl glu > USE_XORG= x11 > USE_LDCONFIG= yes > > PLIST_SUB= OSG_VERSION=${PORTVERSION} \ >- OSG_SHLIBVER=141 \ >+ OSG_SHLIBVER=131 \ > OPENTHREADS_VERSION=3.3.0 \ > OPENTHREADS_SHLIBVER=20 > >-PORTSCOUT= limitw:1,odd >+PORTSCOUT= limitw:1,even > > OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \ > JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \ >@@ -103,7 +105,7 @@ QT4_USE= qt=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build > QT4_CMAKE_ON= -DDESIRED_QT_VERSION=4 > QT4_VARS= FORCE_REQUIRE+=Qt4 > QT4_VARS_OFF= FORCE_IGNORE+=Qt4 >-QT5_USES= qt:5 >+QT5_USE= qt:5 > QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit > QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5 > QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets" >@@ -145,8 +147,8 @@ PLIST_SUB+= QT="@comment " > post-patch: > @${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \ > ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' >- @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \ >- s|-pedantic||' ${WRKSRC}/CMakeLists.txt >+ @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \ >+ ${WRKSRC}/CMakeLists.txt > .for p in ${FORCE_REQUIRE} > @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \ > ${WRKSRC}/CMakeLists.txt >diff --git a/graphics/osg/distinfo b/graphics/osg34/distinfo >similarity index 100% >copy from graphics/osg/distinfo >copy to graphics/osg34/distinfo >diff --git a/graphics/osg/files/patch-CMakeLists.txt b/graphics/osg34/files/patch-CMakeLists.txt >similarity index 100% >copy from graphics/osg/files/patch-CMakeLists.txt >copy to graphics/osg34/files/patch-CMakeLists.txt >diff --git a/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake b/graphics/osg34/files/patch-CMakeModules-FindGTA.cmake >similarity index 100% >rename from graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake >rename to graphics/osg34/files/patch-CMakeModules-FindGTA.cmake >diff --git a/graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake b/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake >similarity index 100% >rename from graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake >rename to graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake >diff --git a/graphics/osg34/files/patch-shift-key-fix b/graphics/osg34/files/patch-shift-key-fix >new file mode 100644 >index 000000000000..87d9003ae693 >--- /dev/null >+++ b/graphics/osg34/files/patch-shift-key-fix >@@ -0,0 +1,23 @@ >+# Shift key not released if group switch is something other than Control-Shift: >+# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1218650.html >+ >+--- src/osgGA/EventQueue.cpp.orig >++++ src/osgGA/EventQueue.cpp >+@@ -337,7 +337,7 @@ void EventQueue::mouseButtonRelease(floa >+ >+ void EventQueue::keyPress(int key, double time, int unmodifiedKey) >+ { >+- switch(key) >++ switch(unmodifiedKey) >+ { >+ case(GUIEventAdapter::KEY_Shift_L): _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_SHIFT | _accumulateEventState->getModKeyMask()); break; >+ case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_SHIFT | _accumulateEventState->getModKeyMask()); break; >+@@ -381,7 +381,7 @@ void EventQueue::keyPress(int key, doubl >+ >+ void EventQueue::keyRelease(int key, double time, int unmodifiedKey) >+ { >+- switch(key) >++ switch(unmodifiedKey) >+ { >+ case(GUIEventAdapter::KEY_Shift_L): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_SHIFT & _accumulateEventState->getModKeyMask()); break; >+ case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_SHIFT & _accumulateEventState->getModKeyMask()); break; >diff --git a/graphics/osg-devel/files/patch-src-OpenThreads-CMakeLists.txt b/graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt >similarity index 100% >rename from graphics/osg-devel/files/patch-src-OpenThreads-CMakeLists.txt >rename to graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt >diff --git a/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp b/graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp >similarity index 100% >rename from graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp >rename to graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp >diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt >similarity index 76% >rename from graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt >rename to graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt >index 4b0da817bfe6..426b4f3145b3 100644 >--- a/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt >+++ b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt >@@ -1,11 +1,14 @@ > --- src/osgPlugins/ffmpeg/CMakeLists.txt.orig 2015-01-07 14:14:55 UTC > +++ src/osgPlugins/ffmpeg/CMakeLists.txt >-@@ -3,7 +3,7 @@ LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS}) >+@@ -1,9 +1,9 @@ >+-INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} ) >++INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_INCLUDE_DIRS}) >+ LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS}) > > IF(FFMPEG_LIBSWSCALE_FOUND) > > - INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) >-+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) >++ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale) > > ADD_DEFINITIONS(-DUSE_SWSCALE) > >@@ -14,7 +17,7 @@ > > IF(FFMPEG_LIBSWRESAMPLE_FOUND) > - INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample ) >-+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample ) >++ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample) > > ADD_DEFINITIONS(-DUSE_SWRESAMPLE) > >@@ -22,7 +25,7 @@ > ENDIF() > IF(FFMPEG_LIBAVRESAMPLE_FOUND) > - INCLUDE_DIRECTORIES( ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample ) >-+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample ) >++ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample) > > ADD_DEFINITIONS(-DUSE_AVRESAMPLE) > >diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt >similarity index 100% >rename from graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt >rename to graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt >diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt >similarity index 100% >rename from graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt >rename to graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt >diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt >similarity index 100% >rename from graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt >rename to graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt >diff --git a/graphics/osg-devel/pkg-descr b/graphics/osg34/pkg-descr >similarity index 100% >rename from graphics/osg-devel/pkg-descr >rename to graphics/osg34/pkg-descr >diff --git a/graphics/osg/pkg-plist b/graphics/osg34/pkg-plist >similarity index 100% >copy from graphics/osg/pkg-plist >copy to graphics/osg34/pkg-plist >diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile >index f55dd5262569..69e78d3c8375 100644 >--- a/graphics/osgearth/Makefile >+++ b/graphics/osgearth/Makefile >@@ -14,7 +14,7 @@ LICENSE= LGPL3 > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > BUILD_DEPENDS= minizip:archivers/minizip >-LIB_DEPENDS= libosg.so:graphics/osg \ >+LIB_DEPENDS= libosg.so:graphics/osg34 \ > libgdal.so:graphics/gdal \ > libcurl.so:ftp/curl >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=195989">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 230442
: 195989