From 464bcbc41354edf9622cf5fb670bf1cd96347ead Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 7 Sep 2016 13:49:46 +0200 Subject: [PATCH] dev-games/OpenSceneGraph: rm old --- .../OpenSceneGraph-3.5.2.exheres-0 | 91 --------- ....5.2-Fix-wrong-jpeg-boolean-handling.patch | 32 ---- .../OpenSceneGraph-3.5.2-ffmpeg-3.0.patch | 174 ------------------ 3 files changed, 297 deletions(-) delete mode 100644 packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.2.exheres-0 delete mode 100644 packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-Fix-wrong-jpeg-boolean-handling.patch delete mode 100644 packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-ffmpeg-3.0.patch diff --git a/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.2.exheres-0 b/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.2.exheres-0 deleted file mode 100644 index d30663bf..00000000 --- a/packages/dev-games/OpenSceneGraph/OpenSceneGraph-3.5.2.exheres-0 +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2013-2014 Thomas Witt -# Copyright 2016 Julian Ospald -# Distributed under the terms of the GNU General Public License v2 - -MY_PN="OpenSceneGraph" -MY_PNV=${MY_PN}-${PV} - -require github [ user=openscenegraph project=${MY_PN} tag=${MY_PNV} ] -require cmake [ api=2 ] - -SUMMARY="High performance 3D graphics toolkit" -DESCRIPTION=" - The OpenSceneGraph is an open source high performance 3D graphics toolkit, - used by application developers in fields such as visual simulation, games, - virtual reality, scientific visualization and modelling. Written entirely - in Standard C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, - IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph - is now well established as the world leading scene graph technology, used - widely in the vis-sim, space, scientific, oil-gas, games and virtual reality - industries. -" - -HOMEPAGE="http://${PN}.org" - -LICENCES="wxWinLL-3 LGPL-2.1" -SLOT="0" -PLATFORMS="~amd64 ~x86" -MYOPTIONS=" - ( providers: ffmpeg libav ) [[ number-selected = exactly-one ]] - ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]] -" - -DEPENDENCIES=" - build: - virtual/unzip - build+run: - app-text/poppler[cairo] - dev-libs/glib:2 - media-libs/freetype:2 - media-libs/giflib:= - media-libs/gstreamer:1.0 - media-libs/ilmbase - media-libs/jasper - media-libs/libpng:= - media-libs/openexr - media-libs/SDL:0 - media-libs/tiff - media-plugins/gst-plugins-base:1.0 - net-misc/curl - sys-libs/zlib - x11-dri/mesa - x11-libs/cairo - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/qtbase:5 - providers:ffmpeg? ( media/ffmpeg ) - providers:ijg-jpeg? ( media-libs/jpeg:= ) - providers:jpeg-turbo? ( media-libs/libjpeg-turbo ) - providers:libav? ( media/libav ) -" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/${PNV}-Fix-wrong-jpeg-boolean-handling.patch - "${FILES}"/${PNV}-ffmpeg-3.0.patch -) - -CMAKE_SRC_CONFIGURE_PARAMS=( - -DCMAKE_DISABLE_FIND_PACKAGE_Asio=1 - -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=1 - -DCMAKE_DISABLE_FIND_PACKAGE_COLLADA=1 - -DCMAKE_DISABLE_FIND_PACKAGE_FBX= - -DCMAKE_DISABLE_FIND_PACKAGE_Xine=1 - -DCMAKE_DISABLE_FIND_PACKAGE_OpenVRML=1 - -DCMAKE_DISABLE_FIND_PACKAGE_Performer=1 - -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=1 - -DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=1 - -DCMAKE_DISABLE_FIND_PACKAGE_OurDCMTK=1 - -DCMAKE_DISABLE_FIND_PACKAGE_RSVG=1 - -DCMAKE_DISABLE_FIND_PACKAGE_NVTT=1 - -DCMAKE_DISABLE_FIND_PACKAGE_LIBLAS=1 - -DCMAKE_DISABLE_FIND_PACKAGE_Lua51=1 - -DCMAKE_DISABLE_FIND_PACKAGE_Lua52=1 - -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1 - -DOSG_USE_QT=ON - -DOSG_USE_LOCAL_LUA_SOURCE=OFF - -DDESIRED_QT_VERSION=5 - -DOPENGL_PROFILE=GL2 - -DDYNAMIC_OPENSCENEGRAPH=ON - -DLIB_POSTFIX="" -) - diff --git a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-Fix-wrong-jpeg-boolean-handling.patch b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-Fix-wrong-jpeg-boolean-handling.patch deleted file mode 100644 index c14d804b..00000000 --- a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-Fix-wrong-jpeg-boolean-handling.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a20af6ee2e4b666fec79c2f545e548bd9470bbe6 Mon Sep 17 00:00:00 2001 -From: Julian Ospald -Date: Wed, 16 Mar 2016 21:51:29 +0100 -Subject: [PATCH] Fix wrong jpeg boolean handling - -Upstream: reported only https://github.com/openscenegraph/OpenSceneGraph/issues/58 ---- - src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp -index dd681e8..73480fb 100644 ---- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp -+++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp -@@ -70,14 +70,6 @@ namespace osgDBJPEG - - static int jpegerror = ERR_NO_ERROR; - --/* Some versions of jmorecfg.h define boolean, some don't... -- Those that do also define HAVE_BOOLEAN, so we can guard using that. */ --#ifndef HAVE_BOOLEAN -- typedef int boolean; -- #define FALSE 0 -- #define TRUE 1 --#endif -- - /* CODE FOR READING/WRITING JPEG FROM STREAMS - * This code was taken directly from jdatasrc.c and jdatadst.c (libjpeg source) - * and modified to use a std::istream/ostream* instead of a FILE* --- -2.7.3 - diff --git a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-ffmpeg-3.0.patch b/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-ffmpeg-3.0.patch deleted file mode 100644 index ec45dabd..00000000 --- a/packages/dev-games/OpenSceneGraph/files/OpenSceneGraph-3.5.2-ffmpeg-3.0.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 2203cdc9c5657c7521dcaeaf4cb39cd1b8e720b6 Mon Sep 17 00:00:00 2001 -From: Ben Woods -Date: Wed, 27 Apr 2016 11:09:59 +0200 -Subject: [PATCH] Replace deprecated FFmpeg API. Author: Andreas Cadhalpun - . - ---- - src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp | 3 +- - src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp | 48 +++++++++++++--------------- - src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp | 4 +-- - src/osgPlugins/ffmpeg/FFmpegParameters.cpp | 2 +- - 4 files changed, 26 insertions(+), 31 deletions(-) - -diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp -index 665c68f..636bddd 100644 ---- a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp -+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp -@@ -227,8 +227,7 @@ printf("### CONVERTING from sample format %s TO %s\n\t\tFROM %d TO %d channels\n - 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; - - } - -diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp -index 9375657..083d3db 100644 ---- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp -+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp -@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream * const stream) - 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 - #if LIBAVCODEC_VERSION_MAJOR >= 56 -@@ -95,20 +95,19 @@ void FFmpegDecoderVideo::open(AVStream * const stream) - 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; - } - - -@@ -267,8 +266,8 @@ int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, AVPicture *src, - #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); - } - -@@ -315,14 +314,14 @@ void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled) - 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); -@@ -349,7 +348,7 @@ void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled) - - 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; - -@@ -367,31 +366,28 @@ void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const - } - } - -- -- --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 -diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp -index 7883b17..778c1a9 100644 ---- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp -+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp -@@ -94,8 +94,8 @@ class FFmpegDecoderVideo : public OpenThreads::Thread - 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; -diff --git a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp -index 288e440..5915ab8 100644 ---- a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp -+++ b/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 {