Add Qt5 support, fixes bug 553354. Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

6 files changed, 44 insertions, 639 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 45b3a489de83..f32eb9dd51b2 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.62 2015/06/06 03:28:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.63 2015/07/14 17:30:59 reavertm Exp $
+
+*openscenegraph-3.2.1-r1 (14 Jul 2015)
+
+  14 Jul 2015; Maciej Mrozowski <reavertm@gentoo.org>
+  +openscenegraph-3.2.1-r1.ebuild, -files/openscenegraph-3.0.1-cmake.patch,
+  -files/openscenegraph-3.0.1-libav-0.7.patch,
+  -files/openscenegraph-3.0.1-libav-9.patch,
+  -files/openscenegraph-3.0.1-xinelib12x.patch, -openscenegraph-3.0.1-r1.ebuild:
+  Add Qt5 support, fixes bug 553354. Remove old.
 
   06 Jun 2015; Maciej Mrozowski <reavertm@gentoo.org>
   files/openscenegraph-3.2.1-cmake.patch, openscenegraph-3.2.1.ebuild:
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch
deleted file mode 100644
index 9cc4f4e103c6..000000000000
--- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-cmake.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-diff -ruN OpenSceneGraph-3.0.1/CMakeLists.txt new/CMakeLists.txt
---- OpenSceneGraph-3.0.1/CMakeLists.txt	2011-07-31 09:50:34.000000000 +0200
-+++ new/CMakeLists.txt	2014-02-11 23:12:54.360448879 +0100
-@@ -421,6 +421,7 @@
- 
- # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
- 
-+INCLUDE(MacroOptionalFindPackage)
- 
- ################################################################################
- # Set Version Info resource file
-@@ -450,30 +451,30 @@
-     ANDROID_3RD_PARTY()
- ELSE()
- # Common to all platforms except android:
--    FIND_PACKAGE(FreeType)
--    FIND_PACKAGE(Inventor)
--    FIND_PACKAGE(Jasper)
--    FIND_PACKAGE(OpenEXR)
--    FIND_PACKAGE(COLLADA)
--    FIND_PACKAGE(FBX)
--    FIND_PACKAGE(ZLIB)
--    FIND_PACKAGE(Xine)
--    FIND_PACKAGE(OpenVRML)
--    FIND_PACKAGE(Performer)
--    FIND_PACKAGE(GDAL)
--    FIND_PACKAGE(CURL)
--    FIND_PACKAGE(ITK)
--    FIND_PACKAGE(LibVNCServer)
--    FIND_PACKAGE(OurDCMTK)
--    FIND_PACKAGE(OpenAL)
--    FIND_PACKAGE(FFmpeg)
-+MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
-+MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
-+MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
-+MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
-+MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
-+MACRO_OPTIONAL_FIND_PACKAGE(FBX)
-+MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
-+MACRO_OPTIONAL_FIND_PACKAGE(Xine)
-+MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
-+MACRO_OPTIONAL_FIND_PACKAGE(Performer)
-+MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
-+MACRO_OPTIONAL_FIND_PACKAGE(CURL)
-+MACRO_OPTIONAL_FIND_PACKAGE(ITK)
-+MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
-+MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
-+MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
-+MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
-     FIND_PACKAGE(DirectShow)
--    FIND_PACKAGE(SDL)
--    FIND_PACKAGE(Poppler-glib)
--    FIND_PACKAGE(RSVG)
--    FIND_PACKAGE(GtkGl)
-+MACRO_OPTIONAL_FIND_PACKAGE(SDL)
-+MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
-+MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
-+MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
-     FIND_PACKAGE(DirectInput)
--    FIND_PACKAGE(NVTT)
-+MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
- ENDIF()
- 
- # Include macro utilities here
-@@ -485,17 +486,17 @@
-     IF  (DESIRED_QT_VERSION)
- 
-         IF  (DESIRED_QT_VERSION MATCHES 4)
--              FIND_PACKAGE(Qt4)
-+              MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
-         ELSE()
--              FIND_PACKAGE(Qt3)
-+              MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
-         ENDIF()
- 
-     ELSE()
- 
--        FIND_PACKAGE(Qt4)
-+        MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
- 
-         IF  (NOT QT4_FOUND)
--            FIND_PACKAGE(Qt3)
-+            MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
-         ENDIF()
- 
-     ENDIF()
-@@ -504,12 +505,12 @@
- IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
- 
- 
--    FIND_PACKAGE(FLTK)
--    FIND_PACKAGE(GLUT)
--    FIND_PACKAGE(FOX)
-+    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
-+    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
-+    MACRO_OPTIONAL_FIND_PACKAGE(FOX)
- 
-     SET(wxWidgets_USE_LIBS base core gl net)
--    FIND_PACKAGE(wxWidgets)
-+    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
- 
- ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
- 
-@@ -530,10 +531,10 @@
- # can use Quicktime.
- IF(NOT ANDROID)
-     IF(NOT APPLE)
--        FIND_PACKAGE(GIFLIB)
--        FIND_PACKAGE(JPEG)
--        FIND_PACKAGE(PNG)
--        FIND_PACKAGE(TIFF)
-+        MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
-+        MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
-+        MACRO_OPTIONAL_FIND_PACKAGE(PNG)
-+        MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
- 
-         # QuickTime is required for OS X, but optional for Windows.
-         IF(WIN32)
-@@ -586,15 +587,7 @@
-   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
- 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")
--      MARK_AS_ADVANCED(LIB_POSTFIX)
--  ENDIF()
--ENDIF()
--IF(NOT DEFINED LIB_POSTFIX)
--    SET(LIB_POSTFIX "")
--ENDIF()
-+SET(LIB_POSTFIX ${LIB_SUFFIX})
- 
- # Here we apparantly do some funky stuff with making the bin/ and lib/
- # folders which is probably needed to work around a very old CMake bug?
-@@ -884,7 +877,7 @@
-         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
-     )
-     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
--    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
-+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
- 
-     # now set up openthreads documentation generation
-     IF(BUILD_REF_DOCS_TAGFILE)
-@@ -900,7 +893,7 @@
-         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
-     )
-     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
--    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
-+    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
- 
-     # Process our other doxyfiles but don't create targets for these
-     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
-diff -ruN OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS new/CMakeModules/COPYING-CMAKE-SCRIPTS
---- OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS	1970-01-01 01:00:00.000000000 +0100
-+++ new/CMakeModules/COPYING-CMAKE-SCRIPTS	2014-02-11 23:12:31.241449702 +0100
-@@ -0,0 +1,22 @@
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions
-+are met:
-+
-+1. Redistributions of source code must retain the copyright
-+   notice, this list of conditions and the following disclaimer.
-+2. Redistributions in binary form must reproduce the copyright
-+   notice, this list of conditions and the following disclaimer in the
-+   documentation and/or other materials provided with the distribution.
-+3. The name of the author may not be used to endorse or promote products 
-+   derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-diff -ruN OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake new/CMakeModules/FindFLTK.cmake
---- OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake	2010-11-11 17:51:46.000000000 +0100
-+++ new/CMakeModules/FindFLTK.cmake	1970-01-01 01:00:00.000000000 +0100
-@@ -1,52 +0,0 @@
--# Locate FLTK
--# This module defines
--# FLTK_LIBRARY
--# FLTK_FOUND, if false, do not try to link to gdal 
--# FLTK_INCLUDE_DIR, where to find the headers
--#
--# $FLTK_DIR is an environment variable that would
--# correspond to the ./configure --prefix=$FLTK_DIR
--#
--# Created by Robert Osfield. 
--
--FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
--    $ENV{FLTK_DIR}/include
--    $ENV{FLTK_DIR}
--    ~/Library/Frameworks
--    /Library/Frameworks
--    /usr/local/include
--    /usr/include
--    /sw/include # Fink
--    /opt/local/include # DarwinPorts
--    /opt/csw/include # Blastwave
--    /opt/include
--    /usr/freeware/include
--)
--
--MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
--
--    FIND_LIBRARY(${MYLIBRARY}
--        NAMES ${MYLIBRARYNAME}
--        PATHS
--        $ENV{FLTK_DIR}/lib
--        $ENV{FLTK_DIR}
--        ~/Library/Frameworks
--        /Library/Frameworks
--        /usr/local/lib
--        /usr/lib
--        /sw/lib
--        /opt/local/lib
--        /opt/csw/lib
--        /opt/lib
--        /usr/freeware/lib64
--    )
--
--ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
--
--FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
--FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
--
--SET(FLTK_FOUND "NO")
--IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
--    SET(FLTK_FOUND "YES")
--ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
-diff -ruN OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake new/CMakeModules/MacroOptionalFindPackage.cmake
---- OpenSceneGraph-3.0.1/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ new/CMakeModules/MacroOptionalFindPackage.cmake	2014-02-11 23:12:31.256449701 +0100
-@@ -0,0 +1,28 @@
-+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
-+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
-+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
-+# works like FIND_PACKAGE(), but additionally it automatically creates
-+# an option name WITH_<name>, which can be disabled via the cmake GUI.
-+# or via -DWITH_<name>=OFF
-+# The standard <name>_FOUND variables can be used in the same way
-+# as when using the normal FIND_PACKAGE()
-+
-+# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-+#
-+# Redistribution and use is allowed according to the terms of the BSD license.
-+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-+
-+
-+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
-+   option(WITH_${_name} "Search for ${_name} package" ON)
-+   if (WITH_${_name})
-+      find_package(${_name} ${ARGN})
-+   else (WITH_${_name})
-+      set(${_name}_FOUND)
-+      set(${_name}_INCLUDE_DIR)
-+      set(${_name}_INCLUDES)
-+      set(${_name}_LIBRARY)
-+      set(${_name}_LIBRARIES)
-+   endif (WITH_${_name})
-+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
-+
-diff -ruN OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake new/CMakeModules/OsgMacroUtils.cmake
---- OpenSceneGraph-3.0.1/CMakeModules/OsgMacroUtils.cmake	2011-04-21 19:16:27.000000000 +0200
-+++ new/CMakeModules/OsgMacroUtils.cmake	2014-02-11 23:12:31.280449700 +0100
-@@ -445,9 +445,9 @@
-         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
-         
-         IF(APPLE)
--            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
-+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
-         ELSE(APPLE)
--            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
-+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
-         ENDIF(APPLE)
- 
- ENDMACRO(SETUP_EXAMPLE)
-diff -ruN OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt new/examples/osgviewerFLTK/CMakeLists.txt
---- OpenSceneGraph-3.0.1/examples/osgviewerFLTK/CMakeLists.txt	2007-06-25 10:35:06.000000000 +0200
-+++ new/examples/osgviewerFLTK/CMakeLists.txt	2014-02-11 23:12:31.331449698 +0100
-@@ -1,6 +1,6 @@
- SET(TARGET_SRC osgviewerFLTK.cpp )
- 
--SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
-+SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
- 
- INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
- 
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch
deleted file mode 100644
index 4748cd48c807..000000000000
--- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-0.7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
---- OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp	2011-06-17 10:41:56.000000000 +0200
-+++ my/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp	2011-11-17 19:44:33.194607494 +0100
-@@ -9,12 +9,13 @@
- #define FF_API_OLD_SAMPLE_FMT 0
- #include <errno.h>    // for error codes defined in avformat.h
- #include <stdint.h>
--#include <avcodec.h>
--#include <avformat.h>
--#include <avdevice.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libavdevice/avdevice.h>
-+#include <libavutil/mathematics.h>
- 
--#ifdef USE_SWSCALE    
--    #include <swscale.h>
-+#ifdef USE_SWSCALE
-+    #include <libswscale/swscale.h>
- #endif
- 
- }
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch
deleted file mode 100644
index 018570f02dd5..000000000000
--- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-libav-9.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-Patch by lu_zero
-https://bugs.gentoo.org/show_bug.cgi?id=439606
-upstream svn rev. 13335 contains similar changes.
-no need to upstream this patch.
-
-diff -burN OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake
---- OpenSceneGraph-3.0.1.old//CMakeModules/FindFFmpeg.cmake	2011-04-19 13:40:22.000000000 +0200
-+++ OpenSceneGraph-3.0.1/CMakeModules/FindFFmpeg.cmake	2012-11-22 13:59:28.303401170 +0100
-@@ -131,20 +131,16 @@
-     SET(FFMPEG_FOUND "YES")
- 
-     SET(FFMPEG_INCLUDE_DIRS
--        ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat
--        ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice
--        ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec
--        ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavutil
-+        ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}
-+        ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}
-+        ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}
-+        ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}
-     )
- 
-     IF (FFMPEG_STDINT_INCLUDE_DIR)
-         SET(FFMPEG_INCLUDE_DIRS
-             ${FFMPEG_INCLUDE_DIRS}
-             ${FFMPEG_STDINT_INCLUDE_DIR}
--            ${FFMPEG_STDINT_INCLUDE_DIR}/libavformat
--            ${FFMPEG_STDINT_INCLUDE_DIR}/libavdevice
--            ${FFMPEG_STDINT_INCLUDE_DIR}/libavcodec
--            ${FFMPEG_STDINT_INCLUDE_DIR}/libavutil
-         )
-     ENDIF()
- 
-diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp	2011-04-19 13:40:22.000000000 +0200
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp	2012-11-22 15:03:53.668601596 +0100
-@@ -89,7 +89,7 @@
-         //    m_context->flags |= CODEC_FLAG_TRUNCATED;
- 
-         // Open codec
--        if (avcodec_open(m_context, p_codec) < 0)
-+        if (avcodec_open2(m_context, p_codec, NULL) < 0)
-             throw std::runtime_error("avcodec_open() failed");
-     }
- 
-Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderAudio.cpp.swp differ
-diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.cpp	2011-07-15 12:25:12.000000000 +0200
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp	2012-11-22 15:59:39.569775078 +0100
-@@ -64,21 +64,12 @@
-         
-             OSG_NOTICE<<"Attempting to stream "<<filename<<std::endl;
- 
--            AVFormatParameters formatParams;
--            memset(&formatParams, 0, sizeof(AVFormatParameters));
-             AVInputFormat *iformat;
-+            AVDictionary *options = NULL;
- 
--            formatParams.channel = 0;
--            formatParams.standard = 0;
--#if 1
--            formatParams.width = 320;
--            formatParams.height = 240;
--#else
--            formatParams.width = 640;
--            formatParams.height = 480;
--#endif            
--            formatParams.time_base.num = 1;
--            formatParams.time_base.den = 30;
-+            av_dict_set(&options, "video_size", "320x240", 0);
-+
-+            av_dict_set(&options, "framerate", "1/30", 0);
- 
-             std::string format = "video4linux2";
-             iformat = av_find_input_format(format.c_str());
-@@ -92,7 +83,7 @@
-                 OSG_NOTICE<<"Failed to find input format: "<<format<<std::endl;
-             }
- 
--            int error = av_open_input_file(&p_format_context, filename.c_str(), iformat, 0, &formatParams);
-+            int error = avformat_open_input(&p_format_context, filename.c_str(), iformat, &options);
-             if (error != 0)
-             {
-                 std::string error_str;
-@@ -110,21 +101,21 @@
-                     default: error_str = "Unknown error"; break;
-                 }
- 
--                throw std::runtime_error("av_open_input_file() failed : " + error_str);
-+                throw std::runtime_error("avformat_open_input() failed : " + error_str);
-             }
-         }
-         else
-         {
-             AVInputFormat* av_format = (parameters ? parameters->getFormat() : 0);
--            AVFormatParameters* av_params = (parameters ? parameters->getFormatParameter() : 0);
--            if (av_open_input_file(&p_format_context, filename.c_str(), av_format, 0, av_params) !=0 )
-+            AVDictionary* av_options = (parameters ? parameters->getOptions() : NULL);
-+            if (avformat_open_input(&p_format_context, filename.c_str(), av_format, &av_options) !=0 )
-                 throw std::runtime_error("av_open_input_file() failed");
-         }
-         
-         m_format_context.reset(p_format_context);
- 
-         // Retrieve stream info
--        if (av_find_stream_info(p_format_context) < 0)
-+        if (avformat_find_stream_info(p_format_context, NULL) < 0)
-             throw std::runtime_error("av_find_stream_info() failed");
- 
-         m_duration = double(m_format_context->duration) / AV_TIME_BASE;
-@@ -134,7 +125,7 @@
-         m_clocks.reset(m_start);
- 
-         // Dump info to stderr
--        dump_format(p_format_context, 0, filename.c_str(), false);
-+        av_dump_format(p_format_context, 0, filename.c_str(), false);
- 
-         // Find and open the first video and audio streams (note that audio stream is optional and only opened if possible)
- 
-@@ -292,7 +283,7 @@
-         // Read the next frame packet
-         if (av_read_frame(m_format_context.get(), &packet) < 0)
-         {
--            if (url_ferror(m_format_context->pb) == 0)
-+            if (m_format_context->pb->eof_reached == 0)
-                 end_of_stream = true;
-             else
-                 throw std::runtime_error("av_read_frame() failed");
-Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoder.cpp.swp differ
-diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp
---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoder.hpp	2011-04-19 13:40:22.000000000 +0200
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoder.hpp	2012-11-22 15:59:18.895774005 +0100
-@@ -46,8 +46,8 @@
-         {
-             if (_ptr) 
-             {
--                OSG_NOTICE<<"Calling av_close_input_file("<<_ptr<<")"<<std::endl;
--                av_close_input_file(_ptr);
-+                OSG_NOTICE<<"Calling avformat_close_input("<<_ptr<<")"<<std::endl;
-+                avformat_close_input(&_ptr);
-             }
-             _ptr = 0;
-         }
-@@ -151,8 +151,7 @@
- 
- inline double FFmpegDecoder::creation_time() const
- {
--   if(m_format_context) return m_format_context->timestamp;
--   else return HUGE_VAL;
-+    return HUGE_VAL;
- }
- 
- inline double FFmpegDecoder::duration() const
-diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp	2011-04-19 13:40:22.000000000 +0200
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp	2012-11-22 16:01:30.906780849 +0100
-@@ -83,7 +83,7 @@
-     m_context = stream->codec;
- 
-     // Trust the video size given at this point
--    // (avcodec_open seems to sometimes return a 0x0 size)
-+    // (avcodec_open2 seems to sometimes return a 0x0 size)
-     m_width = m_context->width;
-     m_height = m_context->height;
-     findAspectRatio();
-@@ -105,8 +105,8 @@
-     //    m_context->flags |= CODEC_FLAG_TRUNCATED;
- 
-     // Open codec
--    if (avcodec_open(m_context, m_codec) < 0)
--        throw std::runtime_error("avcodec_open() failed");
-+    if (avcodec_open2(m_context, m_codec, NULL) < 0)
-+        throw std::runtime_error("avcodec_open2() failed");
- 
-     // Allocate video frame
-     m_frame.reset(avcodec_alloc_frame());
-Binary files OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp and OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/.FFmpegDecoderVideo.cpp.swp differ
-diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.cpp	2011-07-15 12:25:12.000000000 +0200
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.cpp	2012-11-22 17:20:09.019025477 +0100
-@@ -8,7 +8,7 @@
- #if LIBAVCODEC_VERSION_MAJOR >= 53
- extern "C"
- {
--    #include <parseutils.h>
-+    #include <libavutil/parseutils.h>
- }
- #define av_parse_video_frame_size av_parse_video_size
- #define av_parse_video_frame_rate av_parse_video_rate
-@@ -19,7 +19,7 @@
- 
-     extern "C"
-     {
--        #include <pixdesc.h>
-+        #include <libavutil/pixdesc.h>
-     }
-     
-     inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
-@@ -34,14 +34,15 @@
- 
- 
- FFmpegParameters::FFmpegParameters() :
--    m_format(0)
--{
--    memset(&m_parameters, 0, sizeof(m_parameters));
--}
-+    m_format(0),
-+    m_options(NULL)
-+{}
- 
- 
- FFmpegParameters::~FFmpegParameters()
--{}
-+{
-+    av_dict_free(&m_options);
-+}
- 
- 
- void FFmpegParameters::parse(const std::string& name, const std::string& value)
-@@ -59,40 +60,19 @@
-     }
-     else if (name == "pixel_format")
-     {
--        m_parameters.pix_fmt = osg_av_get_pix_fmt(value.c_str());
-+        av_dict_set(&m_options, "pixel_format", value.c_str(), 0);
-     }
-     else if (name == "frame_size")
-     {
--        int frame_width = 0, frame_height = 0;
--        if (av_parse_video_frame_size(&frame_width, &frame_height, value.c_str()) < 0)
--        {
--            OSG_NOTICE<<"Failed to apply frame size: "<<value.c_str()<<std::endl;
--            return;
--        }
--        if ((frame_width % 2) != 0 || (frame_height % 2) != 0)
--        {
--            OSG_NOTICE<<"Frame size must be a multiple of 2: "<<frame_width<<"x"<<frame_height<<std::endl;
--            return;
--        }
--        m_parameters.width = frame_width;
--        m_parameters.height = frame_height;
-+        av_dict_set(&m_options, "video_size", value.c_str(), 0);
-     }
-     else if (name == "frame_rate")
-     {
--        AVRational frame_rate;
--        if (av_parse_video_frame_rate(&frame_rate, value.c_str()) < 0)
--        {
--            OSG_NOTICE<<"Failed to apply frame rate: "<<value.c_str()<<std::endl;
--            return;
--        }
--        m_parameters.time_base.den = frame_rate.num;
--        m_parameters.time_base.num = frame_rate.den;
-+        av_dict_set(&m_options, "framerate", value.c_str(), 0);
-     }
-     else if (name == "audio_sample_rate")
-     {
--        int audio_sample_rate = 44100;
--        std::stringstream ss(value); ss >> audio_sample_rate;
--        m_parameters.sample_rate = audio_sample_rate;
-+        av_dict_set(&m_options, "sample_rate", value.c_str(), 0);
-     }
- }
- 
-diff -burN OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp
---- OpenSceneGraph-3.0.1.old//src/osgPlugins/ffmpeg/FFmpegParameters.hpp	2011-04-19 13:40:22.000000000 +0200
-+++ OpenSceneGraph-3.0.1/src/osgPlugins/ffmpeg/FFmpegParameters.hpp	2012-11-22 15:23:27.490662455 +0100
-@@ -21,14 +21,14 @@
-     bool isFormatAvailable() const { return m_format!=NULL; }
-     
-     AVInputFormat* getFormat() { return m_format; }
--    AVFormatParameters* getFormatParameter() { return &m_parameters; }
-+    AVDictionary* getOptions() { return m_options; }
-     
-     void parse(const std::string& name, const std::string& value);
- 
- protected:
- 
-     AVInputFormat* m_format;
--    AVFormatParameters m_parameters;
-+    AVDictionary* m_options;
- };
- 
- 
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch b/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch
deleted file mode 100644
index a69a6604e003..000000000000
--- a/dev-games/openscenegraph/files/openscenegraph-3.0.1-xinelib12x.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/397643
-
---- src/osgPlugins/xine/video_out_rgb.c
-+++ src/osgPlugins/xine/video_out_rgb.c
-@@ -2769,8 +2769,14 @@ init_class(xine_t* xine, void* vo_visual
- 	clear(rgb_class, sizeof(rgbout_class_t));
- 
- 	rgb_class->driver_class.open_plugin     = open_plugin;
-+#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)
- 	rgb_class->driver_class.get_identifier  = get_identifier;
- 	rgb_class->driver_class.get_description = get_description;
-+#else
-+	rgb_class->driver_class.identifier  = get_identifier(NULL);
-+	rgb_class->driver_class.description = get_description(NULL);
-+#endif
-+
- 	rgb_class->driver_class.dispose         = dispose_class;
- 
- 	return(rgb_class);
diff --git a/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild
index a52371802ebf..9ffe903f0357 100644
--- a/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.0.1-r1.ebuild,v 1.5 2014/08/20 23:47:19 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild,v 1.1 2015/07/14 17:30:59 reavertm Exp $
 
 EAPI=5
 
@@ -11,33 +11,33 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Open source high performance 3D graphics toolkit"
 HOMEPAGE="http://www.openscenegraph.org/projects/osg/"
-SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P}/source/${MY_P}.zip"
+SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/${MY_P}.zip"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
-openexr openinventor osgapps pdf png qt4 sdl svg tiff truetype vnc wxwidgets
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 qt5 sdl svg tiff truetype vnc wxwidgets
 xine xrandr zlib"
 
-# NOTE: OpenAL (support missing)
-# TODO: COLLADA, FBX, ITK, OpenVRML, Performer, DCMTK
+REQUIRED_USE="
+	qt4? ( !qt5 )
+	qt5? ( !qt4 )
+"
+
+# TODO: COLLADA, FBX, GTA, ITK, OpenVRML, Performer, DCMTK
 RDEPEND="
 	x11-libs/libSM
 	x11-libs/libXext
 	virtual/glu
 	virtual/opengl
+	asio? ( dev-cpp/asio )
 	curl? ( net-misc/curl )
 	examples? (
 		fltk? ( x11-libs/fltk:1[opengl] )
 		fox? ( x11-libs/fox:1.6[opengl] )
 		glut? ( media-libs/freeglut )
 		gtk? ( x11-libs/gtkglext )
-		qt4? (
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4
-			dev-qt/qtopengl:4
-		)
 		sdl? ( media-libs/libsdl )
 		wxwidgets? ( x11-libs/wxGTK[opengl,X] )
 	)
@@ -53,6 +53,17 @@ RDEPEND="
 	openinventor? ( media-libs/coin )
 	pdf? ( app-text/poppler[cairo] )
 	png? ( media-libs/libpng:0 )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
 	svg? (
 		gnome-base/librsvg
 		x11-libs/cairo
@@ -77,10 +88,7 @@ S=${WORKDIR}/${MY_P}
 DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.1-cmake.patch
-	"${FILESDIR}"/${PN}-3.0.1-libav-0.7.patch
-	"${FILESDIR}"/${PN}-3.0.1-xinelib12x.patch
-	"${FILESDIR}"/${PN}-3.0.1-libav-9.patch
+	"${FILESDIR}"/${PN}-3.2.1-cmake.patch
 )
 
 src_configure() {
@@ -95,8 +103,8 @@ src_configure() {
 	mycmakeargs=(
 		-DDYNAMIC_OPENSCENEGRAPH=ON
 		-DWITH_ITK=OFF
-		-DWITH_OpenAL=OFF # Commented out in buildsystem
 		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
+		$(cmake-utils_use_with asio)
 		$(cmake-utils_use_with curl)
 		$(cmake-utils_use_build doc DOCUMENTATION)
 		$(cmake-utils_use_build osgapps OSG_APPLICATIONS)
@@ -114,17 +122,23 @@ src_configure() {
 		$(cmake-utils_use_with openinventor Inventor)
 		$(cmake-utils_use_with pdf Poppler-glib)
 		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
 		$(cmake-utils_use_with sdl)
 		$(cmake-utils_use_with svg rsvg)
 		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with truetype FreeType)
+		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with vnc LibVNCServer)
 		$(cmake-utils_use_with wxwidgets wxWidgets)
 		$(cmake-utils_use_with xine)
 		$(cmake-utils_use xrandr OSGVIEWER_USE_XRANDR)
 		$(cmake-utils_use_with zlib)
 	)
+	if use qt4; then
+		mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=4 )
+	elif use qt5; then
+		mycmakeargs+=( -DOSG_USE_QT=ON -DDESIRED_QT_VERSION=5 )
+	else
+		mycmakeargs+=( -DOSG_USE_QT=OFF )
+	fi
 	cmake-utils_src_configure
 }