<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45e32177938c34707e02e20b2529de9032eaba6a">https://github.com/macports/macports-ports/commit/45e32177938c34707e02e20b2529de9032eaba6a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 45e32177938c34707e02e20b2529de9032eaba6a
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Apr 28 16:13:48 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> OpenSceneGraph: update to version 3.6.0 using github
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Builds cleanly with ffmpeg 4.0.
</span>---
graphics/OpenSceneGraph/Portfile | 36 ++---
.../OpenSceneGraph/files/patch-ffmpeg-3.0.diff | 157 ---------------------
...h-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff | 16 ---
3 files changed, 8 insertions(+), 201 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph/Portfile b/graphics/OpenSceneGraph/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc7ca93..55a1987 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/OpenSceneGraph/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name OpenSceneGraph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup openscenegraph OpenSceneGraph 3.6.0 OpenSceneGraph-
</span> conflicts OpenSceneGraph-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 13
</span> platforms darwin
categories graphics
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,12 +17,10 @@ long_description ${name} is a high-performance 3D graphics toolkit useful
</span> modelling.
homepage http://www.openscenegraph.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}downloads/stable_releases/${name}-${version}/source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6043321fc1c9b23f0e536c4e18a96a97d8b16c30 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e3040e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b66d56772840a4db97a567f959eb178b2301e8fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9ac3a4e902486c694f35f9d6e3032b8eb5df63b16bd7c0003e7531ca5a6ff150 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5788749
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,16 +38,11 @@ depends_lib port:freetype \
</span> port:boost \
port:gstreamer1-gst-plugins-base
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ffmpeg-3.0.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append -DOSG_CONFIG_HAS_BEEN_RUN_BEFORE=YES \
-DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX=imageio \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSG_WINDOWING_SYSTEM=Cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSG_USE_QT:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOSG_WINDOWING_SYSTEM=Cocoa
</span>
# disable unwanted optional dependencies to avoid opportunistic configuration
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# before cmake 2.8 this required patching CMakeLists.txt
</span> # TODO: add some of these back either directly or as variants after testing
configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,10 +50,8 @@ configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_FBX=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_Xine=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_Performer=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_GTA=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_OurDCMTK=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_SDL=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=1 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,12 +61,4 @@ configure.args-append -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 \
</span> -DCMAKE_DISABLE_FIND_PACKAGE_ZeroConf=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 description "with Qt5 support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DOSG_USE_QT:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DOSG_USE_QT:BOOL=ON -DDESIRED_QT_VERSION=5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:poppler-qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}downloads/stable_releases/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${name}-(\\d+\\.\\d*\[02468\](?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${name}-(\\d+(?:\\.\\d+)+)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph/files/patch-ffmpeg-3.0.diff b/graphics/OpenSceneGraph/files/patch-ffmpeg-3.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 08334c2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,157 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Description: Replace deprecated FFmpeg API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Last-Update: <2015-11-02>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp.orig 2014-11-04 08:29:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp 2016-04-26 14:11:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- findAspectRatio();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Find out whether we support Alpha channel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Find out the framerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if LIBAVCODEC_VERSION_MAJOR >= 56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,20 +95,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::runtime_error("avcodec_open() failed");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Allocate video frame
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_frame.reset(avcodec_alloc_frame());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_frame.reset(av_frame_alloc());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Allocate converted RGB frame
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_frame_rgba.reset(avcodec_alloc_frame());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_frame_rgba.reset(av_frame_alloc());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_buffer_rgba[1].resize(m_buffer_rgba[0].size());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Assign appropriate parts of the buffer to image planes in m_frame_rgba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_context->opaque = this;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_context->get_buffer = getBuffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_context->release_buffer = releaseBuffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_context->get_buffer2 = getBuffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -267,8 +266,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_SWSCALE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_swscale_ctx==0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- src_width, src_height, (PixelFormat) dst_pix_fmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ src_width, src_height, (AVPixelFormat) dst_pix_fmt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,14 +314,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Assign appropriate parts of the buffer to image planes in m_frame_rgba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (m_context->pix_fmt == PIX_FMT_YUVA420P)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yuva420pToRgba(dst, src, width(), height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Wait 'delay' seconds before publishing the picture.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_delay = static_cast<int>(delay * 1000000 + 0.5);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,7 +348,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const size_t bpp = 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -367,31 +366,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AVBufferRef *ref;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const FFmpegDecoderVideo * const this_ = reinterpret_cast<const FFmpegDecoderVideo*>(context->opaque);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const int result = avcodec_default_get_buffer(context, picture);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const int result = avcodec_default_get_buffer2(context, picture, flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int64_t * p_pts = reinterpret_cast<int64_t*>( av_malloc(sizeof(int64_t)) );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *p_pts = this_->m_packet_pts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- picture->opaque = p_pts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ picture->buf[0] = ref;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void FFmpegDecoderVideo::freeBuffer(void *opaque, uint8_t *data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (picture != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- av_freep(&picture->opaque);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- avcodec_default_release_buffer(context, picture);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AVBufferRef *ref = (AVBufferRef *)opaque;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_buffer_unref(&ref);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ av_free(data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } // namespace osgFFmpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,8 +94,8 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int src_pix_fmt, int src_width, int src_height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static int getBuffer(AVCodecContext * context, AVFrame * picture);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static void releaseBuffer(AVCodecContext * context, AVFrame * picture);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static void freeBuffer(void * opaque, uint8_t *data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PacketQueue & m_packets;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFmpegClocks & m_clocks;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osgPlugins/ffmpeg/FFmpegParameters.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osgPlugins/ffmpeg/FFmpegParameters.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@ extern "C"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libavutil/pixdesc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace osgFFmpeg {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp.orig 2016-02-18 21:25:39.627923629 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2016-02-18 21:26:17.071140100 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -227,8 +227,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (avcodec_open2(m_context, p_codec, NULL) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::runtime_error("avcodec_open() failed");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_context->get_buffer = avcodec_default_get_buffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_context->release_buffer = avcodec_default_release_buffer;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_context->get_buffer2 = avcodec_default_get_buffer2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/OpenSceneGraph/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff b/graphics/OpenSceneGraph/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ddb13ec..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/OpenSceneGraph/files/patch-src_osgPlugins_jpeg_ReaderWriterJPEG.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osgPlugins/jpeg/ReaderWriterJPEG.cpp 2015-04-07 20:01:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osgPlugins/jpeg/ReaderWriterJPEG.cpp.new 2016-12-17 01:44:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,11 +72,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Some versions of jmorecfg.h define boolean, some don't...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Those that do also define HAVE_BOOLEAN, so we can guard using that. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef HAVE_BOOLEAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef int boolean;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FALSE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define TRUE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CODE FOR READING/WRITING JPEG FROM STREAMS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This code was taken directly from jdatasrc.c and jdatadst.c (libjpeg source)
</span></pre><pre style='margin:0'>
</pre>