Index: head/graphics/osg-devel/Makefile =================================================================== --- head/graphics/osg-devel/Makefile (revision 429619) +++ head/graphics/osg-devel/Makefile (revision 429620) @@ -1,209 +1,162 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= osg -PORTVERSION= 3.3.9 -PORTREVISION= 2 +PORTVERSION= 3.5.1 CATEGORIES= graphics MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ PKGNAMESUFFIX= -devel DISTNAME= OpenSceneGraph-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering LICENSE= OSGPL LICENSE_NAME= OpenSceneGraph Public License LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff CONFLICTS= osg-[0-9]* USES= alias cmake:outsource jpeg pkgconfig zip USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes PLIST_SUB= OSG_VERSION=${PORTVERSION} \ - OSG_SHLIBVER=123 \ + 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 QT4 SDL \ + JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \ SVG VNC XINE XRANDR -OPTIONS_DEFAULT=FREETYPE GIF FFMPEG XRANDR +OPTIONS_RADIO= QT +OPTIONS_RADIO_QT=QT4 QT5 +OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR -LIBLAS_DESC= liblas support GDAL_DESC= GDAL support -INVENTOR_DESC= SGI OpenInventor support GTA_DESC= GTA file format support -VNC_DESC= LibVNCServer support -SDL_DESC= Use SDL (joystick support in present3d) +INVENTOR_DESC= SGI OpenInventor support +LIBLAS_DESC= liblas support NVTT_DESC= Use NVidia texture tools -LUA_DESC= Lua script engine support +QT_DESC= QT toolkit support (optional) +SDL_DESC= Use SDL (joystick support in present3d) +VNC_DESC= LibVNCServer support OPTIONS_SUB= yes CURL_LIB_DEPENDS= libcurl.so:ftp/curl -LIBLAS_LIB_DEPENDS= liblas.so:devel/liblas +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 -XINE_LIB_DEPENDS= libxine.so:multimedia/libxine -GTA_LIB_DEPENDS= libgta.so:devel/libgta -VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver +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 -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg -FFMPEG_BROKEN= does not build with ffmpeg 3.x -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR +OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib -SDL_USE= SDL=sdl -NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools +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 -QT4_USE= QT4=corelib,gui,opengl,qmake_build,moc_build,uic_build,rcc_build -QT4_CMAKE_ON= -DOSG_USE_QT=ON -QT4_CMAKE_OFF= -DOSG_USE_QT=OFF -LUA_USES= lua:52 +XRANDR_USE= xorg=xrandr -.include - # GUI toolkits are only needed for building examples, which are not even installed -FORCE_IGNORE= FLTK GLUT FOX Qt3 Qt5Widgets 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 +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 -# options that affect FIND_PACKAGE -.if ${PORT_OPTIONS:MCURL} -FORCE_REQUIRE+= CURL -.else -FORCE_IGNORE+= CURL -.endif +.include -.if ${PORT_OPTIONS:MFREETYPE} -FORCE_REQUIRE+= FreeType -.else -FORCE_IGNORE+= FreeType +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1100000 +# workaround for make (?) problem leading to cflags +# lost in osgjs +USES+= gmake .endif -.if ${PORT_OPTIONS:MGDAL} -FORCE_REQUIRE+= GDAL +.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5} +CMAKE_ARGS+= -DOSG_USE_QT:BOOL=ON +PLIST_SUB+= QT="" .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 +CMAKE_ARGS+= -DOSG_USE_QT:BOOL=OFF +PLIST_SUB+= QT="@comment " .endif post-patch: @${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \ s|-pedantic||' ${WRKSRC}/CMakeLists.txt .for p in ${FORCE_REQUIRE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \ ${WRKSRC}/CMakeLists.txt .endfor .for p in ${FORCE_IGNORE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|^|#|' \ ${WRKSRC}/CMakeLists.txt .endfor .include Index: head/graphics/osg-devel/distinfo =================================================================== --- head/graphics/osg-devel/distinfo (revision 429619) +++ head/graphics/osg-devel/distinfo (revision 429620) @@ -1,2 +1,3 @@ -SHA256 (OpenSceneGraph-3.3.9.zip) = 4e9cb3a30a9ee3ac43693f7afabb9c4a5417bd9e83d501cbb6643f75c3b7bfd3 -SIZE (OpenSceneGraph-3.3.9.zip) = 8335153 +TIMESTAMP = 1482850076 +SHA256 (OpenSceneGraph-3.5.1.zip) = c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0 +SIZE (OpenSceneGraph-3.5.1.zip) = 8353019 Index: head/graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake =================================================================== --- head/graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake (nonexistent) +++ head/graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake (revision 429620) @@ -0,0 +1,32 @@ +--- CMakeModules/FindGStreamer.cmake 2015-07-17 21:31:19.000000000 +0300 ++++ CMakeModules/FindGStreamer.cmake 2015-02-25 22:25:34.000000000 +0300 +@@ -83,18 +83,18 @@ + find_package(PkgConfig) + + macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) +- pkg_check_modules(${_component_prefix} QUIET ${_pkgconfig_name}) ++ pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name}) + +-# find_path(${_component_prefix}_INCLUDE_DIRS +-# NAMES ${_header} +-# HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR} +-# PATH_SUFFIXES gstreamer-1.0 +-# ) +- +-# find_library(${_component_prefix}_LIBRARIES +-# NAMES ${_library} +-# HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR} +-# ) ++ find_path(${_component_prefix}_INCLUDE_DIRS ++ NAMES ${_header} ++ HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR} ++ PATH_SUFFIXES gstreamer-1.0 ++ ) ++ ++ find_library(${_component_prefix}_LIBRARIES ++ NAMES ${_library} ++ HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR} ++ ) + endmacro() + endif () + Property changes on: head/graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/osg-devel/files/patch-ffmpeg3 =================================================================== --- head/graphics/osg-devel/files/patch-ffmpeg3 (nonexistent) +++ head/graphics/osg-devel/files/patch-ffmpeg3 (revision 429620) @@ -0,0 +1,157 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +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(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(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( 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 + } + +-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; + + } + Property changes on: head/graphics/osg-devel/files/patch-ffmpeg3 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/osg-devel/files/patch-include_osgViewer_View =================================================================== --- head/graphics/osg-devel/files/patch-include_osgViewer_View (nonexistent) +++ head/graphics/osg-devel/files/patch-include_osgViewer_View (revision 429620) @@ -0,0 +1,11 @@ +--- include/osgViewer/View.orig 2016-04-21 09:54:28.095530000 +0200 ++++ include/osgViewer/View 2016-04-21 09:55:04.918232000 +0200 +@@ -127,7 +127,7 @@ + /** Set the View's image pager.*/ + void setImagePager(osgDB::ImagePager* ip); + +- template void setImagePager(const osg::ref_ptr* ip) { setImagePager(ip.get()); } ++ template void setImagePager(const osg::ref_ptr& ip) { setImagePager(ip.get()); } + + /** Get the View's image pager.*/ + osgDB::ImagePager* getImagePager(); Property changes on: head/graphics/osg-devel/files/patch-include_osgViewer_View ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt =================================================================== --- head/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt (nonexistent) +++ head/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt (revision 429620) @@ -0,0 +1,28 @@ +--- src/osgPlugins/ffmpeg/CMakeLists.txt.orig 2015-01-07 14:14:55 UTC ++++ src/osgPlugins/ffmpeg/CMakeLists.txt +@@ -3,7 +3,7 @@ LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS}) + + IF(FFMPEG_LIBSWSCALE_FOUND) + +- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) ++ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) + + ADD_DEFINITIONS(-DUSE_SWSCALE) + +@@ -12,14 +12,14 @@ IF(FFMPEG_LIBSWSCALE_FOUND) + ENDIF() + + IF(FFMPEG_LIBSWRESAMPLE_FOUND) +- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample ) ++ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample ) + + ADD_DEFINITIONS(-DUSE_SWRESAMPLE) + + SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBSWRESAMPLE_LIBRARIES}) + ENDIF() + IF(FFMPEG_LIBAVRESAMPLE_FOUND) +- INCLUDE_DIRECTORIES( ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample ) ++ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample ) + + ADD_DEFINITIONS(-DUSE_AVRESAMPLE) + Property changes on: head/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt =================================================================== --- head/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt (nonexistent) +++ head/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt (revision 429620) @@ -0,0 +1,8 @@ +--- ./src/osgPlugins/gdal/CMakeLists.txt.orig 2015-07-02 11:58:49 UTC ++++ ./src/osgPlugins/gdal/CMakeLists.txt +@@ -1,4 +1,4 @@ +-INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} ) ++INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR}) + + SET(TARGET_SRC + ReaderWriterGDAL.cpp Property changes on: head/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt =================================================================== --- head/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt (nonexistent) +++ head/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt (revision 429620) @@ -0,0 +1,8 @@ +--- src/osgPlugins/nvtt/CMakeLists.txt.orig 2011-04-19 11:40:22 UTC ++++ src/osgPlugins/nvtt/CMakeLists.txt +@@ -1,4 +1,4 @@ +-INCLUDE_DIRECTORIES( ${NVTT_INCLUDE_DIR} ) ++INCLUDE_DIRECTORIES(SYSTEM ${NVTT_INCLUDE_DIR}) + + + SET(TARGET_SRC Property changes on: head/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt =================================================================== --- head/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt (nonexistent) +++ head/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt (revision 429620) @@ -0,0 +1,8 @@ +--- ./src/osgPlugins/ogr/CMakeLists.txt.orig 2011-04-19 11:40:22 UTC ++++ ./src/osgPlugins/ogr/CMakeLists.txt +@@ -1,4 +1,4 @@ +-INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} ) ++INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR}) + + SET(TARGET_SRC ReaderWriterOGR.cpp) + Property changes on: head/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/osg-devel/pkg-plist =================================================================== --- head/graphics/osg-devel/pkg-plist (revision 429619) +++ head/graphics/osg-devel/pkg-plist (revision 429620) @@ -1,786 +1,788 @@ bin/osgarchive bin/osgconv bin/osgfilecache bin/osgversion bin/osgviewer bin/present3D include/OpenThreads/Atomic include/OpenThreads/Barrier include/OpenThreads/Block include/OpenThreads/Condition include/OpenThreads/Config include/OpenThreads/Exports include/OpenThreads/Mutex include/OpenThreads/ReadWriteMutex include/OpenThreads/ReentrantMutex include/OpenThreads/ScopedLock include/OpenThreads/Thread include/OpenThreads/Version include/osg/AlphaFunc include/osg/AnimationPath include/osg/ApplicationUsage include/osg/ArgumentParser include/osg/Array include/osg/ArrayDispatchers include/osg/AudioStream include/osg/AutoTransform include/osg/Billboard include/osg/BlendColor include/osg/BlendEquation include/osg/BlendEquationi include/osg/BlendFunc include/osg/BlendFunci include/osg/BoundingBox include/osg/BoundingSphere include/osg/BoundsChecking include/osg/BufferIndexBinding include/osg/BufferObject include/osg/BufferTemplate include/osg/Callback include/osg/Camera include/osg/CameraView include/osg/Capability include/osg/ClampColor include/osg/ClearNode include/osg/ClipControl include/osg/ClipNode include/osg/ClipPlane include/osg/ClusterCullingCallback include/osg/CollectOccludersVisitor include/osg/ColorMask include/osg/ColorMaski include/osg/ColorMatrix include/osg/ComputeBoundsVisitor include/osg/Config +include/osg/ContextData include/osg/ConvexPlanarOccluder include/osg/ConvexPlanarPolygon include/osg/CoordinateSystemNode include/osg/CopyOp include/osg/CullFace include/osg/CullSettings include/osg/CullStack include/osg/CullingSet include/osg/DeleteHandler include/osg/Depth include/osg/DisplaySettings include/osg/DrawPixels include/osg/Drawable include/osg/Endian include/osg/Export include/osg/Fog include/osg/FragmentProgram include/osg/FrameBufferObject include/osg/FrameStamp include/osg/FrontFace include/osg/GL include/osg/GL2Extensions include/osg/GLBeginEndAdapter include/osg/GLDefines include/osg/GLExtensions include/osg/GLObjects include/osg/GLU include/osg/Geode include/osg/Geometry include/osg/GraphicsContext include/osg/GraphicsCostEstimator include/osg/GraphicsThread include/osg/Group include/osg/Hint include/osg/Image include/osg/ImageSequence include/osg/ImageStream include/osg/ImageUtils include/osg/KdTree include/osg/LOD include/osg/Light include/osg/LightModel include/osg/LightSource include/osg/LineSegment include/osg/LineStipple include/osg/LineWidth include/osg/LogicOp include/osg/Material include/osg/Math include/osg/Matrix include/osg/MatrixTransform include/osg/Matrixd include/osg/Matrixf include/osg/MixinVector include/osg/Multisample include/osg/Node include/osg/NodeCallback include/osg/NodeTrackerCallback include/osg/NodeVisitor include/osg/Notify include/osg/Object include/osg/Observer include/osg/ObserverNodePath include/osg/OccluderNode include/osg/OcclusionQueryNode include/osg/OperationThread include/osg/PagedLOD include/osg/PatchParameter include/osg/Plane include/osg/Point include/osg/PointSprite include/osg/PolygonMode include/osg/PolygonOffset include/osg/PolygonStipple include/osg/Polytope include/osg/PositionAttitudeTransform include/osg/PrimitiveRestartIndex include/osg/PrimitiveSet include/osg/Program include/osg/Projection include/osg/ProxyNode include/osg/Quat include/osg/Referenced include/osg/RenderInfo include/osg/SampleMaski include/osg/Scissor include/osg/ScriptEngine include/osg/Sequence include/osg/ShadeModel include/osg/Shader include/osg/ShaderAttribute include/osg/ShaderComposer include/osg/ShadowVolumeOccluder include/osg/Shape include/osg/ShapeDrawable include/osg/State include/osg/StateAttribute include/osg/StateAttributeCallback include/osg/StateSet include/osg/Stats include/osg/Stencil include/osg/StencilTwoSided include/osg/Switch include/osg/TemplatePrimitiveFunctor include/osg/TexEnv include/osg/TexEnvCombine include/osg/TexEnvFilter include/osg/TexGen include/osg/TexGenNode include/osg/TexMat include/osg/Texture include/osg/Texture1D include/osg/Texture2D include/osg/Texture2DArray include/osg/Texture2DMultisample include/osg/Texture3D include/osg/TextureBuffer include/osg/TextureCubeMap include/osg/TextureRectangle include/osg/Timer include/osg/TransferFunction include/osg/Transform include/osg/TriangleFunctor include/osg/TriangleIndexFunctor +include/osg/Types include/osg/Uniform include/osg/UserDataContainer include/osg/ValueObject include/osg/Vec2 include/osg/Vec2b include/osg/Vec2d include/osg/Vec2f include/osg/Vec2i include/osg/Vec2s include/osg/Vec2ub include/osg/Vec2ui include/osg/Vec2us include/osg/Vec3 include/osg/Vec3b include/osg/Vec3d include/osg/Vec3f include/osg/Vec3i include/osg/Vec3s include/osg/Vec3ub include/osg/Vec3ui include/osg/Vec3us include/osg/Vec4 include/osg/Vec4b include/osg/Vec4d include/osg/Vec4f include/osg/Vec4i include/osg/Vec4s include/osg/Vec4ub include/osg/Vec4ui include/osg/Vec4us include/osg/Version include/osg/VertexAttribDivisor include/osg/VertexProgram include/osg/View include/osg/Viewport include/osg/buffered_value include/osg/fast_back_stack include/osg/io_utils include/osg/observer_ptr include/osg/ref_ptr include/osgAnimation/Action include/osgAnimation/ActionAnimation include/osgAnimation/ActionBlendIn include/osgAnimation/ActionBlendOut include/osgAnimation/ActionCallback include/osgAnimation/ActionStripAnimation include/osgAnimation/ActionVisitor include/osgAnimation/Animation include/osgAnimation/AnimationManagerBase include/osgAnimation/AnimationUpdateCallback include/osgAnimation/BasicAnimationManager include/osgAnimation/Bone include/osgAnimation/BoneMapVisitor include/osgAnimation/Channel include/osgAnimation/CubicBezier include/osgAnimation/EaseMotion include/osgAnimation/Export include/osgAnimation/FrameAction include/osgAnimation/Interpolator include/osgAnimation/Keyframe include/osgAnimation/LinkVisitor include/osgAnimation/MorphGeometry include/osgAnimation/RigGeometry include/osgAnimation/RigTransform include/osgAnimation/RigTransformHardware include/osgAnimation/RigTransformSoftware include/osgAnimation/Sampler include/osgAnimation/Skeleton include/osgAnimation/StackedMatrixElement include/osgAnimation/StackedQuaternionElement include/osgAnimation/StackedRotateAxisElement include/osgAnimation/StackedScaleElement include/osgAnimation/StackedTransform include/osgAnimation/StackedTransformElement include/osgAnimation/StackedTranslateElement include/osgAnimation/StatsHandler include/osgAnimation/StatsVisitor include/osgAnimation/Target include/osgAnimation/Timeline include/osgAnimation/TimelineAnimationManager include/osgAnimation/UpdateBone include/osgAnimation/UpdateMaterial include/osgAnimation/UpdateMatrixTransform include/osgAnimation/UpdateUniform include/osgAnimation/Vec3Packed include/osgAnimation/VertexInfluence include/osgDB/Archive include/osgDB/AuthenticationMap include/osgDB/Callbacks include/osgDB/ClassInterface include/osgDB/ConvertBase64 include/osgDB/ConvertUTF include/osgDB/DataTypes include/osgDB/DatabasePager include/osgDB/DatabaseRevisions include/osgDB/DotOsgWrapper include/osgDB/DynamicLibrary include/osgDB/Export include/osgDB/ExternalFileWriter include/osgDB/FileCache include/osgDB/FileNameUtils include/osgDB/FileUtils include/osgDB/ImageOptions include/osgDB/ImagePager include/osgDB/ImageProcessor include/osgDB/Input include/osgDB/InputStream include/osgDB/ObjectCache include/osgDB/ObjectWrapper include/osgDB/Options include/osgDB/Output include/osgDB/OutputStream include/osgDB/ParameterOutput include/osgDB/PluginQuery include/osgDB/ReadFile include/osgDB/ReaderWriter include/osgDB/Registry include/osgDB/Serializer include/osgDB/SharedStateManager include/osgDB/StreamOperator include/osgDB/Version include/osgDB/WriteFile include/osgDB/XmlParser include/osgDB/fstream include/osgFX/AnisotropicLighting include/osgFX/BumpMapping include/osgFX/Cartoon include/osgFX/Effect include/osgFX/Export include/osgFX/MultiTextureControl include/osgFX/Outline include/osgFX/Registry include/osgFX/Scribe include/osgFX/SpecularHighlights include/osgFX/Technique include/osgFX/Validator include/osgFX/Version include/osgGA/AnimationPathManipulator include/osgGA/CameraManipulator include/osgGA/CameraViewSwitchManipulator include/osgGA/Device include/osgGA/DriveManipulator include/osgGA/Event include/osgGA/EventHandler include/osgGA/EventQueue include/osgGA/EventVisitor include/osgGA/Export include/osgGA/FirstPersonManipulator include/osgGA/FlightManipulator include/osgGA/GUIActionAdapter include/osgGA/GUIEventAdapter include/osgGA/GUIEventHandler include/osgGA/KeySwitchMatrixManipulator include/osgGA/MultiTouchTrackballManipulator include/osgGA/NodeTrackerManipulator include/osgGA/OrbitManipulator include/osgGA/SphericalManipulator include/osgGA/StandardManipulator include/osgGA/StateSetManipulator include/osgGA/TerrainManipulator include/osgGA/TrackballManipulator include/osgGA/UFOManipulator include/osgGA/Version include/osgGA/Widget include/osgManipulator/AntiSquish include/osgManipulator/Command include/osgManipulator/CommandManager include/osgManipulator/Constraint include/osgManipulator/Dragger include/osgManipulator/Export include/osgManipulator/Projector include/osgManipulator/RotateCylinderDragger include/osgManipulator/RotateSphereDragger include/osgManipulator/Scale1DDragger include/osgManipulator/Scale2DDragger include/osgManipulator/ScaleAxisDragger include/osgManipulator/Selection include/osgManipulator/TabBoxDragger include/osgManipulator/TabBoxTrackballDragger include/osgManipulator/TabPlaneDragger include/osgManipulator/TabPlaneTrackballDragger include/osgManipulator/TrackballDragger include/osgManipulator/Translate1DDragger include/osgManipulator/Translate2DDragger include/osgManipulator/TranslateAxisDragger include/osgManipulator/TranslatePlaneDragger include/osgManipulator/Version include/osgParticle/AccelOperator include/osgParticle/AngularAccelOperator include/osgParticle/AngularDampingOperator include/osgParticle/BounceOperator include/osgParticle/BoxPlacer include/osgParticle/CenteredPlacer include/osgParticle/CompositePlacer include/osgParticle/ConnectedParticleSystem include/osgParticle/ConstantRateCounter include/osgParticle/Counter include/osgParticle/DampingOperator include/osgParticle/DomainOperator include/osgParticle/Emitter include/osgParticle/ExplosionDebrisEffect include/osgParticle/ExplosionEffect include/osgParticle/ExplosionOperator include/osgParticle/Export include/osgParticle/FireEffect include/osgParticle/FluidFrictionOperator include/osgParticle/FluidProgram include/osgParticle/ForceOperator include/osgParticle/Interpolator include/osgParticle/LinearInterpolator include/osgParticle/ModularEmitter include/osgParticle/ModularProgram include/osgParticle/MultiSegmentPlacer include/osgParticle/Operator include/osgParticle/OrbitOperator include/osgParticle/Particle include/osgParticle/ParticleEffect include/osgParticle/ParticleProcessor include/osgParticle/ParticleSystem include/osgParticle/ParticleSystemUpdater include/osgParticle/Placer include/osgParticle/PointPlacer include/osgParticle/PrecipitationEffect include/osgParticle/Program include/osgParticle/RadialShooter include/osgParticle/RandomRateCounter include/osgParticle/SectorPlacer include/osgParticle/SegmentPlacer include/osgParticle/Shooter include/osgParticle/SinkOperator include/osgParticle/SmokeEffect include/osgParticle/SmokeTrailEffect include/osgParticle/VariableRateCounter include/osgParticle/Version include/osgParticle/range include/osgPresentation/AnimationMaterial include/osgPresentation/CompileSlideCallback include/osgPresentation/Cursor include/osgPresentation/Export include/osgPresentation/KeyEventHandler include/osgPresentation/PickEventHandler include/osgPresentation/PropertyManager include/osgPresentation/SlideEventHandler include/osgPresentation/SlideShowConstructor include/osgPresentation/Timeout -%%QT4%%include/osgQt/Export -%%QT4%%include/osgQt/GraphicsWindowQt -%%QT4%%include/osgQt/QFontImplementation -%%QT4%%include/osgQt/QGraphicsViewAdapter -%%QT4%%include/osgQt/QWebViewImage -%%QT4%%include/osgQt/QWidgetImage -%%QT4%%include/osgQt/Version +%%QT%%include/osgQt/Export +%%QT%%include/osgQt/GraphicsWindowQt +%%QT%%include/osgQt/QFontImplementation +%%QT%%include/osgQt/QGraphicsViewAdapter +%%QT%%include/osgQt/QWebViewImage +%%QT%%include/osgQt/QWidgetImage +%%QT%%include/osgQt/Version include/osgShadow/ConvexPolyhedron include/osgShadow/DebugShadowMap include/osgShadow/Export include/osgShadow/LightSpacePerspectiveShadowMap include/osgShadow/MinimalCullBoundsShadowMap include/osgShadow/MinimalDrawBoundsShadowMap include/osgShadow/MinimalShadowMap include/osgShadow/OccluderGeometry include/osgShadow/ParallelSplitShadowMap include/osgShadow/ProjectionShadowMap include/osgShadow/ShadowMap include/osgShadow/ShadowSettings include/osgShadow/ShadowTechnique include/osgShadow/ShadowTexture include/osgShadow/ShadowVolume include/osgShadow/ShadowedScene include/osgShadow/SoftShadowMap include/osgShadow/StandardShadowMap include/osgShadow/Version include/osgShadow/ViewDependentShadowMap include/osgShadow/ViewDependentShadowTechnique include/osgSim/BlinkSequence include/osgSim/ColorRange include/osgSim/DOFTransform include/osgSim/ElevationSlice include/osgSim/Export include/osgSim/GeographicLocation include/osgSim/HeightAboveTerrain include/osgSim/Impostor include/osgSim/ImpostorSprite include/osgSim/InsertImpostorsVisitor include/osgSim/LightPoint include/osgSim/LightPointNode include/osgSim/LightPointSystem include/osgSim/LineOfSight include/osgSim/MultiSwitch include/osgSim/ObjectRecordData include/osgSim/OverlayNode include/osgSim/ScalarBar include/osgSim/ScalarsToColors include/osgSim/Sector include/osgSim/ShapeAttribute include/osgSim/SphereSegment include/osgSim/Version include/osgSim/VisibilityGroup include/osgTerrain/DisplacementMappingTechnique include/osgTerrain/Export include/osgTerrain/GeometryPool include/osgTerrain/GeometryTechnique include/osgTerrain/Layer include/osgTerrain/Locator include/osgTerrain/Terrain include/osgTerrain/TerrainTechnique include/osgTerrain/TerrainTile include/osgTerrain/ValidDataOperator include/osgTerrain/Version include/osgText/Export include/osgText/FadeText include/osgText/Font include/osgText/Font3D include/osgText/Glyph include/osgText/KerningType include/osgText/String include/osgText/Style include/osgText/Text include/osgText/Text3D include/osgText/TextBase include/osgText/Version include/osgUI/AlignmentSettings include/osgUI/Callbacks include/osgUI/ColorPalette include/osgUI/ComboBox include/osgUI/Dialog include/osgUI/Export include/osgUI/FrameSettings include/osgUI/Label include/osgUI/LineEdit include/osgUI/Popup include/osgUI/PushButton include/osgUI/Style include/osgUI/TabWidget include/osgUI/TextSettings include/osgUI/Validator include/osgUI/Widget include/osgUtil/ConvertVec include/osgUtil/CubeMapGenerator include/osgUtil/CullVisitor include/osgUtil/DelaunayTriangulator include/osgUtil/DisplayRequirementsVisitor include/osgUtil/DrawElementTypeSimplifier include/osgUtil/EdgeCollector include/osgUtil/Export include/osgUtil/GLObjectsVisitor include/osgUtil/HalfWayMapGenerator include/osgUtil/HighlightMapGenerator include/osgUtil/IncrementalCompileOperation include/osgUtil/IntersectVisitor include/osgUtil/IntersectionVisitor include/osgUtil/LineSegmentIntersector include/osgUtil/MeshOptimizers include/osgUtil/OperationArrayFunctor include/osgUtil/Optimizer include/osgUtil/PerlinNoise include/osgUtil/PlaneIntersector include/osgUtil/PolytopeIntersector include/osgUtil/PositionalStateContainer include/osgUtil/PrintVisitor include/osgUtil/RayIntersector include/osgUtil/ReflectionMapGenerator include/osgUtil/RenderBin include/osgUtil/RenderLeaf include/osgUtil/RenderStage include/osgUtil/ReversePrimitiveFunctor include/osgUtil/SceneGraphBuilder include/osgUtil/SceneView include/osgUtil/ShaderGen include/osgUtil/Simplifier include/osgUtil/SmoothingVisitor include/osgUtil/StateGraph include/osgUtil/Statistics include/osgUtil/TangentSpaceGenerator include/osgUtil/Tessellator include/osgUtil/TransformAttributeFunctor include/osgUtil/TransformCallback include/osgUtil/TriStripVisitor include/osgUtil/UpdateVisitor include/osgUtil/Version include/osgViewer/CompositeViewer include/osgViewer/Export include/osgViewer/GraphicsWindow include/osgViewer/Keystone include/osgViewer/Renderer include/osgViewer/Scene include/osgViewer/Version include/osgViewer/View include/osgViewer/Viewer include/osgViewer/ViewerBase include/osgViewer/ViewerEventHandlers include/osgViewer/api/X11/GraphicsHandleX11 include/osgViewer/api/X11/GraphicsWindowX11 include/osgViewer/api/X11/PixelBufferX11 include/osgVolume/Export include/osgVolume/FixedFunctionTechnique include/osgVolume/Layer include/osgVolume/Locator include/osgVolume/MultipassTechnique include/osgVolume/Property include/osgVolume/RayTracedTechnique include/osgVolume/Version include/osgVolume/Volume include/osgVolume/VolumeScene include/osgVolume/VolumeSettings include/osgVolume/VolumeTechnique include/osgVolume/VolumeTile include/osgWidget/Box include/osgWidget/Browser include/osgWidget/Canvas include/osgWidget/EventInterface include/osgWidget/Export include/osgWidget/Frame include/osgWidget/Input include/osgWidget/Label include/osgWidget/Lua include/osgWidget/PdfReader include/osgWidget/Python include/osgWidget/ScriptEngine include/osgWidget/StyleInterface include/osgWidget/StyleManager include/osgWidget/Table include/osgWidget/Types include/osgWidget/UIObjectParent include/osgWidget/Util include/osgWidget/Version include/osgWidget/ViewerEventHandlers include/osgWidget/VncClient include/osgWidget/Widget include/osgWidget/Window include/osgWidget/WindowManager lib/libOpenThreads.so lib/libOpenThreads.so.%%OPENTHREADS_VERSION%% lib/libOpenThreads.so.%%OPENTHREADS_SHLIBVER%% lib/libosg.so lib/libosg.so.%%OSG_VERSION%% lib/libosg.so.%%OSG_SHLIBVER%% lib/libosgAnimation.so lib/libosgAnimation.so.%%OSG_VERSION%% lib/libosgAnimation.so.%%OSG_SHLIBVER%% lib/libosgDB.so lib/libosgDB.so.%%OSG_VERSION%% lib/libosgDB.so.%%OSG_SHLIBVER%% lib/libosgFX.so lib/libosgFX.so.%%OSG_VERSION%% lib/libosgFX.so.%%OSG_SHLIBVER%% lib/libosgGA.so lib/libosgGA.so.%%OSG_VERSION%% lib/libosgGA.so.%%OSG_SHLIBVER%% lib/libosgManipulator.so lib/libosgManipulator.so.%%OSG_VERSION%% lib/libosgManipulator.so.%%OSG_SHLIBVER%% lib/libosgParticle.so lib/libosgParticle.so.%%OSG_VERSION%% lib/libosgParticle.so.%%OSG_SHLIBVER%% lib/libosgPresentation.so lib/libosgPresentation.so.%%OSG_VERSION%% lib/libosgPresentation.so.%%OSG_SHLIBVER%% -%%QT4%%lib/libosgQt.so -%%QT4%%lib/libosgQt.so.%%OSG_VERSION%% -%%QT4%%lib/libosgQt.so.%%OSG_SHLIBVER%% +%%QT%%lib/libosgQt.so +%%QT%%lib/libosgQt.so.%%OSG_VERSION%% +%%QT%%lib/libosgQt.so.%%OSG_SHLIBVER%% lib/libosgShadow.so lib/libosgShadow.so.%%OSG_VERSION%% lib/libosgShadow.so.%%OSG_SHLIBVER%% lib/libosgSim.so lib/libosgSim.so.%%OSG_VERSION%% lib/libosgSim.so.%%OSG_SHLIBVER%% lib/libosgTerrain.so lib/libosgTerrain.so.%%OSG_VERSION%% lib/libosgTerrain.so.%%OSG_SHLIBVER%% lib/libosgText.so lib/libosgText.so.%%OSG_VERSION%% lib/libosgText.so.%%OSG_SHLIBVER%% +lib/libosgUI.so +lib/libosgUI.so.%%OSG_VERSION%% +lib/libosgUI.so.%%OSG_SHLIBVER%% lib/libosgUtil.so lib/libosgUtil.so.%%OSG_VERSION%% lib/libosgUtil.so.%%OSG_SHLIBVER%% lib/libosgViewer.so lib/libosgViewer.so.%%OSG_VERSION%% lib/libosgViewer.so.%%OSG_SHLIBVER%% lib/libosgVolume.so lib/libosgVolume.so.%%OSG_VERSION%% lib/libosgVolume.so.%%OSG_SHLIBVER%% lib/libosgWidget.so lib/libosgWidget.so.%%OSG_VERSION%% lib/libosgWidget.so.%%OSG_SHLIBVER%% lib/osgPlugins-%%OSG_VERSION%%/osgdb_3dc.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_3ds.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_ac.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_bmp.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_bsp.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_bvh.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_cfg.so %%CURL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_curl.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dds.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osg.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osganimation.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgfx.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgparticle.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgshadow.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgsim.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgterrain.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgtext.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgviewer.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so %%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so %%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so %%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so %%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so %%GIF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gif.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_gles.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so %%GSTREAMER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gstreamer.so %%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so %%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so -lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so %%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so +lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_ktx.so -lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so %%LIBLAS%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_las.so +lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so %%LUA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_lua.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_md2.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_mdl.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_normals.so %%NVTT%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_nvtt.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_obj.so %%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ogr.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_openflight.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osc.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osg.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osga.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgjs.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgshadow.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgterrain.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgtgz.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgviewer.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_p3d.so %%PDF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_pdf.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pic.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_ply.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so %%QT4%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_qfont.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so +%%SDL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_sdl.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osg.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osganimation.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgfx.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgga.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgmanipulator.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgparticle.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgshadow.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgsim.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgterrain.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgtext.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgui.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgutil.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgviewer.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_serializers_osgvolume.so -%%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 lib/osgPlugins-%%OSG_VERSION%%/osgdb_trans.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_trk.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_txf.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so %%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_vtf.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so %%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_zip.so -lib/libosgUI.so -lib/libosgUI.so.%%OSG_VERSION%% -lib/libosgUI.so.%%OSG_SHLIBVER%% libdata/pkgconfig/openscenegraph-osg.pc libdata/pkgconfig/openscenegraph-osgAnimation.pc libdata/pkgconfig/openscenegraph-osgDB.pc libdata/pkgconfig/openscenegraph-osgFX.pc libdata/pkgconfig/openscenegraph-osgGA.pc libdata/pkgconfig/openscenegraph-osgManipulator.pc libdata/pkgconfig/openscenegraph-osgParticle.pc -%%QT4%%libdata/pkgconfig/openscenegraph-osgQt.pc +%%QT%%libdata/pkgconfig/openscenegraph-osgQt.pc libdata/pkgconfig/openscenegraph-osgShadow.pc libdata/pkgconfig/openscenegraph-osgSim.pc libdata/pkgconfig/openscenegraph-osgTerrain.pc libdata/pkgconfig/openscenegraph-osgText.pc libdata/pkgconfig/openscenegraph-osgUtil.pc libdata/pkgconfig/openscenegraph-osgViewer.pc libdata/pkgconfig/openscenegraph-osgVolume.pc libdata/pkgconfig/openscenegraph-osgWidget.pc libdata/pkgconfig/openscenegraph.pc libdata/pkgconfig/openthreads.pc