Attachment #169697 for bug #209056

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




# $FreeBSD$

PORTNAME=	osg
PORTVERSION=	3.4.0
PORTREVISION=	8
CATEGORIES=	graphics
MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
		http://mirror.amdmi3.ru/distfiles/

USE_LDCONFIG=	yes

PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
		OSG_SHLIBVER=130 \
		OPENTHREADS_VERSION=3.3.0 \
		OPENTHREADS_SHLIBVER=20

PORTSCOUT=	limitw:1,even

OPTIONS_DEFINE=	CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \
		JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \
		SVG VNC XINE XRANDR
OPTIONS_RADIO=	QT
OPTIONS_RADIO_QT=QT4 QT5
OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR

GDAL_DESC=	GDAL support
GTA_DESC=	GTA file format support
INVENTOR_DESC=	SGI OpenInventor support
LIBLAS_DESC=	liblas support
NVTT_DESC=	Use NVidia texture tools
QT_DESC=	QT toolkit support (optional)
SDL_DESC=	Use SDL (joystick support in present3d)
VNC_DESC=	LibVNCServer support
SDL_DESC=	Use SDL (joystick support in present3d)
NVTT_DESC=	Use NVidia texture tools

OPTIONS_SUB=	yes

CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
CURL_VARS=		FORCE_REQUIRE+=CURL
CURL_VARS_OFF=		FORCE_IGNORE+=CURL
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
FFMPEG_VARS=		FORCE_REQUIRE+=FFmpeg
FFMPEG_VARS_OFF=	FORCE_IGNORE+=FFmpeg
FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
FREETYPE_VARS=		FORCE_REQUIRE+=Freetype
FREETYPE_VARS_OFF=	FORCE_IGNORE+=Freetype
GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
GDAL_VARS=		FORCE_REQUIRE+=GDAL
GDAL_VARS_OFF=		FORCE_IGNORE+=GDAL
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
GIF_VARS=		FORCE_REQUIRE+=GIFLIB
GIF_VARS_OFF=		FORCE_IGNORE+=GIFLIB
GSTREAMER_USE=		gnome=glib20 GSTREAMER1=yes
GSTREAMER_VARS=		FORCE_REQUIRE+=GStreamer
GSTREAMER_VARS_OFF=	FORCE_IGNORE+=GStreamer
GSTREAMER_BROKEN=	fails when linking gstreamer plugin, with error cannot find -lgstreamer-1.0
GTA_LIB_DEPENDS=	libgta.so:devel/libgta
GTA_VARS=		FORCE_REQUIRE+=GTA
GTA_VARS_OFF=		FORCE_IGNORE+=GTA
INVENTOR_LIB_DEPENDS=	libInventor.so:graphics/inventor
INVENTOR_VARS=		FORCE_REQUIRE+=Inventor
INVENTOR_VARS_OFF=	FORCE_IGNORE+=Inventor
JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
JASPER_VARS=		FORCE_REQUIRE+=Jasper
JASPER_VARS_OFF=	FORCE_IGNORE+=Jasper
LIBLAS_LIB_DEPENDS=	liblas.so:devel/liblas
LIBLAS_VARS=		FORCE_REQUIRE+=LIBLAS
LIBLAS_VARS_OFF=	FORCE_IGNORE+=LIBLAS
LUA_USES=		lua:52
LUA_CMAKE_ON=		-DOSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF
LUA_VARS=		FORCE_IGNORE+=Lua51 FORCE_REQUIRE+=Lua52
LUA_VARS_OFF=		FORCE_IGNORE+="Lua51 Lua52"
NVTT_LIB_DEPENDS=	libnvtt.so:graphics/nvidia-texture-tools
NVTT_VARS=		FORCE_REQUIRE+=NVTT
NVTT_VARS_OFF=		FORCE_IGNORE+=NVTT
OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
OPENEXR_VARS=		FORCE_REQUIRE+=OpenEXR
OPENEXR_VARS_OFF=	FORCE_IGNORE+=OpenEXR
PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
PDF_USE=		gnome=cairo
PDF_VARS=		FORCE_REQUIRE+=Poppler-glib
PDF_VARS_OFF=		FORCE_IGNORE+=Poppler-glib
QT4_USE=		qt4=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_USE=		qt5=buildtools_build,core,gui,opengl,qmake_build,webkit
QT5_CMAKE_ON=		-DDESIRED_QT_VERSION=5
QT5_VARS=		FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
QT5_VARS_OFF=		FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
SDL_USE=		sdl=sdl
SDL_VARS=		FORCE_REQUIRE+=SDL
SDL_VARS_OFF=		FORCE_IGNORE+=SDL
SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
SVG_USE=		gnome=cairo
SVG_VARS=		FORCE_REQUIRE+=RSVG
SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
VNC_VARS=		FORCE_REQUIRE+=LibVNCServer
VNC_VARS_OFF=		FORCE_IGNORE+=LibVNCServer
XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
XINE_VARS=		FORCE_REQUIRE+=Xine
XINE_VARS_OFF=		FORCE_IGNORE+=Xine
XRANDR_CMAKE_ON=	-DOSGVIEWER_USE_XRANDR:BOOL=ON
XRANDR_CMAKE_OFF=	-DOSGVIEWER_USE_XRANDR:BOOL=OFF
XRANDR_USE=		xorg=xrandr
QT4_CMAKE_ON=		-DOSG_USE_QT=ON
QT4_CMAKE_OFF=		-DOSG_USE_QT=OFF

.include <bsd.port.options.mk>

# GUI toolkits are only needed for building examples, which are not even installed
FORCE_IGNORE=	FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2	# only for examples
FORCE_IGNORE+=	COLLADA Performer OurDCMTK XUL FBX		# not in ports
FORCE_IGNORE+=	OpenVRML					# ports version too old
FORCE_IGNORE+=	ITK						# ports version doesn't build on 10.x
FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB		# common & lightweight

.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCURL}
FORCE_REQUIRE+=	CURL
.else
FORCE_IGNORE+=	CURL
.endif

.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5}
CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=ON
PLIST_SUB+=		QT=""
.else
CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=OFF
PLIST_SUB+=		QT="@comment "
.endif

.if ${PORT_OPTIONS:MGDAL}
FORCE_REQUIRE+=	GDAL
.else
FORCE_IGNORE+=	GDAL
.endif

.if ${PORT_OPTIONS:MGIF}
FORCE_REQUIRE+=	GIFLIB
.else
FORCE_IGNORE+=	GIFLIB
.endif

.if ${PORT_OPTIONS:MINVENTOR}
FORCE_REQUIRE+=	Inventor
.else
FORCE_IGNORE+=	Inventor
.endif

.if ${PORT_OPTIONS:MJASPER}
FORCE_REQUIRE+=	Jasper
.else
FORCE_IGNORE+=	Jasper
.endif

.if ${PORT_OPTIONS:MXINE}
FORCE_REQUIRE+=	Xine
.else
FORCE_IGNORE+=	Xine
.endif

.if ${PORT_OPTIONS:MGTA}
FORCE_REQUIRE+=	GTA
.else
FORCE_IGNORE+=	GTA
.endif

.if ${PORT_OPTIONS:MVNC}
FORCE_REQUIRE+=	LibVNCServer
.else
FORCE_IGNORE+=	LibVNCServer
.endif

.if ${PORT_OPTIONS:MOPENEXR}
FORCE_REQUIRE+=	OpenEXR
.else
FORCE_IGNORE+=	OpenEXR
.endif

.if ${PORT_OPTIONS:MFFMPEG}
FORCE_REQUIRE+=	FFmpeg
.else
FORCE_IGNORE+=	FFmpeg
.endif

.if ${PORT_OPTIONS:MSDL}
FORCE_REQUIRE+=	SDL
.else
FORCE_IGNORE+=	SDL
.endif

.if ${PORT_OPTIONS:MNVTT}
FORCE_REQUIRE+=	NVTT
.else
FORCE_IGNORE+=	NVTT
.endif

# options that affect PKG_CHECK_MODULES
.if ${PORT_OPTIONS:MSVG}
FORCE_REQUIRE+=	RSVG
.else
FORCE_IGNORE+=	RSVG
.endif

.if ${PORT_OPTIONS:MPDF}
FORCE_REQUIRE+=	Poppler-glib
.else
FORCE_IGNORE+=	Poppler-glib
.endif

.if ${PORT_OPTIONS:MSVG} || ${PORT_OPTIONS:MPDF}
USE_GNOME=	cairo
.endif

# other options
.if ${PORT_OPTIONS:MXRANDR}
USE_XORG+=	xrandr
.endif

post-patch:
	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \
		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'

Lines 1-2 Link Here

(-)graphics/osg/distinfo (-2 / +2 lines)
1	SHA256 (OpenSceneGraph-3.2.1.zip) = d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d	1	SHA256 (OpenSceneGraph-3.4.0.zip) = 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e3040e
2	SIZE (OpenSceneGraph-3.2.1.zip) = 7219212	2	SIZE (OpenSceneGraph-3.4.0.zip) = 7975023




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




--- src/osgPlugins/gif/ReaderWriterGIF.cpp.orig	2013-06-03 14:04:02 UTC
+++ src/osgPlugins/gif/ReaderWriterGIF.cpp
@@ -561,7 +561,11 @@ GifImageStream** obj)
     *width_ret = giffile->SWidth;
     *height_ret = giffile->SHeight;
     *numComponents_ret = 4;
+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
+    DGifCloseFile(giffile, NULL);
+#else
     DGifCloseFile(giffile);
+#endif
     return buffer;
 }
 




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/CameraNode
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/GL
include/osg/GL2Extensions
include/osg/GLBeginEndAdapter
include/osg/GLDefines
include/osg/GLExtensions
include/osg/GLObjects
include/osg/GLU

include/osg/RenderInfo
include/osg/SampleMaski
include/osg/Scissor
include/osg/ScriptEngine
include/osg/Sequence
include/osg/ShadeModel
include/osg/Shader

include/osg/Transform
include/osg/TriangleFunctor
include/osg/TriangleIndexFunctor
include/osg/Types
include/osg/Uniform
include/osg/UserDataContainer
include/osg/ValueObject

include/osg/Vec4ui
include/osg/Vec4us
include/osg/Version
include/osg/VertexAttribDivisor
include/osg/VertexProgram
include/osg/View
include/osg/Viewport

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/ImageProcessor
include/osgDB/Input
include/osgDB/InputStream
include/osgDB/ObjectCache
include/osgDB/ObjectWrapper
include/osgDB/Options
include/osgDB/Output

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/TrackballManipulator
include/osgGA/UFOManipulator
include/osgGA/Version
include/osgGA/Widget
include/osgManipulator/AntiSquish
include/osgManipulator/Command
include/osgManipulator/CommandManager

include/osgParticle/range
include/osgPresentation/AnimationMaterial
include/osgPresentation/CompileSlideCallback
include/osgPresentation/Cursor
include/osgPresentation/Export
include/osgPresentation/KeyEventHandler
include/osgPresentation/PickEventHandler

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/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/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/PolytopeIntersector
include/osgUtil/PositionalStateContainer
include/osgUtil/PrintVisitor
include/osgUtil/RayIntersector
include/osgUtil/ReflectionMapGenerator
include/osgUtil/RenderBin
include/osgUtil/RenderLeaf

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

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

%%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
%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.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_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_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_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
%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.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

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

Return to bug 209056

Lines 2-9 Link Here

(-)graphics/osg/Makefile (-124 / +84 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= osg	4	PORTNAME= osg
5	PORTVERSION= 3.2.1	5	PORTVERSION= 3.4.0
6	PORTREVISION= 8
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \	7	MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \
9	http://mirror.amdmi3.ru/distfiles/	8	http://mirror.amdmi3.ru/distfiles/
Lines 28-183 Link Here
28	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
29		28
30	PLIST_SUB= OSG_VERSION=${PORTVERSION} \	29	PLIST_SUB= OSG_VERSION=${PORTVERSION} \
31	OSG_SHLIBVER=100 \	30	OSG_SHLIBVER=130 \
32	OPENTHREADS_VERSION=${PORTVERSION} \	31	OPENTHREADS_VERSION=3.3.0 \
33	OPENTHREADS_SHLIBVER=20	32	OPENTHREADS_SHLIBVER=20
34		33
35	PORTSCOUT= limitw:1,even	34	PORTSCOUT= limitw:1,even
36		35
37	OPTIONS_DEFINE= CURL FREETYPE GDAL GIF INVENTOR JASPER XINE GTA \	36	OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \
38	VNC OPENEXR FFMPEG SVG PDF SDL NVTT QT4 XRANDR	37	JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \
39	OPTIONS_DEFAULT=FREETYPE GIF FFMPEG XRANDR	38	SVG VNC XINE XRANDR
		39	OPTIONS_RADIO= QT
		40	OPTIONS_RADIO_QT=QT4 QT5
		41	OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR
40		42
41	GDAL_DESC= GDAL support	43	GDAL_DESC= GDAL support
		44	GTA_DESC= GTA file format support
42	INVENTOR_DESC= SGI OpenInventor support	45	INVENTOR_DESC= SGI OpenInventor support
43	GTA_DESC= GTA file format support	46	LIBLAS_DESC= liblas support
		47	NVTT_DESC= Use NVidia texture tools
		48	QT_DESC= QT toolkit support (optional)
		49	SDL_DESC= Use SDL (joystick support in present3d)
44	VNC_DESC= LibVNCServer support	50	VNC_DESC= LibVNCServer support
45	SDL_DESC= Use SDL (joystick support in present3d)
46	NVTT_DESC= Use NVidia texture tools
47		51
48	OPTIONS_SUB= yes	52	OPTIONS_SUB= yes
49		53
50	CURL_LIB_DEPENDS= libcurl.so:ftp/curl	54	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
		55	CURL_VARS= FORCE_REQUIRE+=CURL
		56	CURL_VARS_OFF= FORCE_IGNORE+=CURL
		57	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
		58	FFMPEG_VARS= FORCE_REQUIRE+=FFmpeg
		59	FFMPEG_VARS_OFF= FORCE_IGNORE+=FFmpeg
51	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2	60	FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2
		61	FREETYPE_VARS= FORCE_REQUIRE+=Freetype
		62	FREETYPE_VARS_OFF= FORCE_IGNORE+=Freetype
52	GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal	63	GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal
		64	GDAL_VARS= FORCE_REQUIRE+=GDAL
		65	GDAL_VARS_OFF= FORCE_IGNORE+=GDAL
53	GIF_LIB_DEPENDS= libgif.so:graphics/giflib	66	GIF_LIB_DEPENDS= libgif.so:graphics/giflib
		67	GIF_VARS= FORCE_REQUIRE+=GIFLIB
		68	GIF_VARS_OFF= FORCE_IGNORE+=GIFLIB
		69	GSTREAMER_USE= gnome=glib20 GSTREAMER1=yes
		70	GSTREAMER_VARS= FORCE_REQUIRE+=GStreamer
		71	GSTREAMER_VARS_OFF= FORCE_IGNORE+=GStreamer
		72	GSTREAMER_BROKEN= fails when linking gstreamer plugin, with error cannot find -lgstreamer-1.0
		73	GTA_LIB_DEPENDS= libgta.so:devel/libgta
		74	GTA_VARS= FORCE_REQUIRE+=GTA
		75	GTA_VARS_OFF= FORCE_IGNORE+=GTA
54	INVENTOR_LIB_DEPENDS= libInventor.so:graphics/inventor	76	INVENTOR_LIB_DEPENDS= libInventor.so:graphics/inventor
		77	INVENTOR_VARS= FORCE_REQUIRE+=Inventor
		78	INVENTOR_VARS_OFF= FORCE_IGNORE+=Inventor
55	JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper	79	JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper
56	XINE_LIB_DEPENDS= libxine.so:multimedia/libxine	80	JASPER_VARS= FORCE_REQUIRE+=Jasper
57	GTA_LIB_DEPENDS= libgta.so:devel/libgta	81	JASPER_VARS_OFF= FORCE_IGNORE+=Jasper
58	VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver	82	LIBLAS_LIB_DEPENDS= liblas.so:devel/liblas
		83	LIBLAS_VARS= FORCE_REQUIRE+=LIBLAS
		84	LIBLAS_VARS_OFF= FORCE_IGNORE+=LIBLAS
		85	LUA_USES= lua:52
		86	LUA_CMAKE_ON= -DOSG_USE_LOCAL_LUA_SOURCE:BOOL=OFF
		87	LUA_VARS= FORCE_IGNORE+=Lua51 FORCE_REQUIRE+=Lua52
		88	LUA_VARS_OFF= FORCE_IGNORE+="Lua51 Lua52"
		89	NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools
		90	NVTT_VARS= FORCE_REQUIRE+=NVTT
		91	NVTT_VARS_OFF= FORCE_IGNORE+=NVTT
59	OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR	92	OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
60	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	93	OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR
		94	OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR
		95	PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
		96	PDF_USE= gnome=cairo
		97	PDF_VARS= FORCE_REQUIRE+=Poppler-glib
		98	PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib
		99	QT4_USE= qt4=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
		100	QT4_CMAKE_ON= -DDESIRED_QT_VERSION=4
		101	QT4_VARS= FORCE_REQUIRE+=Qt4
		102	QT4_VARS_OFF= FORCE_IGNORE+=Qt4
		103	QT5_USE= qt5=buildtools_build,core,gui,opengl,qmake_build,webkit
		104	QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5
		105	QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets"
		106	QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets"
		107	SDL_USE= sdl=sdl
		108	SDL_VARS= FORCE_REQUIRE+=SDL
		109	SDL_VARS_OFF= FORCE_IGNORE+=SDL
61	SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2	110	SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
62	PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib	111	SVG_USE= gnome=cairo
63	SDL_USE= SDL=sdl	112	SVG_VARS= FORCE_REQUIRE+=RSVG
64	NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools	113	SVG_VARS_OFF= FORCE_IGNORE+=RSVG
		114	VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver
		115	VNC_VARS= FORCE_REQUIRE+=LibVNCServer
		116	VNC_VARS_OFF= FORCE_IGNORE+=LibVNCServer
		117	XINE_LIB_DEPENDS= libxine.so:multimedia/libxine
		118	XINE_VARS= FORCE_REQUIRE+=Xine
		119	XINE_VARS_OFF= FORCE_IGNORE+=Xine
65	XRANDR_CMAKE_ON= -DOSGVIEWER_USE_XRANDR:BOOL=ON	120	XRANDR_CMAKE_ON= -DOSGVIEWER_USE_XRANDR:BOOL=ON
66	XRANDR_CMAKE_OFF= -DOSGVIEWER_USE_XRANDR:BOOL=OFF	121	XRANDR_CMAKE_OFF= -DOSGVIEWER_USE_XRANDR:BOOL=OFF
67	QT4_USE= QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build	122	XRANDR_USE= xorg=xrandr
68	QT4_CMAKE_ON= -DOSG_USE_QT=ON
69	QT4_CMAKE_OFF= -DOSG_USE_QT=OFF
70		123
71	.include <bsd.port.options.mk>
72
73	# GUI toolkits are only needed for building examples, which are not even installed	124	# GUI toolkits are only needed for building examples, which are not even installed
74	FORCE_IGNORE= FLTK GLUT FOX Qt3 Qt5Widgets wxWidgets OpenAL GtkGl # only for examples	125	FORCE_IGNORE= FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2 # only for examples
75	FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL FBX # not in ports	126	FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL FBX # not in ports
76	FORCE_IGNORE+= OpenVRML # ports version too old	127	FORCE_IGNORE+= OpenVRML # ports version too old
77	FORCE_IGNORE+= ITK # ports version doesn't build on 10.x	128	FORCE_IGNORE+= ITK # ports version doesn't build on 10.x
78	FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight	129	FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight
79		130
80	# options that affect FIND_PACKAGE	131	.include <bsd.port.options.mk>
81	.if ${PORT_OPTIONS:MCURL}
82	FORCE_REQUIRE+= CURL
83	.else
84	FORCE_IGNORE+= CURL
85	.endif
86		132
87	.if ${PORT_OPTIONS:MFREETYPE}	133	.if ${PORT_OPTIONS:MQT4} \|\| ${PORT_OPTIONS:MQT5}
88	FORCE_REQUIRE+= FreeType	134	CMAKE_ARGS+= -DOSG_USE_QT:BOOL=ON
		135	PLIST_SUB+= QT=""
89	.else	136	.else
90	FORCE_IGNORE+= FreeType	137	CMAKE_ARGS+= -DOSG_USE_QT:BOOL=OFF
		138	PLIST_SUB+= QT="@comment "
91	.endif	139	.endif
92		140
93	.if ${PORT_OPTIONS:MGDAL}
94	FORCE_REQUIRE+= GDAL
95	.else
96	FORCE_IGNORE+= GDAL
97	.endif
98
99	.if ${PORT_OPTIONS:MGIF}
100	FORCE_REQUIRE+= GIFLIB
101	.else
102	FORCE_IGNORE+= GIFLIB
103	.endif
104
105	.if ${PORT_OPTIONS:MINVENTOR}
106	FORCE_REQUIRE+= Inventor
107	.else
108	FORCE_IGNORE+= Inventor
109	.endif
110
111	.if ${PORT_OPTIONS:MJASPER}
112	FORCE_REQUIRE+= Jasper
113	.else
114	FORCE_IGNORE+= Jasper
115	.endif
116
117	.if ${PORT_OPTIONS:MXINE}
118	FORCE_REQUIRE+= Xine
119	.else
120	FORCE_IGNORE+= Xine
121	.endif
122
123	.if ${PORT_OPTIONS:MGTA}
124	FORCE_REQUIRE+= GTA
125	.else
126	FORCE_IGNORE+= GTA
127	.endif
128
129	.if ${PORT_OPTIONS:MVNC}
130	FORCE_REQUIRE+= LibVNCServer
131	.else
132	FORCE_IGNORE+= LibVNCServer
133	.endif
134
135	.if ${PORT_OPTIONS:MOPENEXR}
136	FORCE_REQUIRE+= OpenEXR
137	.else
138	FORCE_IGNORE+= OpenEXR
139	.endif
140
141	.if ${PORT_OPTIONS:MFFMPEG}
142	FORCE_REQUIRE+= FFmpeg
143	.else
144	FORCE_IGNORE+= FFmpeg
145	.endif
146
147	.if ${PORT_OPTIONS:MSDL}
148	FORCE_REQUIRE+= SDL
149	.else
150	FORCE_IGNORE+= SDL
151	.endif
152
153	.if ${PORT_OPTIONS:MNVTT}
154	FORCE_REQUIRE+= NVTT
155	.else
156	FORCE_IGNORE+= NVTT
157	.endif
158
159	# options that affect PKG_CHECK_MODULES
160	.if ${PORT_OPTIONS:MSVG}
161	FORCE_REQUIRE+= RSVG
162	.else
163	FORCE_IGNORE+= RSVG
164	.endif
165
166	.if ${PORT_OPTIONS:MPDF}
167	FORCE_REQUIRE+= Poppler-glib
168	.else
169	FORCE_IGNORE+= Poppler-glib
170	.endif
171
172	.if ${PORT_OPTIONS:MSVG} \|\| ${PORT_OPTIONS:MPDF}
173	USE_GNOME= cairo
174	.endif
175
176	# other options
177	.if ${PORT_OPTIONS:MXRANDR}
178	USE_XORG+= xrandr
179	.endif
180
181	post-patch:	141	post-patch:
182	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 \| ${XARGS} -0 \	142	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 \| ${XARGS} -0 \
183	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g'	143	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g'

Line 0 Link Here

(-)graphics/osg/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 1-14 Link Here

(-)graphics/osg/files/patch-src_osgPlugins_gif_ReaderWriterGIF.cpp (-14 lines)
1	--- src/osgPlugins/gif/ReaderWriterGIF.cpp.orig 2013-06-03 14:04:02 UTC
2	+++ src/osgPlugins/gif/ReaderWriterGIF.cpp
3	@@ -561,7 +561,11 @@ GifImageStream** obj)
4	*width_ret = giffile->SWidth;
5	*height_ret = giffile->SHeight;
6	*numComponents_ret = 4;
7	+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 \|\| GIFLIB_MAJOR > 5
8	+ DGifCloseFile(giffile, NULL);
9	+#else
10	DGifCloseFile(giffile);
11	+#endif
12	return buffer;
13	}
14

Lines 27-48 Link Here

(-)graphics/osg/pkg-plist (-13 / +65 lines)
27	include/osg/Billboard	27	include/osg/Billboard
28	include/osg/BlendColor	28	include/osg/BlendColor
29	include/osg/BlendEquation	29	include/osg/BlendEquation
		30	include/osg/BlendEquationi
30	include/osg/BlendFunc	31	include/osg/BlendFunc
		32	include/osg/BlendFunci
31	include/osg/BoundingBox	33	include/osg/BoundingBox
32	include/osg/BoundingSphere	34	include/osg/BoundingSphere
33	include/osg/BoundsChecking	35	include/osg/BoundsChecking
34	include/osg/BufferIndexBinding	36	include/osg/BufferIndexBinding
35	include/osg/BufferObject	37	include/osg/BufferObject
		38	include/osg/BufferTemplate
		39	include/osg/Callback
36	include/osg/Camera	40	include/osg/Camera
37	include/osg/CameraNode
38	include/osg/CameraView	41	include/osg/CameraView
		42	include/osg/Capability
39	include/osg/ClampColor	43	include/osg/ClampColor
40	include/osg/ClearNode	44	include/osg/ClearNode
		45	include/osg/ClipControl
41	include/osg/ClipNode	46	include/osg/ClipNode
42	include/osg/ClipPlane	47	include/osg/ClipPlane
43	include/osg/ClusterCullingCallback	48	include/osg/ClusterCullingCallback
44	include/osg/CollectOccludersVisitor	49	include/osg/CollectOccludersVisitor
45	include/osg/ColorMask	50	include/osg/ColorMask
		51	include/osg/ColorMaski
46	include/osg/ColorMatrix	52	include/osg/ColorMatrix
47	include/osg/ComputeBoundsVisitor	53	include/osg/ComputeBoundsVisitor
48	include/osg/Config	54	include/osg/Config
Lines 69-74 Link Here
69	include/osg/GL	75	include/osg/GL
70	include/osg/GL2Extensions	76	include/osg/GL2Extensions
71	include/osg/GLBeginEndAdapter	77	include/osg/GLBeginEndAdapter
		78	include/osg/GLDefines
72	include/osg/GLExtensions	79	include/osg/GLExtensions
73	include/osg/GLObjects	80	include/osg/GLObjects
74	include/osg/GLU	81	include/osg/GLU
Lines 131-136 Link Here
131	include/osg/RenderInfo	138	include/osg/RenderInfo
132	include/osg/SampleMaski	139	include/osg/SampleMaski
133	include/osg/Scissor	140	include/osg/Scissor
		141	include/osg/ScriptEngine
134	include/osg/Sequence	142	include/osg/Sequence
135	include/osg/ShadeModel	143	include/osg/ShadeModel
136	include/osg/Shader	144	include/osg/Shader
Lines 168-173 Link Here
168	include/osg/Transform	176	include/osg/Transform
169	include/osg/TriangleFunctor	177	include/osg/TriangleFunctor
170	include/osg/TriangleIndexFunctor	178	include/osg/TriangleIndexFunctor
		179	include/osg/Types
171	include/osg/Uniform	180	include/osg/Uniform
172	include/osg/UserDataContainer	181	include/osg/UserDataContainer
173	include/osg/ValueObject	182	include/osg/ValueObject
Lines 199-204 Link Here
199	include/osg/Vec4ui	208	include/osg/Vec4ui
200	include/osg/Vec4us	209	include/osg/Vec4us
201	include/osg/Version	210	include/osg/Version
		211	include/osg/VertexAttribDivisor
202	include/osg/VertexProgram	212	include/osg/VertexProgram
203	include/osg/View	213	include/osg/View
204	include/osg/Viewport	214	include/osg/Viewport
Lines 250-260 Link Here
250	include/osgAnimation/UpdateBone	260	include/osgAnimation/UpdateBone
251	include/osgAnimation/UpdateMaterial	261	include/osgAnimation/UpdateMaterial
252	include/osgAnimation/UpdateMatrixTransform	262	include/osgAnimation/UpdateMatrixTransform
		263	include/osgAnimation/UpdateUniform
253	include/osgAnimation/Vec3Packed	264	include/osgAnimation/Vec3Packed
254	include/osgAnimation/VertexInfluence	265	include/osgAnimation/VertexInfluence
255	include/osgDB/Archive	266	include/osgDB/Archive
256	include/osgDB/AuthenticationMap	267	include/osgDB/AuthenticationMap
257	include/osgDB/Callbacks	268	include/osgDB/Callbacks
		269	include/osgDB/ClassInterface
		270	include/osgDB/ConvertBase64
258	include/osgDB/ConvertUTF	271	include/osgDB/ConvertUTF
259	include/osgDB/DataTypes	272	include/osgDB/DataTypes
260	include/osgDB/DatabasePager	273	include/osgDB/DatabasePager
Lines 271-276 Link Here
271	include/osgDB/ImageProcessor	284	include/osgDB/ImageProcessor
272	include/osgDB/Input	285	include/osgDB/Input
273	include/osgDB/InputStream	286	include/osgDB/InputStream
		287	include/osgDB/ObjectCache
274	include/osgDB/ObjectWrapper	288	include/osgDB/ObjectWrapper
275	include/osgDB/Options	289	include/osgDB/Options
276	include/osgDB/Output	290	include/osgDB/Output
Lines 305-310 Link Here
305	include/osgGA/CameraViewSwitchManipulator	319	include/osgGA/CameraViewSwitchManipulator
306	include/osgGA/Device	320	include/osgGA/Device
307	include/osgGA/DriveManipulator	321	include/osgGA/DriveManipulator
		322	include/osgGA/Event
		323	include/osgGA/EventHandler
308	include/osgGA/EventQueue	324	include/osgGA/EventQueue
309	include/osgGA/EventVisitor	325	include/osgGA/EventVisitor
310	include/osgGA/Export	326	include/osgGA/Export
Lines 324-329 Link Here
324	include/osgGA/TrackballManipulator	340	include/osgGA/TrackballManipulator
325	include/osgGA/UFOManipulator	341	include/osgGA/UFOManipulator
326	include/osgGA/Version	342	include/osgGA/Version
		343	include/osgGA/Widget
327	include/osgManipulator/AntiSquish	344	include/osgManipulator/AntiSquish
328	include/osgManipulator/Command	345	include/osgManipulator/Command
329	include/osgManipulator/CommandManager	346	include/osgManipulator/CommandManager
Lines 397-402 Link Here
397	include/osgParticle/range	414	include/osgParticle/range
398	include/osgPresentation/AnimationMaterial	415	include/osgPresentation/AnimationMaterial
399	include/osgPresentation/CompileSlideCallback	416	include/osgPresentation/CompileSlideCallback
		417	include/osgPresentation/Cursor
400	include/osgPresentation/Export	418	include/osgPresentation/Export
401	include/osgPresentation/KeyEventHandler	419	include/osgPresentation/KeyEventHandler
402	include/osgPresentation/PickEventHandler	420	include/osgPresentation/PickEventHandler
Lines 404-415 Link Here
404	include/osgPresentation/SlideEventHandler	422	include/osgPresentation/SlideEventHandler
405	include/osgPresentation/SlideShowConstructor	423	include/osgPresentation/SlideShowConstructor
406	include/osgPresentation/Timeout	424	include/osgPresentation/Timeout
407	%%QT4%%include/osgQt/Export	425	%%QT%%include/osgQt/Export
408	%%QT4%%include/osgQt/GraphicsWindowQt	426	%%QT%%include/osgQt/GraphicsWindowQt
409	%%QT4%%include/osgQt/QFontImplementation	427	%%QT%%include/osgQt/QFontImplementation
410	%%QT4%%include/osgQt/QGraphicsViewAdapter	428	%%QT%%include/osgQt/QGraphicsViewAdapter
411	%%QT4%%include/osgQt/QWebViewImage	429	%%QT%%include/osgQt/QWebViewImage
412	%%QT4%%include/osgQt/QWidgetImage	430	%%QT%%include/osgQt/QWidgetImage
		431	%%QT%%include/osgQt/Version
413	include/osgShadow/ConvexPolyhedron	432	include/osgShadow/ConvexPolyhedron
414	include/osgShadow/DebugShadowMap	433	include/osgShadow/DebugShadowMap
415	include/osgShadow/Export	434	include/osgShadow/Export
Lines 455-461 Link Here
455	include/osgSim/SphereSegment	474	include/osgSim/SphereSegment
456	include/osgSim/Version	475	include/osgSim/Version
457	include/osgSim/VisibilityGroup	476	include/osgSim/VisibilityGroup
		477	include/osgTerrain/DisplacementMappingTechnique
458	include/osgTerrain/Export	478	include/osgTerrain/Export
		479	include/osgTerrain/GeometryPool
459	include/osgTerrain/GeometryTechnique	480	include/osgTerrain/GeometryTechnique
460	include/osgTerrain/Layer	481	include/osgTerrain/Layer
461	include/osgTerrain/Locator	482	include/osgTerrain/Locator
Lines 476-481 Link Here
476	include/osgText/Text3D	497	include/osgText/Text3D
477	include/osgText/TextBase	498	include/osgText/TextBase
478	include/osgText/Version	499	include/osgText/Version
		500	include/osgUI/AlignmentSettings
		501	include/osgUI/Callbacks
		502	include/osgUI/ColorPalette
		503	include/osgUI/ComboBox
		504	include/osgUI/Dialog
		505	include/osgUI/Export
		506	include/osgUI/FrameSettings
		507	include/osgUI/Label
		508	include/osgUI/LineEdit
		509	include/osgUI/Popup
		510	include/osgUI/PushButton
		511	include/osgUI/Style
		512	include/osgUI/TabWidget
		513	include/osgUI/TextSettings
		514	include/osgUI/Validator
		515	include/osgUI/Widget
479	include/osgUtil/ConvertVec	516	include/osgUtil/ConvertVec
480	include/osgUtil/CubeMapGenerator	517	include/osgUtil/CubeMapGenerator
481	include/osgUtil/CullVisitor	518	include/osgUtil/CullVisitor
Lines 499-504 Link Here
499	include/osgUtil/PolytopeIntersector	536	include/osgUtil/PolytopeIntersector
500	include/osgUtil/PositionalStateContainer	537	include/osgUtil/PositionalStateContainer
501	include/osgUtil/PrintVisitor	538	include/osgUtil/PrintVisitor
		539	include/osgUtil/RayIntersector
502	include/osgUtil/ReflectionMapGenerator	540	include/osgUtil/ReflectionMapGenerator
503	include/osgUtil/RenderBin	541	include/osgUtil/RenderBin
504	include/osgUtil/RenderLeaf	542	include/osgUtil/RenderLeaf
Lines 536-545 Link Here
536	include/osgVolume/FixedFunctionTechnique	574	include/osgVolume/FixedFunctionTechnique
537	include/osgVolume/Layer	575	include/osgVolume/Layer
538	include/osgVolume/Locator	576	include/osgVolume/Locator
		577	include/osgVolume/MultipassTechnique
539	include/osgVolume/Property	578	include/osgVolume/Property
540	include/osgVolume/RayTracedTechnique	579	include/osgVolume/RayTracedTechnique
541	include/osgVolume/Version	580	include/osgVolume/Version
542	include/osgVolume/Volume	581	include/osgVolume/Volume
		582	include/osgVolume/VolumeScene
		583	include/osgVolume/VolumeSettings
543	include/osgVolume/VolumeTechnique	584	include/osgVolume/VolumeTechnique
544	include/osgVolume/VolumeTile	585	include/osgVolume/VolumeTile
545	include/osgWidget/Box	586	include/osgWidget/Box
Lines 593-601 Link Here
593	lib/libosgPresentation.so	634	lib/libosgPresentation.so
594	lib/libosgPresentation.so.%%OSG_VERSION%%	635	lib/libosgPresentation.so.%%OSG_VERSION%%
595	lib/libosgPresentation.so.%%OSG_SHLIBVER%%	636	lib/libosgPresentation.so.%%OSG_SHLIBVER%%
596	%%QT4%%lib/libosgQt.so	637	%%QT%%lib/libosgQt.so
597	%%QT4%%lib/libosgQt.so.%%OSG_VERSION%%	638	%%QT%%lib/libosgQt.so.%%OSG_VERSION%%
598	%%QT4%%lib/libosgQt.so.%%OSG_SHLIBVER%%	639	%%QT%%lib/libosgQt.so.%%OSG_SHLIBVER%%
599	lib/libosgShadow.so	640	lib/libosgShadow.so
600	lib/libosgShadow.so.%%OSG_VERSION%%	641	lib/libosgShadow.so.%%OSG_VERSION%%
601	lib/libosgShadow.so.%%OSG_SHLIBVER%%	642	lib/libosgShadow.so.%%OSG_SHLIBVER%%
Lines 608-613 Link Here
608	lib/libosgText.so	649	lib/libosgText.so
609	lib/libosgText.so.%%OSG_VERSION%%	650	lib/libosgText.so.%%OSG_VERSION%%
610	lib/libosgText.so.%%OSG_SHLIBVER%%	651	lib/libosgText.so.%%OSG_SHLIBVER%%
		652	lib/libosgUI.so
		653	lib/libosgUI.so.%%OSG_VERSION%%
		654	lib/libosgUI.so.%%OSG_SHLIBVER%%
611	lib/libosgUtil.so	655	lib/libosgUtil.so
612	lib/libosgUtil.so.%%OSG_VERSION%%	656	lib/libosgUtil.so.%%OSG_VERSION%%
613	lib/libosgUtil.so.%%OSG_SHLIBVER%%	657	lib/libosgUtil.so.%%OSG_SHLIBVER%%
Lines 648-663 Link Here
648	%%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so	692	%%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so
649	%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so	693	%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so
650	%%GIF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gif.so	694	%%GIF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gif.so
		695	lib/osgPlugins-%%OSG_VERSION%%/osgdb_gles.so
651	lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so	696	lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so
		697	%%GSTREAMER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gstreamer.so
652	%%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so	698	%%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so
653	lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so	699	lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so
654	lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so	700	lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so
655	%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so	701	%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so
656	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so	702	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so
		703	%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so
657	lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so	704	lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so
658	%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so
659	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so	705	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so
		706	%%LIBLAS%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_las.so
660	lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so	707	lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so
		708	%%LUA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_lua.so
661	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so	709	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so
662	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so	710	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so
663	lib/osgPlugins-%%OSG_VERSION%%/osgdb_md2.so	711	lib/osgPlugins-%%OSG_VERSION%%/osgdb_md2.so
Lines 670-675 Link Here
670	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osc.so	718	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osc.so
671	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osg.so	719	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osg.so
672	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osga.so	720	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osga.so
		721	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgjs.so
673	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgshadow.so	722	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgshadow.so
674	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgterrain.so	723	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgterrain.so
675	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgtgz.so	724	lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgtgz.so
Lines 687-692 Link Here
687	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so	736	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
688	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so	737	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so
689	lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so	738	lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so
		739	%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so
690	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so	740	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so
691	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so	741	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so
692	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so	742	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so
Lines 697-708 Link Here
697	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgsim.so	747	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgsim.so
698	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgterrain.so	748	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgterrain.so
699	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgtext.so	749	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgtext.so
		750	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgui.so
		751	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgutil.so
700	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so	752	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so
701	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so	753	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so
702	%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so
703	lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so	754	lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so
704	lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so	755	lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so
705	%%SVG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_svg.so	756	%%SVG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_svg.so
		757	lib/osgPlugins-%%OSG_VERSION%%/osgdb_tf.so
706	lib/osgPlugins-%%OSG_VERSION%%/osgdb_tga.so	758	lib/osgPlugins-%%OSG_VERSION%%/osgdb_tga.so
707	lib/osgPlugins-%%OSG_VERSION%%/osgdb_tgz.so	759	lib/osgPlugins-%%OSG_VERSION%%/osgdb_tgz.so
708	lib/osgPlugins-%%OSG_VERSION%%/osgdb_tiff.so	760	lib/osgPlugins-%%OSG_VERSION%%/osgdb_tiff.so
Lines 722-728 Link Here
722	libdata/pkgconfig/openscenegraph-osgGA.pc	774	libdata/pkgconfig/openscenegraph-osgGA.pc
723	libdata/pkgconfig/openscenegraph-osgManipulator.pc	775	libdata/pkgconfig/openscenegraph-osgManipulator.pc
724	libdata/pkgconfig/openscenegraph-osgParticle.pc	776	libdata/pkgconfig/openscenegraph-osgParticle.pc
725	%%QT4%%libdata/pkgconfig/openscenegraph-osgQt.pc	777	%%QT%%libdata/pkgconfig/openscenegraph-osgQt.pc
726	libdata/pkgconfig/openscenegraph-osgShadow.pc	778	libdata/pkgconfig/openscenegraph-osgShadow.pc
727	libdata/pkgconfig/openscenegraph-osgSim.pc	779	libdata/pkgconfig/openscenegraph-osgSim.pc
728	libdata/pkgconfig/openscenegraph-osgTerrain.pc	780	libdata/pkgconfig/openscenegraph-osgTerrain.pc