Attachment 188703 Details for Bug 224236 – patch

[patch] patch

osg.patch (text/plain), 30.73 KB, created by Yuri Victorovich on 2017-12-11 08:14:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-12-11 08:14:41 UTC

Size: 30.73 KB

patch

obsolete

>Index: graphics/osg/Makefile
>===================================================================
>--- graphics/osg/Makefile	(revision 455869)
>+++ graphics/osg/Makefile	(working copy)
>@@ -1,13 +1,10 @@
> # Created by: Randall Hopper <aa8vb@nc.rr.com>
> # $FreeBSD$
> 
>-PORTNAME=	osg
>-PORTVERSION=	3.4.0
>-PORTREVISION=	4
>+PORTNAME=	OpenSceneGraph
>+DISTVERSIONPREFIX=	${PORTNAME}-
>+DISTVERSION=	3.5.9
> CATEGORIES=	graphics
>-MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
>-		http://mirror.amdmi3.ru/distfiles/
>-DISTNAME=	OpenSceneGraph-${PORTVERSION}
> 
> MAINTAINER=	amdmi3@FreeBSD.org
> COMMENT=	C++ OpenGL scene graph library for real-time rendering
>@@ -22,15 +19,17 @@
> 
> CONFLICTS=	osg-devel-[0-9]*
> 
>-USES=		alias cmake:outsource jpeg pkgconfig zip
>+USES=		alias cmake:outsource jpeg localbase:ldflags pkgconfig 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	openscenegraph
> USE_GL=		gl glu
>-USE_XORG=	x11
>+USE_XORG=	x11 xinerama
> USE_LDCONFIG=	yes
> 
> PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
>-		OSG_SHLIBVER=130 \
>-		OPENTHREADS_VERSION=3.3.0 \
>-		OPENTHREADS_SHLIBVER=20
>+		OSG_SHLIBVER=153 \
>+		OPENTHREADS_VERSION=3.3.1 \
>+		OPENTHREADS_SHLIBVER=21
> 
> PORTSCOUT=	limitw:1,even
> 
>@@ -90,7 +89,8 @@
> 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_LIB_DEPENDS=	libIex-2_2.so:graphics/ilmbase \
>+			libIlmImf-2_2.so.23:graphics/OpenEXR
> OPENEXR_VARS=		FORCE_REQUIRE+=OpenEXR
> OPENEXR_VARS_OFF=	FORCE_IGNORE+=OpenEXR
> PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
>@@ -109,7 +109,7 @@
> SDL_VARS=		FORCE_REQUIRE+=SDL
> SDL_VARS_OFF=		FORCE_IGNORE+=SDL
> SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
>-SVG_USE=		gnome=cairo
>+SVG_USE=		gnome=cairo,gdkpixbuf2
> SVG_VARS=		FORCE_REQUIRE+=RSVG
> SVG_VARS_OFF=		FORCE_IGNORE+=RSVG
> VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
>Index: graphics/osg/distinfo
>===================================================================
>--- graphics/osg/distinfo	(revision 455869)
>+++ graphics/osg/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (OpenSceneGraph-3.4.0.zip) = 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e3040e
>-SIZE (OpenSceneGraph-3.4.0.zip) = 7975023
>+TIMESTAMP = 1512970648
>+SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.5.9_GH0.tar.gz) = e18bd54d7046ea73525941244ef4f77b38b2a90bdf21d81468ac3874c41e9448
>+SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.5.9_GH0.tar.gz) = 5768001
>Index: graphics/osg/files/patch-CMakeLists.txt
>===================================================================
>--- graphics/osg/files/patch-CMakeLists.txt	(revision 455869)
>+++ graphics/osg/files/patch-CMakeLists.txt	(working copy)
>@@ -1,7 +1,163 @@
>---- CMakeLists.txt.orig	2011-07-31 11:50:34.000000000 +0400
>-+++ CMakeLists.txt	2012-03-05 05:54:52.485029323 +0400
>-@@ -588,7 +588,7 @@
>+--- CMakeLists.txt.orig	2017-11-29 14:49:00 UTC
>++++ CMakeLists.txt
>+@@ -172,7 +172,7 @@ ENDIF()
>+ # library is not necessary. We currently don't case for pthreads on Windows
>+ # which might be an issue on things like Cygwin. This may need to be fixed.
>+ IF(NOT ANDROID)
>+-    FIND_PACKAGE(Threads)
>++    FIND_PACKAGE(Threads REQUIRED)
>+ ENDIF()
>+ IF(CMAKE_SYSTEM MATCHES IRIX)
>+     # Erase CMAKE_THREAD_LIBS_INIT and hope it works
>+@@ -278,7 +278,7 @@ IF(APPLE)
>+         UNSET(OPENGL_gl_LIBRARY CACHE)
>+         UNSET(OPENGL_INCLUDE_DIR CACHE)
>+         IF(OSG_WINDOWING_SYSTEM STREQUAL "X11")
>+-          FIND_PACKAGE(X11)
>++          FIND_PACKAGE(X11 REQUIRED)
>+           IF(NOT X11_FOUND)
>+             MESSAGE(FATAL_ERROR "OSG_WINDOWING_SYSTEM is X11, but no X11 installation was found. Please make sure X11 is properly installed.")
>+           ENDIF()
>+@@ -293,7 +293,7 @@ IF(APPLE)
>+           FIND_LIBRARY(AGL_LIBRARY AGL)
>+         ENDIF()
>  
>+-        FIND_PACKAGE(OpenGL)
>++        FIND_PACKAGE(OpenGL REQUIRED)
>+         FIND_PACKAGE(EGL)
>+     ENDIF ()
>+ 
>+@@ -301,7 +301,7 @@ IF(APPLE)
>+     SET(OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR "@executable_path/../Frameworks" CACHE STRING "install name dir for compiled frameworks")
>+ ELSE()
>+     # Non-Apple: Find OpenGL
>+-    FIND_PACKAGE(OpenGL)
>++    FIND_PACKAGE(OpenGL REQUIRED)
>+     FIND_PACKAGE(EGL)
>+ ENDIF()
>+ ENDIF()
>+@@ -313,11 +313,10 @@ ENDIF()
>+ IF(UNIX AND NOT ANDROID)
>+     # Not sure what this will do on Cygwin and Msys
>+     # Also, remember OS X X11 is a user installed option so it may not exist.
>+-    FIND_PACKAGE(X11)
>++    FIND_PACKAGE(X11 REQUIRED)
>+     # Some Unicies need explicit linkage to the Math library or the build fails.
>+     FIND_LIBRARY(MATH_LIBRARY m)
>+ 
>+-    FIND_LIBRARY(DL_LIBRARY dl)
>+     IF(NOT DL_LIBRARY)
>+         SET(DL_LIBRARY "") # change from NOTFOUND to empty when passed to linker
>+     ENDIF()
>+@@ -744,44 +743,44 @@ IF(ANDROID)
>+     ANDROID_3RD_PARTY()
>+ ELSE()
>+ # Common to all platforms except android:
>+-    FIND_PACKAGE(Freetype)
>++    FIND_PACKAGE(Freetype REQUIRED)
>+     FIND_PACKAGE(ilmbase)
>+-    FIND_PACKAGE(Inventor)
>+-    FIND_PACKAGE(Jasper)
>+-    FIND_PACKAGE(OpenEXR)
>++    FIND_PACKAGE(Inventor REQUIRED)
>++    FIND_PACKAGE(Jasper REQUIRED)
>++    FIND_PACKAGE(OpenEXR REQUIRED)
>+     FIND_PACKAGE(OpenCascade)
>+-    FIND_PACKAGE(COLLADA)
>+-    FIND_PACKAGE(FBX)
>+-    FIND_PACKAGE(ZLIB)
>+-    FIND_PACKAGE(Xine)
>+-    FIND_PACKAGE(OpenVRML)
>+-    FIND_PACKAGE(GDAL)
>+-    FIND_PACKAGE(GTA)
>+-    FIND_PACKAGE(CURL)
>+-    FIND_PACKAGE(LibVNCServer)
>++#    FIND_PACKAGE(COLLADA)
>++#    FIND_PACKAGE(FBX)
>++    FIND_PACKAGE(ZLIB REQUIRED)
>++    FIND_PACKAGE(Xine REQUIRED)
>++#    FIND_PACKAGE(OpenVRML)
>++    FIND_PACKAGE(GDAL REQUIRED)
>++    FIND_PACKAGE(GTA REQUIRED)
>++    FIND_PACKAGE(CURL REQUIRED)
>++    FIND_PACKAGE(LibVNCServer REQUIRED)
>+     FIND_PACKAGE(DCMTK)
>+-    FIND_PACKAGE(FFmpeg)
>+-    FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
>++    FIND_PACKAGE(FFmpeg REQUIRED)
>++#    FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
>+     FIND_PACKAGE(GLIB COMPONENTS gobject)
>+     FIND_PACKAGE(DirectShow)
>+-    FIND_PACKAGE(SDL2)
>+-    FIND_PACKAGE(SDL)
>+-    FIND_PACKAGE(Poppler-glib)
>+-    FIND_PACKAGE(RSVG)
>+-    FIND_PACKAGE(GtkGl)
>++#    FIND_PACKAGE(SDL2 REQUIRED)
>++    FIND_PACKAGE(SDL REQUIRED)
>++    FIND_PACKAGE(Poppler-glib REQUIRED)
>++    FIND_PACKAGE(RSVG REQUIRED)
>++#    FIND_PACKAGE(GtkGl)
>+     FIND_PACKAGE(DirectInput)
>+-    FIND_PACKAGE(NVTT)
>++    FIND_PACKAGE(NVTT REQUIRED)
>+     IF (NOT WIN32)
>+         FIND_PACKAGE(Asio)
>+     ENDIF()
>+     FIND_PACKAGE(ZeroConf)
>+ 
>+-    FIND_PACKAGE(LIBLAS)
>++    FIND_PACKAGE(LIBLAS REQUIRED)
>+ 
>+     IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
>+-        FIND_PACKAGE(Lua52)
>++        FIND_PACKAGE(Lua52 REQUIRED)
>+         IF (NOT (LUA_LIBRARIES AND LUA_INCLUDE_DIR))
>+-            FIND_PACKAGE(Lua51)
>++#            FIND_PACKAGE(Lua51)
>+         ENDIF()
>+     ENDIF()
>+ 
>+@@ -798,11 +797,11 @@ INCLUDE(OsgMacroUtils)
>+ IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
>+ 
>+ 
>+-    FIND_PACKAGE(FLTK)
>+-    FIND_PACKAGE(FOX)
>++#    FIND_PACKAGE(FLTK)
>++#    FIND_PACKAGE(FOX)
>+ 
>+     SET(wxWidgets_USE_LIBS base core gl net)
>+-    FIND_PACKAGE(wxWidgets)
>++#    FIND_PACKAGE(wxWidgets)
>+ 
>+ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
>+ 
>+@@ -823,17 +822,17 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID
>+ # can use Quicktime.
>+ IF(NOT ANDROID)
>+     IF(NOT APPLE)
>+-        FIND_PACKAGE(GIFLIB)
>+-        FIND_PACKAGE(JPEG)
>+-        FIND_PACKAGE(PNG)
>+-        FIND_PACKAGE(TIFF)
>++        FIND_PACKAGE(GIFLIB REQUIRED)
>++        FIND_PACKAGE(JPEG REQUIRED)
>++        FIND_PACKAGE(PNG REQUIRED)
>++        FIND_PACKAGE(TIFF REQUIRED)
>+         # QuickTime is required for OS X, but optional for Windows.
>+         IF(WIN32)
>+             FIND_PACKAGE(QuickTime)
>+         ENDIF()
>+ 
>+     ELSE()
>+-        FIND_PACKAGE(TIFF)
>++        FIND_PACKAGE(TIFF REQUIRED)
>+         FIND_PACKAGE(QuickTime)
>+         FIND_PACKAGE(QTKit)
>+         FIND_PACKAGE(CoreVideo)
>+@@ -895,7 +894,7 @@ ENDIF()
>+ 
>  IF(UNIX AND NOT WIN32 AND NOT APPLE)
>    IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
> -      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
>@@ -9,7 +165,7 @@
>        MARK_AS_ADVANCED(LIB_POSTFIX)
>    ENDIF()
>  ENDIF()
>-@@ -972,7 +972,7 @@
>+@@ -1312,7 +1311,7 @@ FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES
>      ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc
>      @ONLY
>      )
>Index: graphics/osg/files/patch-CMakeModules-FindGTA.cmake
>===================================================================
>--- graphics/osg/files/patch-CMakeModules-FindGTA.cmake	(revision 455869)
>+++ graphics/osg/files/patch-CMakeModules-FindGTA.cmake	(nonexistent)
>@@ -1,25 +0,0 @@
>---- CMakeModules/FindGTA.cmake.orig	2014-01-19 17:46:13.693927259 +0400
>-+++ CMakeModules/FindGTA.cmake	2014-01-19 18:38:17.868997891 +0400
>-@@ -8,16 +8,6 @@
>- # correspond to the ./configure --prefix=$GTA_DIR
>- # used in building libgta.
>- 
>--INCLUDE(FindPkgConfig OPTIONAL)
>--
>--IF(PKG_CONFIG_FOUND)
>--
>--    INCLUDE(FindPkgConfig)
>--
>--    PKG_CHECK_MODULES(GTA gta)
>--
>--ELSE(PKG_CONFIG_FOUND)
>--
>- FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
>-     $ENV{GTA_DIR}/include
>-     $ENV{GTA_DIR}
>-@@ -52,5 +42,3 @@
>- IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
>-     SET(GTA_FOUND "YES")
>- ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
>--
>--ENDIF(PKG_CONFIG_FOUND)
>
>Property changes on: graphics/osg/files/patch-CMakeModules-FindGTA.cmake
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake
>===================================================================
>--- graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake	(revision 455869)
>+++ graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- CMakeModules/FindGStreamer.cmake.orig	2017-12-11 07:40:40 UTC
>++++ CMakeModules/FindGStreamer.cmake
>+@@ -83,18 +83,18 @@ else ()
>      find_package(PkgConfig)    
>  
>      macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
>@@ -12,17 +12,16 @@
> -#            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}
>+-#        )
> +        find_library(${_component_prefix}_LIBRARIES
> +            NAMES ${_library}
> +            HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
>Index: graphics/osg/files/patch-ffmpeg3
>===================================================================
>--- graphics/osg/files/patch-ffmpeg3	(revision 455869)
>+++ graphics/osg/files/patch-ffmpeg3	(nonexistent)
>@@ -1,157 +0,0 @@
>-Description: Replace deprecated FFmpeg API
>-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
>-Last-Update: <2015-11-02>
>-
>---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp.orig
>-+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
>-@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream *
>-     findAspectRatio();
>- 
>-     // Find out whether we support Alpha channel
>--    m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);
>-+    m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);
>- 
>-     // Find out the framerate
>-     m_frame_rate = av_q2d(stream->avg_frame_rate);
>-@@ -91,20 +91,19 @@ void FFmpegDecoderVideo::open(AVStream *
>-         throw std::runtime_error("avcodec_open() failed");
>- 
>-     // Allocate video frame
>--    m_frame.reset(avcodec_alloc_frame());
>-+    m_frame.reset(av_frame_alloc());
>- 
>-     // Allocate converted RGB frame
>--    m_frame_rgba.reset(avcodec_alloc_frame());
>--    m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height()));
>-+    m_frame_rgba.reset(av_frame_alloc());
>-+    m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height()));
>-     m_buffer_rgba[1].resize(m_buffer_rgba[0].size());
>- 
>-     // Assign appropriate parts of the buffer to image planes in m_frame_rgba
>--    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());
>-+    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());
>- 
>-     // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame.
>-     m_context->opaque = this;
>--    m_context->get_buffer = getBuffer;
>--    m_context->release_buffer = releaseBuffer;
>-+    m_context->get_buffer2 = getBuffer;
>- }
>- 
>- 
>-@@ -263,8 +262,8 @@ int FFmpegDecoderVideo::convert(AVPictur
>- #ifdef USE_SWSCALE
>-     if (m_swscale_ctx==0)
>-     {
>--        m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt,
>--                                      src_width, src_height, (PixelFormat) dst_pix_fmt,
>-+        m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt,
>-+                                      src_width, src_height, (AVPixelFormat) dst_pix_fmt,
>-                                       /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL);
>-     }
>- 
>-@@ -311,14 +310,14 @@ void FFmpegDecoderVideo::publishFrame(co
>-     AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
>- 
>-     // Assign appropriate parts of the buffer to image planes in m_frame_rgba
>--    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height());
>-+    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height());
>- 
>-     // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine
>- 
>--    if (m_context->pix_fmt == PIX_FMT_YUVA420P)
>-+    if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P)
>-         yuva420pToRgba(dst, src, width(), height());
>-     else
>--        convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
>-+        convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
>- 
>-     // Wait 'delay' seconds before publishing the picture.
>-     int i_delay = static_cast<int>(delay * 1000000 + 0.5);
>-@@ -345,7 +344,7 @@ void FFmpegDecoderVideo::publishFrame(co
>- 
>- void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height)
>- {
>--    convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
>-+    convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
>- 
>-     const size_t bpp = 4;
>- 
>-@@ -363,31 +362,28 @@ void FFmpegDecoderVideo::yuva420pToRgba(
>-     }
>- }
>- 
>--
>--
>--int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture)
>-+int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags)
>- {
>-+    AVBufferRef *ref;
>-     const FFmpegDecoderVideo * const this_ = reinterpret_cast<const FFmpegDecoderVideo*>(context->opaque);
>- 
>--    const int result = avcodec_default_get_buffer(context, picture);
>-+    const int result = avcodec_default_get_buffer2(context, picture, flags);
>-     int64_t * p_pts = reinterpret_cast<int64_t*>( av_malloc(sizeof(int64_t)) );
>- 
>-     *p_pts = this_->m_packet_pts;
>-     picture->opaque = p_pts;
>- 
>-+    ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags);
>-+    picture->buf[0] = ref;
>-+
>-     return result;
>- }
>- 
>--
>--
>--void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture)
>-+void FFmpegDecoderVideo::freeBuffer(void *opaque, uint8_t *data)
>- {
>--    if (picture != 0)
>--        av_freep(&picture->opaque);
>--
>--    avcodec_default_release_buffer(context, picture);
>-+    AVBufferRef *ref = (AVBufferRef *)opaque;
>-+    av_buffer_unref(&ref);
>-+    av_free(data);
>- }
>- 
>--
>--
>- } // namespace osgFFmpeg
>---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp.orig
>-+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
>-@@ -94,8 +94,8 @@ private:
>-                 int src_pix_fmt, int src_width, int src_height);
>- 
>- 
>--    static int getBuffer(AVCodecContext * context, AVFrame * picture);
>--    static void releaseBuffer(AVCodecContext * context, AVFrame * picture);
>-+    static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags);
>-+    static void freeBuffer(void * opaque, uint8_t *data);
>- 
>-     PacketQueue &           m_packets;
>-     FFmpegClocks &          m_clocks;
>---- src/osgPlugins/ffmpeg/FFmpegParameters.cpp.orig
>-+++ src/osgPlugins/ffmpeg/FFmpegParameters.cpp
>-@@ -19,7 +19,7 @@ extern "C"
>-     #include <libavutil/pixdesc.h>
>- }
>- 
>--inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
>-+inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
>- 
>- 
>- namespace osgFFmpeg {
>---- src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp.orig	2016-02-18 21:25:39.627923629 +0000
>-+++ src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp	2016-02-18 21:26:17.071140100 +0000
>-@@ -227,8 +227,7 @@
>-         if (avcodec_open2(m_context, p_codec, NULL) < 0)
>-             throw std::runtime_error("avcodec_open() failed");
>- 
>--        m_context->get_buffer = avcodec_default_get_buffer;
>--        m_context->release_buffer = avcodec_default_release_buffer;
>-+        m_context->get_buffer2 = avcodec_default_get_buffer2;
>- 
>-     }
>- 
>
>Property changes on: graphics/osg/files/patch-ffmpeg3
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/osg/files/patch-shift-key-fix
>===================================================================
>--- graphics/osg/files/patch-shift-key-fix	(revision 455928)
>+++ graphics/osg/files/patch-shift-key-fix	(nonexistent)
>@@ -1,23 +0,0 @@
>-# Shift key not released if group switch is something other than Control-Shift:
>-# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1218650.html
>-
>---- src/osgGA/EventQueue.cpp.orig
>-+++ src/osgGA/EventQueue.cpp
>-@@ -337,7 +337,7 @@ void EventQueue::mouseButtonRelease(floa
>- 
>- void EventQueue::keyPress(int key, double time, int unmodifiedKey)
>- {
>--    switch(key)
>-+    switch(unmodifiedKey)
>-     {
>-         case(GUIEventAdapter::KEY_Shift_L):      _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_SHIFT | _accumulateEventState->getModKeyMask()); break;
>-         case(GUIEventAdapter::KEY_Shift_R):      _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_SHIFT | _accumulateEventState->getModKeyMask()); break;
>-@@ -381,7 +381,7 @@ void EventQueue::keyPress(int key, doubl
>- 
>- void EventQueue::keyRelease(int key, double time, int unmodifiedKey)
>- {
>--    switch(key)
>-+    switch(unmodifiedKey)
>-     {
>-         case(GUIEventAdapter::KEY_Shift_L):      _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_SHIFT & _accumulateEventState->getModKeyMask()); break;
>-         case(GUIEventAdapter::KEY_Shift_R):      _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_SHIFT & _accumulateEventState->getModKeyMask()); break;
>
>Property changes on: graphics/osg/files/patch-shift-key-fix
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt
>===================================================================
>--- graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt	(revision 455869)
>+++ graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt	(working copy)
>@@ -1,8 +1,8 @@
>---- src/OpenThreads/CMakeLists.txt.orig	2009-01-27 18:34:57.000000000 +0300
>-+++ src/OpenThreads/CMakeLists.txt	2009-02-05 17:54:57.000000000 +0300
>-@@ -94,4 +94,4 @@
>+--- src/OpenThreads/CMakeLists.txt.orig	2017-11-29 14:49:00 UTC
>++++ src/OpenThreads/CMakeLists.txt
>+@@ -113,4 +113,4 @@ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/pac
>      @ONLY
>      )
>  
>--INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig)
>+-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig  COMPONENT libopenthreads-dev)
> +INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION libdata/pkgconfig)
>Index: graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp
>===================================================================
>--- graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp	(revision 455869)
>+++ graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp	(nonexistent)
>@@ -1,37 +0,0 @@
>---- src/OpenThreads/pthreads/PThread.cpp.orig	2011-06-24 00:09:26.000000000 +0400
>-+++ src/OpenThreads/pthreads/PThread.cpp	2012-03-05 05:57:02.886704932 +0400
>-@@ -21,6 +21,7 @@
>- #include <sys/types.h>
>- #include <unistd.h>
>- #include <pthread.h>
>-+#include <pthread_np.h>
>- #include <limits.h>
>- 
>- #if defined __linux || defined __sun || defined __APPLE__ || ANDROID
>-@@ -136,7 +137,7 @@
>- #if defined(__sgi)
>-             pthread_setrunon_np( pd->cpunum );
>- #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
>--            cpu_set_t cpumask;
>-+            cpuset_t cpumask;
>-             CPU_ZERO( &cpumask );
>-             CPU_SET( pd->cpunum, &cpumask );
>- 
>-@@ -569,7 +570,7 @@
>- 
>-     if (pd->isRunning && Thread::CurrentThread()==this)
>-     {
>--        cpu_set_t cpumask;
>-+        cpuset_t cpumask;
>-         CPU_ZERO( &cpumask );
>-         CPU_SET( pd->cpunum, &cpumask );
>- #if defined(HAVE_PTHREAD_SETAFFINITY_NP)
>-@@ -1031,7 +1032,7 @@
>-     else
>-     {
>- #if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
>--        cpu_set_t cpumask;
>-+        cpuset_t cpumask;
>-         CPU_ZERO( &cpumask );
>-         CPU_SET( cpunum, &cpumask );
>- #if defined(HAVE_PTHREAD_SETAFFINITY_NP)
>
>Property changes on: graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp
>===================================================================
>--- graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp	(nonexistent)
>+++ graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp	(working copy)
>@@ -0,0 +1,19 @@
>+--- src/OpenThreads/pthreads/PThread.cpp.orig	2017-12-11 07:44:35 UTC
>++++ src/OpenThreads/pthreads/PThread.cpp
>+@@ -21,6 +21,7 @@
>+ #include <sys/types.h>
>+ #include <unistd.h>
>+ #include <pthread.h>
>++#include <pthread_np.h>
>+ #include <limits.h>
>+ 
>+ #if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID
>+@@ -113,7 +114,7 @@ namespace OpenThreads
>+ static void setAffinity(const Affinity& affinity)
>+ {
>+     //std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <<std::endl;
>+-    cpu_set_t cpumask;
>++    cpuset_t cpumask;
>+     CPU_ZERO( &cpumask );
>+     unsigned int numprocessors = OpenThreads::GetNumberOfProcessors();
>+     if (affinity)
>
>Property changes on: graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp
>___________________________________________________________________
>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: graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt
>===================================================================
>--- graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt	(revision 455869)
>+++ graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt	(working copy)
>@@ -1,4 +1,4 @@
>---- src/osgPlugins/ffmpeg/CMakeLists.txt.orig	2015-01-07 14:14:55 UTC
>+--- src/osgPlugins/ffmpeg/CMakeLists.txt.orig	2017-11-29 14:49:00 UTC
> +++ src/osgPlugins/ffmpeg/CMakeLists.txt
> @@ -1,9 +1,9 @@
> -INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
>Index: graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt
>===================================================================
>--- graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt	(revision 455869)
>+++ graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt	(working copy)
>@@ -1,5 +1,5 @@
>---- ./src/osgPlugins/gdal/CMakeLists.txt.orig	2015-07-02 11:58:49 UTC
>-+++ ./src/osgPlugins/gdal/CMakeLists.txt
>+--- src/osgPlugins/gdal/CMakeLists.txt.orig	2017-11-29 14:49:00 UTC
>++++ src/osgPlugins/gdal/CMakeLists.txt
> @@ -1,4 +1,4 @@
> -INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} )
> +INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR})
>Index: graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt
>===================================================================
>--- graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt	(revision 455869)
>+++ graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt	(working copy)
>@@ -1,4 +1,4 @@
>---- src/osgPlugins/nvtt/CMakeLists.txt.orig	2011-04-19 11:40:22 UTC
>+--- src/osgPlugins/nvtt/CMakeLists.txt.orig	2017-11-29 14:49:00 UTC
> +++ src/osgPlugins/nvtt/CMakeLists.txt
> @@ -1,4 +1,4 @@
> -INCLUDE_DIRECTORIES( ${NVTT_INCLUDE_DIR} )
>Index: graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt
>===================================================================
>--- graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt	(revision 455869)
>+++ graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt	(working copy)
>@@ -1,5 +1,5 @@
>---- ./src/osgPlugins/ogr/CMakeLists.txt.orig	2011-04-19 11:40:22 UTC
>-+++ ./src/osgPlugins/ogr/CMakeLists.txt
>+--- src/osgPlugins/ogr/CMakeLists.txt.orig	2017-11-29 14:49:00 UTC
>++++ src/osgPlugins/ogr/CMakeLists.txt
> @@ -1,4 +1,4 @@
> -INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} )
> +INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR})
>Index: graphics/osg/pkg-plist
>===================================================================
>--- graphics/osg/pkg-plist	(revision 455869)
>+++ graphics/osg/pkg-plist	(working copy)
>@@ -4,6 +4,7 @@
> bin/osgversion
> bin/osgviewer
> bin/present3D
>+include/OpenThreads/Affinity
> include/OpenThreads/Atomic
> include/OpenThreads/Barrier
> include/OpenThreads/Block
>@@ -21,7 +22,7 @@
> include/osg/ApplicationUsage
> include/osg/ArgumentParser
> include/osg/Array
>-include/osg/ArrayDispatchers
>+include/osg/AttributeDispatchers
> include/osg/AudioStream
> include/osg/AutoTransform
> include/osg/Billboard
>@@ -51,7 +52,9 @@
> include/osg/ColorMaski
> include/osg/ColorMatrix
> include/osg/ComputeBoundsVisitor
>+include/osg/ComputeDispatch
> include/osg/Config
>+include/osg/ContextData
> include/osg/ConvexPlanarOccluder
> include/osg/ConvexPlanarPolygon
> include/osg/CoordinateSystemNode
>@@ -62,6 +65,7 @@
> include/osg/CullingSet
> include/osg/DeleteHandler
> include/osg/Depth
>+include/osg/DepthRangeIndexed
> include/osg/DisplaySettings
> include/osg/DrawPixels
> include/osg/Drawable
>@@ -74,7 +78,6 @@
> include/osg/FrontFace
> include/osg/GL
> include/osg/GL2Extensions
>-include/osg/GLBeginEndAdapter
> include/osg/GLDefines
> include/osg/GLExtensions
> include/osg/GLObjects
>@@ -86,6 +89,7 @@
> include/osg/GraphicsThread
> include/osg/Group
> include/osg/Hint
>+include/osg/Identifier
> include/osg/Image
> include/osg/ImageSequence
> include/osg/ImageStream
>@@ -130,6 +134,7 @@
> include/osg/PositionAttitudeTransform
> include/osg/PrimitiveRestartIndex
> include/osg/PrimitiveSet
>+include/osg/PrimitiveSetIndirect
> include/osg/Program
> include/osg/Projection
> include/osg/ProxyNode
>@@ -138,6 +143,7 @@
> include/osg/RenderInfo
> include/osg/SampleMaski
> include/osg/Scissor
>+include/osg/ScissorIndexed
> include/osg/ScriptEngine
> include/osg/Sequence
> include/osg/ShadeModel
>@@ -156,6 +162,7 @@
> include/osg/StencilTwoSided
> include/osg/Switch
> include/osg/TemplatePrimitiveFunctor
>+include/osg/TemplatePrimitiveIndexFunctor
> include/osg/TexEnv
> include/osg/TexEnvCombine
> include/osg/TexEnvFilter
>@@ -176,10 +183,15 @@
> include/osg/Transform
> include/osg/TriangleFunctor
> include/osg/TriangleIndexFunctor
>+include/osg/TriangleLinePointIndexFunctor
> include/osg/Types
> include/osg/Uniform
> include/osg/UserDataContainer
>+include/osg/ValueMap
> include/osg/ValueObject
>+include/osg/ValueStack
>+include/osg/VertexArrayState
>+include/osg/ViewportIndexed
> include/osg/Vec2
> include/osg/Vec2b
> include/osg/Vec2d
>@@ -238,6 +250,8 @@
> include/osgAnimation/Interpolator
> include/osgAnimation/Keyframe
> include/osgAnimation/LinkVisitor
>+include/osgAnimation/MorphTransformHardware
>+include/osgAnimation/MorphTransformSoftware
> include/osgAnimation/MorphGeometry
> include/osgAnimation/RigGeometry
> include/osgAnimation/RigTransform
>@@ -556,6 +570,12 @@
> include/osgUtil/TriStripVisitor
> include/osgUtil/UpdateVisitor
> include/osgUtil/Version
>+include/osgViewer/config/AcrossAllScreens
>+include/osgViewer/config/PanoramicSphericalDisplay
>+include/osgViewer/config/SingleScreen
>+include/osgViewer/config/SingleWindow
>+include/osgViewer/config/SphericalDisplay
>+include/osgViewer/config/WoWVxDisplay
> include/osgViewer/CompositeViewer
> include/osgViewer/Export
> include/osgViewer/GraphicsWindow
>@@ -685,7 +705,6 @@
> 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
>@@ -732,6 +751,7 @@
> 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_resthttp.so
> lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so
> lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
> lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so

Actions: View | Diff

Attachments on bug 224236: 188703