Attachment #169702 for bug #209057

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




# $FreeBSD$

PORTNAME=	osg
PORTVERSION=	3.5.1
PORTREVISION=	2
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=141 \
		OPENTHREADS_VERSION=3.3.0 \
		OPENTHREADS_SHLIBVER=20


PORTSCOUT=	limitw:1,odd

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

LIBLAS_DESC=	liblas support
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
LUA_DESC=	Lua script engine support

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
LUA_USES=		lua:52

.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

.if ${PORT_OPTIONS:MLUA}
FORCE_REQUIRE+=	Lua51
.else
FORCE_IGNORE+=	Lua51
.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-devel/distinfo (-2 / +2 lines)
1	SHA256 (OpenSceneGraph-3.3.9.zip) = 4e9cb3a30a9ee3ac43693f7afabb9c4a5417bd9e83d501cbb6643f75c3b7bfd3	1	SHA256 (OpenSceneGraph-3.5.1.zip) = c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0
2	SIZE (OpenSceneGraph-3.3.9.zip) = 8335153	2	SIZE (OpenSceneGraph-3.5.1.zip) = 8353019




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

Line 0 Link Here

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




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

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

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

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/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
%%LIBLAS%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_las.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_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_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

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 209057

Lines 2-9 Link Here

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

Line 0 Link Here

(-)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 52-57 Link Here

(-)graphics/osg-devel/pkg-plist (-14 / +16 lines)
52	include/osg/ColorMatrix	52	include/osg/ColorMatrix
53	include/osg/ComputeBoundsVisitor	53	include/osg/ComputeBoundsVisitor
54	include/osg/Config	54	include/osg/Config
		55	include/osg/ContextData
55	include/osg/ConvexPlanarOccluder	56	include/osg/ConvexPlanarOccluder
56	include/osg/ConvexPlanarPolygon	57	include/osg/ConvexPlanarPolygon
57	include/osg/CoordinateSystemNode	58	include/osg/CoordinateSystemNode
Lines 176-181 Link Here
176	include/osg/Transform	177	include/osg/Transform
177	include/osg/TriangleFunctor	178	include/osg/TriangleFunctor
178	include/osg/TriangleIndexFunctor	179	include/osg/TriangleIndexFunctor
		180	include/osg/Types
179	include/osg/Uniform	181	include/osg/Uniform
180	include/osg/UserDataContainer	182	include/osg/UserDataContainer
181	include/osg/ValueObject	183	include/osg/ValueObject
Lines 421-433 Link Here
421	include/osgPresentation/SlideEventHandler	423	include/osgPresentation/SlideEventHandler
422	include/osgPresentation/SlideShowConstructor	424	include/osgPresentation/SlideShowConstructor
423	include/osgPresentation/Timeout	425	include/osgPresentation/Timeout
424	%%QT4%%include/osgQt/Export	426	%%QT%%include/osgQt/Export
425	%%QT4%%include/osgQt/GraphicsWindowQt	427	%%QT%%include/osgQt/GraphicsWindowQt
426	%%QT4%%include/osgQt/QFontImplementation	428	%%QT%%include/osgQt/QFontImplementation
427	%%QT4%%include/osgQt/QGraphicsViewAdapter	429	%%QT%%include/osgQt/QGraphicsViewAdapter
428	%%QT4%%include/osgQt/QWebViewImage	430	%%QT%%include/osgQt/QWebViewImage
429	%%QT4%%include/osgQt/QWidgetImage	431	%%QT%%include/osgQt/QWidgetImage
430	%%QT4%%include/osgQt/Version	432	%%QT%%include/osgQt/Version
431	include/osgShadow/ConvexPolyhedron	433	include/osgShadow/ConvexPolyhedron
432	include/osgShadow/DebugShadowMap	434	include/osgShadow/DebugShadowMap
433	include/osgShadow/Export	435	include/osgShadow/Export
Lines 633-641 Link Here
633	lib/libosgPresentation.so	635	lib/libosgPresentation.so
634	lib/libosgPresentation.so.%%OSG_VERSION%%	636	lib/libosgPresentation.so.%%OSG_VERSION%%
635	lib/libosgPresentation.so.%%OSG_SHLIBVER%%	637	lib/libosgPresentation.so.%%OSG_SHLIBVER%%
636	%%QT4%%lib/libosgQt.so	638	%%QT%%lib/libosgQt.so
637	%%QT4%%lib/libosgQt.so.%%OSG_VERSION%%	639	%%QT%%lib/libosgQt.so.%%OSG_VERSION%%
638	%%QT4%%lib/libosgQt.so.%%OSG_SHLIBVER%%	640	%%QT%%lib/libosgQt.so.%%OSG_SHLIBVER%%
639	lib/libosgShadow.so	641	lib/libosgShadow.so
640	lib/libosgShadow.so.%%OSG_VERSION%%	642	lib/libosgShadow.so.%%OSG_VERSION%%
641	lib/libosgShadow.so.%%OSG_SHLIBVER%%	643	lib/libosgShadow.so.%%OSG_SHLIBVER%%
Lines 696-706 Link Here
696	lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so	698	lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so
697	%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so	699	%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so
698	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so	700	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so
		701	%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so
699	lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so	702	lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so
700	%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so
701	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so	703	lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so
		704	%%LIBLAS%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_las.so
702	lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so	705	lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so
703	%%LIBLAS%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_las.so
704	%%LUA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_lua.so	706	%%LUA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_lua.so
705	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so	707	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so
706	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so	708	lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so
Lines 732-737 Link Here
732	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so	734	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
733	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so	735	lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so
734	lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so	736	lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so
		737	%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so
735	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so	738	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so
736	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so	739	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so
737	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so	740	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so
Lines 746-752 Link Here
746	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgutil.so	749	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgutil.so
747	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so	750	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so
748	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so	751	lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so
749	%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so
750	lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so	752	lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so
751	lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so	753	lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so
752	%%SVG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_svg.so	754	%%SVG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_svg.so
Lines 773-779 Link Here
773	libdata/pkgconfig/openscenegraph-osgGA.pc	775	libdata/pkgconfig/openscenegraph-osgGA.pc
774	libdata/pkgconfig/openscenegraph-osgManipulator.pc	776	libdata/pkgconfig/openscenegraph-osgManipulator.pc
775	libdata/pkgconfig/openscenegraph-osgParticle.pc	777	libdata/pkgconfig/openscenegraph-osgParticle.pc
776	%%QT4%%libdata/pkgconfig/openscenegraph-osgQt.pc	778	%%QT%%libdata/pkgconfig/openscenegraph-osgQt.pc
777	libdata/pkgconfig/openscenegraph-osgShadow.pc	779	libdata/pkgconfig/openscenegraph-osgShadow.pc
778	libdata/pkgconfig/openscenegraph-osgSim.pc	780	libdata/pkgconfig/openscenegraph-osgSim.pc
779	libdata/pkgconfig/openscenegraph-osgTerrain.pc	781	libdata/pkgconfig/openscenegraph-osgTerrain.pc