Attachment #195989 for bug #230442

View | Details | Raw Unified | Return to bug 230442
Collapse All | Expand All

Lines 14-20 LICENSE= GPLv2 Link Here

(-)b/devel/simgear/Makefile (-1 / +1 lines)
14	BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib	14	BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
15	RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib	15	RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
16	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \	16	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
17	libosg.so:graphics/osg	17	libosg.so:graphics/osg34
18		18
19	USES= alias cmake compiler:c++11-lib cpe jpeg openal:al,alut tar:bzip2	19	USES= alias cmake compiler:c++11-lib cpe jpeg openal:al,alut tar:bzip2
20	USE_XORG= ice sm x11 xext xi xmu xt	20	USE_XORG= ice sm x11 xext xi xmu xt

Lines 16-22 LIB_DEPENDS= libpng.so:graphics/png \ Link Here

(-)b/games/flightgear/Makefile (-1 / +1 lines)
16	libboost_thread.so:devel/boost-libs \	16	libboost_thread.so:devel/boost-libs \
17	libfltk.so:x11-toolkits/fltk \	17	libfltk.so:x11-toolkits/fltk \
18	libfreetype.so:print/freetype2 \	18	libfreetype.so:print/freetype2 \
19	libosg.so:graphics/osg \	19	libosg.so:graphics/osg34 \
20	libspeex.so:audio/speex \	20	libspeex.so:audio/speex \
21	libspeexdsp.so:audio/speexdsp \	21	libspeexdsp.so:audio/speexdsp \
22	libcurl.so:ftp/curl \	22	libcurl.so:ftp/curl \

Removed Link Here

(-)a/graphics/osg-devel/distinfo (-3 lines)
1	TIMESTAMP = 1482850076
2	SHA256 (OpenSceneGraph-3.5.1.zip) = c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0
3	SIZE (OpenSceneGraph-3.5.1.zip) = 8353019




--- 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)
 
 




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;
 
     }
 

Removed Link Here

(-)a/graphics/osg-devel/files/patch-include_osgViewer_View (-11 lines)
1	--- include/osgViewer/View.orig 2016-04-21 09:54:28.095530000 +0200
2	+++ include/osgViewer/View 2016-04-21 09:55:04.918232000 +0200
3	@@ -127,7 +127,7 @@
4	/** Set the View's image pager.*/
5	void setImagePager(osgDB::ImagePager* ip);
6
7	- template<class T> void setImagePager(const osg::ref_ptr<T>* ip) { setImagePager(ip.get()); }
8	+ template<class T> void setImagePager(const osg::ref_ptr<T>& ip) { setImagePager(ip.get()); }
9
10	/** Get the View's image pager.*/
11	osgDB::ImagePager* getImagePager();




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




# $FreeBSD$

PORTNAME=	osg
PORTVERSION=	3.6.2
DISTVERSIONPREFIX=	OpenSceneGraph-
PORTREVISION=	1
CATEGORIES=	graphics

GH_ACCOUNT=	openscenegraph
GH_PROJECT=	OpenSceneGraph

CONFLICTS=	osg34-[0-9]* osg-devel-[0-9]*

USES=		alias cmake:outsource jpeg pkgconfig
USE_GL=		gl glu

USE_LDCONFIG=	yes

PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
		OSG_SHLIBVER=157 \
		OPENTHREADS_VERSION=3.3.1 \
		OPENTHREADS_SHLIBVER=21

PORTSCOUT=	limitw:1,even


Lines 1-3 Link Here

(-)b/graphics/osg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1506357973	1	TIMESTAMP = 1531346421
2	SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.4.1_GH0.tar.gz) = 930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5	2	SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.2_GH0.tar.gz) = 762c6601f32a761c7a0556766097558f453f23b983dd75bcf90f922e2d077a34
3	SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.4.1_GH0.tar.gz) = 5686385	3	SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.2_GH0.tar.gz) = 5778895




--- 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)




--- 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)




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

+#include <pthread_np.h>
 #include <limits.h>
 
 #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)
@@ -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)




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




bin/osgversion
bin/osgviewer
bin/present3D
include/OpenThreads/Affinity
include/OpenThreads/Atomic
include/OpenThreads/Barrier
include/OpenThreads/Block

include/osg/ApplicationUsage
include/osg/ArgumentParser
include/osg/Array
include/osg/AttributeDispatchers
include/osg/AudioStream
include/osg/AutoTransform
include/osg/Billboard
include/osg/BindImageTexture
include/osg/BlendColor
include/osg/BlendEquation
include/osg/BlendEquationi

include/osg/ColorMatrix
include/osg/ComputeBoundsVisitor
include/osg/Config
include/osg/ContextData
include/osg/ConvexPlanarOccluder
include/osg/ConvexPlanarPolygon
include/osg/CoordinateSystemNode

include/osg/CullingSet
include/osg/DeleteHandler
include/osg/Depth
include/osg/DepthRangeIndexed
include/osg/DispatchCompute
include/osg/DisplaySettings
include/osg/DrawPixels
include/osg/Drawable

include/osg/FrontFace
include/osg/GL
include/osg/GL2Extensions
include/osg/GLBeginEndAdapter
include/osg/GLDefines
include/osg/GLExtensions
include/osg/GLObjects

include/osg/GraphicsThread
include/osg/Group
include/osg/Hint
include/osg/Identifier
include/osg/Image
include/osg/ImageSequence
include/osg/ImageStream

include/osg/PositionAttitudeTransform
include/osg/PrimitiveRestartIndex
include/osg/PrimitiveSet
include/osg/PrimitiveSetIndirect
include/osg/Program
include/osg/Projection
include/osg/ProxyNode

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

include/osg/StencilTwoSided
include/osg/Switch
include/osg/TemplatePrimitiveFunctor
include/osg/TemplatePrimitiveIndexFunctor
include/osg/TexEnv
include/osg/TexEnvCombine
include/osg/TexEnvFilter

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

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

include/osgAnimation/Keyframe
include/osgAnimation/LinkVisitor
include/osgAnimation/MorphGeometry
include/osgAnimation/MorphTransformHardware
include/osgAnimation/MorphTransformSoftware
include/osgAnimation/RigGeometry
include/osgAnimation/RigTransform
include/osgAnimation/RigTransformHardware

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

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

Lines 2-14 Link Here

(-)b/graphics/osg34/Makefile (-13 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= osg	4	PORTNAME= osg
5	PORTVERSION= 3.5.1	5	PORTVERSION= 3.4.1
6	PORTREVISION= 4	6	PKGNAMESUFFIX= 34
		7	DISTVERSIONPREFIX= OpenSceneGraph-
		8	PORTREVISION= 1
7	CATEGORIES= graphics	9	CATEGORIES= graphics
8	MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \
9	http://mirror.amdmi3.ru/distfiles/
10	PKGNAMESUFFIX= -devel
11	DISTNAME= OpenSceneGraph-${PORTVERSION}
12		10
13	MAINTAINER= amdmi3@FreeBSD.org	11	MAINTAINER= amdmi3@FreeBSD.org
14	COMMENT= C++ OpenGL scene graph library for real-time rendering	12	COMMENT= C++ OpenGL scene graph library for real-time rendering
Lines 21-39 LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept Link Here
21	LIB_DEPENDS= libpng.so:graphics/png \	19	LIB_DEPENDS= libpng.so:graphics/png \
22	libtiff.so:graphics/tiff	20	libtiff.so:graphics/tiff
23		21
24	CONFLICTS= osg-[0-9]*	22	USE_GITHUB= yes
		23	GH_ACCOUNT= openscenegraph
		24	GH_PROJECT= OpenSceneGraph
25		25
26	USES= alias cmake:outsource jpeg pkgconfig zip	26	CONFLICTS= osg-[0-9]* osg-devel-[0-9]*
		27
		28	USES= alias cmake:outsource jpeg pkgconfig
27	USE_GL= gl glu	29	USE_GL= gl glu
28	USE_XORG= x11	30	USE_XORG= x11
29	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
30		32
31	PLIST_SUB= OSG_VERSION=${PORTVERSION} \	33	PLIST_SUB= OSG_VERSION=${PORTVERSION} \
32	OSG_SHLIBVER=141 \	34	OSG_SHLIBVER=131 \
33	OPENTHREADS_VERSION=3.3.0 \	35	OPENTHREADS_VERSION=3.3.0 \
34	OPENTHREADS_SHLIBVER=20	36	OPENTHREADS_SHLIBVER=20
35		37
36	PORTSCOUT= limitw:1,odd	38	PORTSCOUT= limitw:1,even
37		39
38	OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \	40	OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \
39	JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \	41	JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \
Lines 103-109 QT4_USE= qt=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build Link Here
103	QT4_CMAKE_ON= -DDESIRED_QT_VERSION=4	105	QT4_CMAKE_ON= -DDESIRED_QT_VERSION=4
104	QT4_VARS= FORCE_REQUIRE+=Qt4	106	QT4_VARS= FORCE_REQUIRE+=Qt4
105	QT4_VARS_OFF= FORCE_IGNORE+=Qt4	107	QT4_VARS_OFF= FORCE_IGNORE+=Qt4
106	QT5_USES= qt:5	108	QT5_USE= qt:5
107	QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit	109	QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit
108	QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5	110	QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5
109	QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"	111	QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
Lines 145-152 PLIST_SUB+= QT="@comment " Link Here
145	post-patch:	147	post-patch:
146	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 \| ${XARGS} -0 \	148	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 \| ${XARGS} -0 \
147	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g'	149	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g'
148	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \	150	@${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \
149	s\|-pedantic\|\|' ${WRKSRC}/CMakeLists.txt	151	${WRKSRC}/CMakeLists.txt
150	.for p in ${FORCE_REQUIRE}	152	.for p in ${FORCE_REQUIRE}
151	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s\|)$$\| REQUIRED&\|' \	153	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s\|)$$\| REQUIRED&\|' \
152	${WRKSRC}/CMakeLists.txt	154	${WRKSRC}/CMakeLists.txt




# 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;

Lines 1-11 Link Here

(-)b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt (-4 / +7 lines)
1	--- src/osgPlugins/ffmpeg/CMakeLists.txt.orig 2015-01-07 14:14:55 UTC	1	--- src/osgPlugins/ffmpeg/CMakeLists.txt.orig 2015-01-07 14:14:55 UTC
2	+++ src/osgPlugins/ffmpeg/CMakeLists.txt	2	+++ src/osgPlugins/ffmpeg/CMakeLists.txt
3	@@ -3,7 +3,7 @@ LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS})	3	@@ -1,9 +1,9 @@
		4	-INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
		5	+INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_INCLUDE_DIRS})
		6	LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS})
4		7
5	IF(FFMPEG_LIBSWSCALE_FOUND)	8	IF(FFMPEG_LIBSWSCALE_FOUND)
6		9
7	- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale )	10	- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale )
8	+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale )	11	+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale)
9		12
10	ADD_DEFINITIONS(-DUSE_SWSCALE)	13	ADD_DEFINITIONS(-DUSE_SWSCALE)
11		14
Lines 14-20 Link Here
14		17
15	IF(FFMPEG_LIBSWRESAMPLE_FOUND)	18	IF(FFMPEG_LIBSWRESAMPLE_FOUND)
16	- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample )	19	- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample )
17	+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample )	20	+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample)
18		21
19	ADD_DEFINITIONS(-DUSE_SWRESAMPLE)	22	ADD_DEFINITIONS(-DUSE_SWRESAMPLE)
20		23
Lines 22-28 Link Here
22	ENDIF()	25	ENDIF()
23	IF(FFMPEG_LIBAVRESAMPLE_FOUND)	26	IF(FFMPEG_LIBAVRESAMPLE_FOUND)
24	- INCLUDE_DIRECTORIES( ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample )	27	- INCLUDE_DIRECTORIES( ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample )
25	+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample )	28	+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample)
26		29
27	ADD_DEFINITIONS(-DUSE_AVRESAMPLE)	30	ADD_DEFINITIONS(-DUSE_AVRESAMPLE)
28		31

Lines 14-20 LICENSE= LGPL3 Link Here

(-)b/graphics/osgearth/Makefile (-1 / +1 lines)
14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
15		15
16	BUILD_DEPENDS= minizip:archivers/minizip	16	BUILD_DEPENDS= minizip:archivers/minizip
17	LIB_DEPENDS= libosg.so:graphics/osg \	17	LIB_DEPENDS= libosg.so:graphics/osg34 \
18	libgdal.so:graphics/gdal \	18	libgdal.so:graphics/gdal \
19	libcurl.so:ftp/curl	19	libcurl.so:ftp/curl
20		20

Return to bug 230442

Removed Link Here

(-)a/graphics/osg-devel/files/patch-CMakeLists.txt (-20 lines)
1	--- CMakeLists.txt.orig 2014-12-18 20:47:08.000000000 +0300
2	+++ CMakeLists.txt 2015-01-24 21:51:57.000000000 +0300
3	@@ -805,7 +805,7 @@
4
5	IF(UNIX AND NOT WIN32 AND NOT APPLE)
6	IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
7	- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
8	+ SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement")
9	MARK_AS_ADVANCED(LIB_POSTFIX)
10	ENDIF()
11	ENDIF()
12	@@ -1234,7 +1234,7 @@
13	${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
14	@ONLY
15	)
16	- INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
17	+ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION libdata/pkgconfig COMPONENT libopenscenegraph-dev)
18	ENDFOREACH(PKGCONFIG_FILE)
19
20

Removed Link Here

(-)a/graphics/osg-devel/files/patch-ffmpeg3 (-157 lines)
1	Description: Replace deprecated FFmpeg API
2	Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
3	Last-Update: <2015-11-02>
4
5	--- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp.orig
6	+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
7	@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream *
8	findAspectRatio();
9
10	// Find out whether we support Alpha channel
11	- m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);
12	+ m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);
13
14	// Find out the framerate
15	m_frame_rate = av_q2d(stream->avg_frame_rate);
16	@@ -91,20 +91,19 @@ void FFmpegDecoderVideo::open(AVStream *
17	throw std::runtime_error("avcodec_open() failed");
18
19	// Allocate video frame
20	- m_frame.reset(avcodec_alloc_frame());
21	+ m_frame.reset(av_frame_alloc());
22
23	// Allocate converted RGB frame
24	- m_frame_rgba.reset(avcodec_alloc_frame());
25	- m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height()));
26	+ m_frame_rgba.reset(av_frame_alloc());
27	+ m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height()));
28	m_buffer_rgba[1].resize(m_buffer_rgba[0].size());
29
30	// Assign appropriate parts of the buffer to image planes in m_frame_rgba
31	- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());
32	+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());
33
34	// Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame.
35	m_context->opaque = this;
36	- m_context->get_buffer = getBuffer;
37	- m_context->release_buffer = releaseBuffer;
38	+ m_context->get_buffer2 = getBuffer;
39	}
40
41
42	@@ -263,8 +262,8 @@ int FFmpegDecoderVideo::convert(AVPictur
43	#ifdef USE_SWSCALE
44	if (m_swscale_ctx==0)
45	{
46	- m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt,
47	- src_width, src_height, (PixelFormat) dst_pix_fmt,
48	+ m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt,
49	+ src_width, src_height, (AVPixelFormat) dst_pix_fmt,
50	/SWS_BILINEAR/ SWS_BICUBIC, NULL, NULL, NULL);
51	}
52
53	@@ -311,14 +310,14 @@ void FFmpegDecoderVideo::publishFrame(co
54	AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
55
56	// Assign appropriate parts of the buffer to image planes in m_frame_rgba
57	- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height());
58	+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height());
59
60	// Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine
61
62	- if (m_context->pix_fmt == PIX_FMT_YUVA420P)
63	+ if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P)
64	yuva420pToRgba(dst, src, width(), height());
65	else
66	- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
67	+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
68
69	// Wait 'delay' seconds before publishing the picture.
70	int i_delay = static_cast<int>(delay * 1000000 + 0.5);
71	@@ -345,7 +344,7 @@ void FFmpegDecoderVideo::publishFrame(co
72
73	void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height)
74	{
75	- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
76	+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
77
78	const size_t bpp = 4;
79
80	@@ -363,31 +362,28 @@ void FFmpegDecoderVideo::yuva420pToRgba(
81	}
82	}
83
84	-
85	-
86	-int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture)
87	+int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags)
88	{
89	+ AVBufferRef *ref;
90	const FFmpegDecoderVideo * const this_ = reinterpret_cast<const FFmpegDecoderVideo*>(context->opaque);
91
92	- const int result = avcodec_default_get_buffer(context, picture);
93	+ const int result = avcodec_default_get_buffer2(context, picture, flags);
94	int64_t * p_pts = reinterpret_cast<int64_t*>( av_malloc(sizeof(int64_t)) );
95
96	*p_pts = this_->m_packet_pts;
97	picture->opaque = p_pts;
98
99	+ ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags);
100	+ picture->buf[0] = ref;
101	+
102	return result;
103	}
104
105	-
106	-
107	-void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture)
108	+void FFmpegDecoderVideo::freeBuffer(void opaque, uint8_t data)
109	{
110	- if (picture != 0)
111	- av_freep(&picture->opaque);
112	-
113	- avcodec_default_release_buffer(context, picture);
114	+ AVBufferRef ref = (AVBufferRef )opaque;
115	+ av_buffer_unref(&ref);
116	+ av_free(data);
117	}
118
119	-
120	-
121	} // namespace osgFFmpeg
122	--- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp.orig
123	+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
124	@@ -94,8 +94,8 @@ private:
125	int src_pix_fmt, int src_width, int src_height);
126
127
128	- static int getBuffer(AVCodecContext * context, AVFrame * picture);
129	- static void releaseBuffer(AVCodecContext * context, AVFrame * picture);
130	+ static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags);
131	+ static void freeBuffer(void * opaque, uint8_t *data);
132
133	PacketQueue & m_packets;
134	FFmpegClocks & m_clocks;
135	--- src/osgPlugins/ffmpeg/FFmpegParameters.cpp.orig
136	+++ src/osgPlugins/ffmpeg/FFmpegParameters.cpp
137	@@ -19,7 +19,7 @@ extern "C"
138	#include <libavutil/pixdesc.h>
139	}
140
141	-inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
142	+inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
143
144
145	namespace osgFFmpeg {
146	--- src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp.orig 2016-02-18 21:25:39.627923629 +0000
147	+++ src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2016-02-18 21:26:17.071140100 +0000
148	@@ -227,8 +227,7 @@
149	if (avcodec_open2(m_context, p_codec, NULL) < 0)
150	throw std::runtime_error("avcodec_open() failed");
151
152	- m_context->get_buffer = avcodec_default_get_buffer;
153	- m_context->release_buffer = avcodec_default_release_buffer;
154	+ m_context->get_buffer2 = avcodec_default_get_buffer2;
155
156	}
157

Lines 2-8 Link Here

(-)b/graphics/osg/Makefile (-5 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= osg	4	PORTNAME= osg
5	PORTVERSION= 3.4.1	5	PORTVERSION= 3.6.2
6	DISTVERSIONPREFIX= OpenSceneGraph-	6	DISTVERSIONPREFIX= OpenSceneGraph-
7	PORTREVISION= 1	7	PORTREVISION= 1
8	CATEGORIES= graphics	8	CATEGORIES= graphics
Lines 22-28 USE_GITHUB= yes Link Here
22	GH_ACCOUNT= openscenegraph	22	GH_ACCOUNT= openscenegraph
23	GH_PROJECT= OpenSceneGraph	23	GH_PROJECT= OpenSceneGraph
24		24
25	CONFLICTS= osg-devel-[0-9]*	25	CONFLICTS= osg34-[0-9]* osg-devel-[0-9]*
26		26
27	USES= alias cmake:outsource jpeg pkgconfig	27	USES= alias cmake:outsource jpeg pkgconfig
28	USE_GL= gl glu	28	USE_GL= gl glu
Lines 30-38 USE_XORG= x11 Link Here
30	USE_LDCONFIG= yes	30	USE_LDCONFIG= yes
31		31
32	PLIST_SUB= OSG_VERSION=${PORTVERSION} \	32	PLIST_SUB= OSG_VERSION=${PORTVERSION} \
33	OSG_SHLIBVER=131 \	33	OSG_SHLIBVER=157 \
34	OPENTHREADS_VERSION=3.3.0 \	34	OPENTHREADS_VERSION=3.3.1 \
35	OPENTHREADS_SHLIBVER=20	35	OPENTHREADS_SHLIBVER=21
36		36
37	PORTSCOUT= limitw:1,even	37	PORTSCOUT= limitw:1,even
38		38

Lines 1-15 Link Here

(-)b/graphics/osg/files/patch-CMakeLists.txt (-10 lines)
1	--- CMakeLists.txt.orig 2017-08-28 16:50:49 UTC	1	--- CMakeLists.txt.orig 2017-08-28 16:50:49 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -252,6 +252,9 @@ ENDIF()
4
5	INCLUDE_DIRECTORIES(
6	${OpenSceneGraph_SOURCE_DIR}/include
7	+)
8	+
9	+INCLUDE_DIRECTORIES(SYSTEM
10	${OPENGL_INCLUDE_DIR}
11	)
12
13	@@ -846,7 +849,7 @@ ENDIF()	3	@@ -846,7 +849,7 @@ ENDIF()
14		4
15	IF(UNIX AND NOT WIN32 AND NOT APPLE)	5	IF(UNIX AND NOT WIN32 AND NOT APPLE)

Removed Link Here

(-)a/graphics/osg/files/patch-CMakeModules-FindGTA.cmake (-25 lines)
1	--- CMakeModules/FindGTA.cmake.orig 2014-01-19 17:46:13.693927259 +0400
2	+++ CMakeModules/FindGTA.cmake 2014-01-19 18:38:17.868997891 +0400
3	@@ -8,16 +8,6 @@
4	# correspond to the ./configure --prefix=$GTA_DIR
5	# used in building libgta.
6
7	-INCLUDE(FindPkgConfig OPTIONAL)
8	-
9	-IF(PKG_CONFIG_FOUND)
10	-
11	- INCLUDE(FindPkgConfig)
12	-
13	- PKG_CHECK_MODULES(GTA gta)
14	-
15	-ELSE(PKG_CONFIG_FOUND)
16	-
17	FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
18	$ENV{GTA_DIR}/include
19	$ENV{GTA_DIR}
20	@@ -52,5 +42,3 @@
21	IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
22	SET(GTA_FOUND "YES")
23	ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
24	-
25	-ENDIF(PKG_CONFIG_FOUND)

Lines 1-5 Link Here

(-)b/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp (-30 / +12 lines)
1	--- src/OpenThreads/pthreads/PThread.cpp.orig 2011-06-24 00:09:26.000000000 +0400	1	--- src/OpenThreads/pthreads/PThread.cpp.orig 2018-06-29 12:56:35.000000000 +0300
2	+++ src/OpenThreads/pthreads/PThread.cpp 2012-03-05 05:57:02.886704932 +0400	2	+++ src/OpenThreads/pthreads/PThread.cpp 2018-07-12 22:10:15.672946000 +0300
3	@@ -21,6 +21,7 @@	3	@@ -21,6 +21,7 @@
4	#include <sys/types.h>	4	#include <sys/types.h>
5	#include <unistd.h>	5	#include <unistd.h>
Lines 7-37 Link Here
7	+#include <pthread_np.h>	7	+#include <pthread_np.h>
8	#include <limits.h>	8	#include <limits.h>
9		9
10	#if defined __linux \|\| defined __sun \|\| defined __APPLE__ \|\| ANDROID	10	#if defined __linux__ \|\| defined __sun \|\| defined __APPLE__ \|\| ANDROID
11	@@ -136,7 +137,7 @@	11	@@ -113,7 +114,7 @@
12	#if defined(__sgi)	12	static void setAffinity(const Affinity& affinity)
13	pthread_setrunon_np( pd->cpunum );	13	{
14	#elif defined(HAVE_PTHREAD_SETAFFINITY_NP) \|\| defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) \|\| defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)	14	//std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <<std::endl;
15	- cpu_set_t cpumask;	15	- cpu_set_t cpumask;
16	+ cpuset_t cpumask;	16	+ cpuset_t cpumask;
17	CPU_ZERO( &cpumask );	17	CPU_ZERO( &cpumask );
18	CPU_SET( pd->cpunum, &cpumask );	18	unsigned int numprocessors = OpenThreads::GetNumberOfProcessors();
19		19	if (affinity)
20	@@ -569,7 +570,7 @@
21
22	if (pd->isRunning && Thread::CurrentThread()==this)
23	{
24	- cpu_set_t cpumask;
25	+ cpuset_t cpumask;
26	CPU_ZERO( &cpumask );
27	CPU_SET( pd->cpunum, &cpumask );
28	#if defined(HAVE_PTHREAD_SETAFFINITY_NP)
29	@@ -1031,7 +1032,7 @@
30	else
31	{
32	#if defined(HAVE_PTHREAD_SETAFFINITY_NP) \|\| defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) \|\| defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
33	- cpu_set_t cpumask;
34	+ cpuset_t cpumask;
35	CPU_ZERO( &cpumask );
36	CPU_SET( cpunum, &cpumask );
37	#if defined(HAVE_PTHREAD_SETAFFINITY_NP)

Added Link Here

(-)b/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt (+15 lines)
1	--- src/osgViewer/CMakeLists.txt.orig 2018-07-12 22:49:36.402831000 +0300
2	+++ src/osgViewer/CMakeLists.txt 2018-07-12 22:51:29.430404000 +0300
3	@@ -214,12 +214,6 @@
4	ENDIF()
5	ENDIF()
6
7	- IF(OSGVIEWER_USE_XINERAMA)
8	- ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA)
9	- SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} )
10	- SET(LIB_EXTRA_LIBS -lXinerama ${LIB_EXTRA_LIBS})
11	- ENDIF()
12	-
13	# X11 on Apple requires X11 library plus OpenGL linking hack on Leopard
14	IF(APPLE)
15	# hack for finding the iphone opengl es lib

Lines 4-9 bin/osgfilecache Link Here

(-)b/graphics/osg/pkg-plist (-5 / +18 lines)
4	bin/osgversion	4	bin/osgversion
5	bin/osgviewer	5	bin/osgviewer
6	bin/present3D	6	bin/present3D
		7	include/OpenThreads/Affinity
7	include/OpenThreads/Atomic	8	include/OpenThreads/Atomic
8	include/OpenThreads/Barrier	9	include/OpenThreads/Barrier
9	include/OpenThreads/Block	10	include/OpenThreads/Block
Lines 21-30 include/osg/AnimationPath Link Here
21	include/osg/ApplicationUsage	22	include/osg/ApplicationUsage
22	include/osg/ArgumentParser	23	include/osg/ArgumentParser
23	include/osg/Array	24	include/osg/Array
24	include/osg/ArrayDispatchers	25	include/osg/AttributeDispatchers
25	include/osg/AudioStream	26	include/osg/AudioStream
26	include/osg/AutoTransform	27	include/osg/AutoTransform
27	include/osg/Billboard	28	include/osg/Billboard
		29	include/osg/BindImageTexture
28	include/osg/BlendColor	30	include/osg/BlendColor
29	include/osg/BlendEquation	31	include/osg/BlendEquation
30	include/osg/BlendEquationi	32	include/osg/BlendEquationi
Lines 52-57 include/osg/ColorMaski Link Here
52	include/osg/ColorMatrix	54	include/osg/ColorMatrix
53	include/osg/ComputeBoundsVisitor	55	include/osg/ComputeBoundsVisitor
54	include/osg/Config	56	include/osg/Config
		57	include/osg/ContextData
55	include/osg/ConvexPlanarOccluder	58	include/osg/ConvexPlanarOccluder
56	include/osg/ConvexPlanarPolygon	59	include/osg/ConvexPlanarPolygon
57	include/osg/CoordinateSystemNode	60	include/osg/CoordinateSystemNode
Lines 62-67 include/osg/CullStack Link Here
62	include/osg/CullingSet	65	include/osg/CullingSet
63	include/osg/DeleteHandler	66	include/osg/DeleteHandler
64	include/osg/Depth	67	include/osg/Depth
		68	include/osg/DepthRangeIndexed
		69	include/osg/DispatchCompute
65	include/osg/DisplaySettings	70	include/osg/DisplaySettings
66	include/osg/DrawPixels	71	include/osg/DrawPixels
67	include/osg/Drawable	72	include/osg/Drawable
Lines 74-80 include/osg/FrameStamp Link Here
74	include/osg/FrontFace	79	include/osg/FrontFace
75	include/osg/GL	80	include/osg/GL
76	include/osg/GL2Extensions	81	include/osg/GL2Extensions
77	include/osg/GLBeginEndAdapter
78	include/osg/GLDefines	82	include/osg/GLDefines
79	include/osg/GLExtensions	83	include/osg/GLExtensions
80	include/osg/GLObjects	84	include/osg/GLObjects
Lines 86-91 include/osg/GraphicsCostEstimator Link Here
86	include/osg/GraphicsThread	90	include/osg/GraphicsThread
87	include/osg/Group	91	include/osg/Group
88	include/osg/Hint	92	include/osg/Hint
		93	include/osg/Identifier
89	include/osg/Image	94	include/osg/Image
90	include/osg/ImageSequence	95	include/osg/ImageSequence
91	include/osg/ImageStream	96	include/osg/ImageStream
Lines 130-135 include/osg/Polytope Link Here
130	include/osg/PositionAttitudeTransform	135	include/osg/PositionAttitudeTransform
131	include/osg/PrimitiveRestartIndex	136	include/osg/PrimitiveRestartIndex
132	include/osg/PrimitiveSet	137	include/osg/PrimitiveSet
		138	include/osg/PrimitiveSetIndirect
133	include/osg/Program	139	include/osg/Program
134	include/osg/Projection	140	include/osg/Projection
135	include/osg/ProxyNode	141	include/osg/ProxyNode
Lines 137-143 include/osg/Quat Link Here
137	include/osg/Referenced	143	include/osg/Referenced
138	include/osg/RenderInfo	144	include/osg/RenderInfo
139	include/osg/SampleMaski	145	include/osg/SampleMaski
		146	include/osg/Sampler
140	include/osg/Scissor	147	include/osg/Scissor
		148	include/osg/ScissorIndexed
141	include/osg/ScriptEngine	149	include/osg/ScriptEngine
142	include/osg/Sequence	150	include/osg/Sequence
143	include/osg/ShadeModel	151	include/osg/ShadeModel
Lines 156-161 include/osg/Stencil Link Here
156	include/osg/StencilTwoSided	164	include/osg/StencilTwoSided
157	include/osg/Switch	165	include/osg/Switch
158	include/osg/TemplatePrimitiveFunctor	166	include/osg/TemplatePrimitiveFunctor
		167	include/osg/TemplatePrimitiveIndexFunctor
159	include/osg/TexEnv	168	include/osg/TexEnv
160	include/osg/TexEnvCombine	169	include/osg/TexEnvCombine
161	include/osg/TexEnvFilter	170	include/osg/TexEnvFilter
Lines 180-186 include/osg/TriangleLinePointIndexFunctor Link Here
180	include/osg/Types	189	include/osg/Types
181	include/osg/Uniform	190	include/osg/Uniform
182	include/osg/UserDataContainer	191	include/osg/UserDataContainer
		192	include/osg/ValueMap
183	include/osg/ValueObject	193	include/osg/ValueObject
		194	include/osg/ValueStack
184	include/osg/Vec2	195	include/osg/Vec2
185	include/osg/Vec2b	196	include/osg/Vec2b
186	include/osg/Vec2d	197	include/osg/Vec2d
Lines 209-222 include/osg/Vec4ub Link Here
209	include/osg/Vec4ui	220	include/osg/Vec4ui
210	include/osg/Vec4us	221	include/osg/Vec4us
211	include/osg/Version	222	include/osg/Version
		223	include/osg/VertexArrayState
212	include/osg/VertexAttribDivisor	224	include/osg/VertexAttribDivisor
213	include/osg/VertexProgram	225	include/osg/VertexProgram
214	include/osg/View	226	include/osg/View
215	include/osg/Viewport	227	include/osg/Viewport
		228	include/osg/ViewportIndexed
216	include/osg/buffered_value	229	include/osg/buffered_value
217	include/osg/fast_back_stack	230	include/osg/fast_back_stack
218	include/osg/io_utils	231	include/osg/io_utils
219	include/osg/observer_ptr	232	include/osg/observer_ptr
		233	include/osg/os_utils
220	include/osg/ref_ptr	234	include/osg/ref_ptr
221	include/osgAnimation/Action	235	include/osgAnimation/Action
222	include/osgAnimation/ActionAnimation	236	include/osgAnimation/ActionAnimation
Lines 240-245 include/osgAnimation/Interpolator Link Here
240	include/osgAnimation/Keyframe	254	include/osgAnimation/Keyframe
241	include/osgAnimation/LinkVisitor	255	include/osgAnimation/LinkVisitor
242	include/osgAnimation/MorphGeometry	256	include/osgAnimation/MorphGeometry
		257	include/osgAnimation/MorphTransformHardware
		258	include/osgAnimation/MorphTransformSoftware
243	include/osgAnimation/RigGeometry	259	include/osgAnimation/RigGeometry
244	include/osgAnimation/RigTransform	260	include/osgAnimation/RigTransform
245	include/osgAnimation/RigTransformHardware	261	include/osgAnimation/RigTransformHardware
Lines 437-450 include/osgShadow/LightSpacePerspectiveShadowMap Link Here
437	include/osgShadow/MinimalCullBoundsShadowMap	453	include/osgShadow/MinimalCullBoundsShadowMap
438	include/osgShadow/MinimalDrawBoundsShadowMap	454	include/osgShadow/MinimalDrawBoundsShadowMap
439	include/osgShadow/MinimalShadowMap	455	include/osgShadow/MinimalShadowMap
440	include/osgShadow/OccluderGeometry
441	include/osgShadow/ParallelSplitShadowMap	456	include/osgShadow/ParallelSplitShadowMap
442	include/osgShadow/ProjectionShadowMap	457	include/osgShadow/ProjectionShadowMap
443	include/osgShadow/ShadowMap	458	include/osgShadow/ShadowMap
444	include/osgShadow/ShadowSettings	459	include/osgShadow/ShadowSettings
445	include/osgShadow/ShadowTechnique	460	include/osgShadow/ShadowTechnique
446	include/osgShadow/ShadowTexture	461	include/osgShadow/ShadowTexture
447	include/osgShadow/ShadowVolume
448	include/osgShadow/ShadowedScene	462	include/osgShadow/ShadowedScene
449	include/osgShadow/SoftShadowMap	463	include/osgShadow/SoftShadowMap
450	include/osgShadow/StandardShadowMap	464	include/osgShadow/StandardShadowMap
Lines 692-698 lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgviewer.so Link Here
692	lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so	706	lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so
693	lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so	707	lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so
694	lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so	708	lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so
695	lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so
696	lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so	709	lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so
697	%%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so	710	%%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so
698	%%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so	711	%%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so

Added Link Here

(-)b/graphics/osg34/files/patch-shift-key-fix (+23 lines)
1	# Shift key not released if group switch is something other than Control-Shift:
2	# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1218650.html
3
4	--- src/osgGA/EventQueue.cpp.orig
5	+++ src/osgGA/EventQueue.cpp
6	@@ -337,7 +337,7 @@ void EventQueue::mouseButtonRelease(floa
7
8	void EventQueue::keyPress(int key, double time, int unmodifiedKey)
9	{
10	- switch(key)
11	+ switch(unmodifiedKey)
12	{
13	case(GUIEventAdapter::KEY_Shift_L): _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_SHIFT \| _accumulateEventState->getModKeyMask()); break;
14	case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_SHIFT \| _accumulateEventState->getModKeyMask()); break;
15	@@ -381,7 +381,7 @@ void EventQueue::keyPress(int key, doubl
16
17	void EventQueue::keyRelease(int key, double time, int unmodifiedKey)
18	{
19	- switch(key)
20	+ switch(unmodifiedKey)
21	{
22	case(GUIEventAdapter::KEY_Shift_L): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_SHIFT & _accumulateEventState->getModKeyMask()); break;
23	case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_SHIFT & _accumulateEventState->getModKeyMask()); break;