[dev-games/openscenegraph] version bump to 3.2.0

5 files changed, 47 insertions, 46 deletions

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index b010a0a..4fd3fb7 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1 +1 @@
-DIST OpenSceneGraph-3.1.4.zip 7468665 SHA256 f662b5164afc3a07d2f17259ad971e733f31fb53f256c69175afde8b99f9a394 SHA512 550b4ccffcc84650efbeb5f557ddf2bfa2f45192e573ed929a340eb6e81ea4acbbcb2a202e6350169fa29d5ed6d4de01a1dfe8d85e0620823c946106a29661a4 WHIRLPOOL 88e290b8a90a762e7716e4d87b2f1e70c18c138c96b3393511bad8449633abe146ee4ada1d19325c69bbfb124e78b57c7a040a3f900367d61acc0cd28d5e69d7
+DIST OpenSceneGraph-3.2.0.zip 7195748 SHA256 ceca56e58e9ba245d5f9d0661352ddf405a7cb105341a122c5541b69c0ce032e SHA512 9a270f2a0b5f8b0527fb99668da8771073c6469c5a403371a786da47df0443f6a5776716942f2318e7e58d9a41417b5dc5f4ae4a123cfcc72840e3d2999322bd WHIRLPOOL f127956c08364e910d96cba7dd9e444d59d3b7b7b1464cf28218cbd42a461fb801a5d7b2cc65e8992b499618748f9ef30b6aa9a0f41fae4d1be27b36ecaba2cb
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch b/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch
deleted file mode 100644
index 323d3a0..0000000
--- a/dev-games/openscenegraph/files/openscenegraph-3.1.3-libav-0.7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-index dc79df3..c362b97 100644
---- a/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-+++ b/src/osgPlugins/ffmpeg/FFmpegHeaders.hpp
-@@ -9,13 +9,13 @@ extern "C"
- #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 <mathematics.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
- 
- #if LIBAVUTIL_VERSION_INT <  AV_VERSION_INT(50,38,0)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.0-cmake.patch
index 307a8e3..a527c32 100644
--- a/dev-games/openscenegraph/files/openscenegraph-3.1.4-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.0-cmake.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b6007f9..6d32675 100644
+index be8f2b4..20e325a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -463,6 +463,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
+@@ -483,6 +483,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
  
  # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
  
@@ -10,7 +10,7 @@ index b6007f9..6d32675 100644
  
  ################################################################################
  # Set Version Info resource file
-@@ -492,36 +493,36 @@ IF(ANDROID)
+@@ -512,37 +513,35 @@ IF(ANDROID)
      ANDROID_3RD_PARTY()
  ELSE()
  # Common to all platforms except android:
@@ -29,7 +29,6 @@ index b6007f9..6d32675 100644
 -    FIND_PACKAGE(CURL)
 -    FIND_PACKAGE(LibVNCServer)
 -    FIND_PACKAGE(OurDCMTK)
--    FIND_PACKAGE(OpenAL)
 -    FIND_PACKAGE(FFmpeg)
 +MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
 +MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
@@ -46,7 +45,6 @@ index b6007f9..6d32675 100644
 +MACRO_OPTIONAL_FIND_PACKAGE(CURL)
 +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)
@@ -59,7 +57,9 @@ index b6007f9..6d32675 100644
 +MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
      FIND_PACKAGE(DirectInput)
 -    FIND_PACKAGE(NVTT)
--    FIND_PACKAGE(Asio)
+-    IF (NOT WIN32)
+-        FIND_PACKAGE(Asio)
+-    ENDIF()
 -    FIND_PACKAGE(ZeroConf)
 +MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
 +MACRO_OPTIONAL_FIND_PACKAGE(Asio)
@@ -72,10 +72,13 @@ index b6007f9..6d32675 100644
  ENDIF()
  
  # Include macro utilities here
-@@ -535,17 +536,17 @@ IF(OSG_USE_QT AND NOT ANDROID)
-     IF  (DESIRED_QT_VERSION)
+@@ -557,16 +556,16 @@ IF(OSG_USE_QT AND NOT ANDROID)
  
-         IF  (DESIRED_QT_VERSION MATCHES 4)
+     IF  (DESIRED_QT_VERSION)
+         IF  (DESIRED_QT_VERSION MATCHES 5)
+-              FIND_PACKAGE(Qt5Widgets)
++              MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets)
+         ELSEIF (DESIRED_QT_VERSION MATCHES 4)
 -              FIND_PACKAGE(Qt4)
 +              MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
          ELSE()
@@ -85,16 +88,25 @@ index b6007f9..6d32675 100644
  
      ELSE()
  
--        FIND_PACKAGE(Qt4)
-+        MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+-        FIND_PACKAGE(Qt5Widgets QUIET)
++        MACRO_OPTIONAL_FIND_PACKAGE(Qt5Widgets QUIET)
  
-         IF  (NOT QT4_FOUND)
--            FIND_PACKAGE(Qt3)
-+            MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
-         ENDIF()
+         IF ( Qt5Widgets_FOUND )
+             # CMake 2.8.8 or greater required
+@@ -582,10 +581,10 @@ IF(OSG_USE_QT AND NOT ANDROID)
+         ENDIF( )
  
+         IF ( NOT Qt5Widgets_FOUND )
+-            FIND_PACKAGE(Qt4)
++            MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+ 
+             IF (NOT QT4_FOUND)
+-                FIND_PACKAGE(Qt3)
++                MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+             ENDIF()
+         ENDIF()
      ENDIF()
-@@ -555,12 +556,12 @@ ENDIF()
+@@ -601,12 +600,12 @@ ENDIF()
  IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
  
  
@@ -111,7 +123,7 @@ index b6007f9..6d32675 100644
  
  ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
  
-@@ -581,10 +582,11 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
+@@ -627,10 +626,11 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
  # can use Quicktime.
  IF(NOT ANDROID)
      IF(NOT APPLE)
@@ -127,7 +139,7 @@ index b6007f9..6d32675 100644
          # QuickTime is required for OS X, but optional for Windows.
          IF(WIN32)
              FIND_PACKAGE(QuickTime)
-@@ -943,7 +945,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -988,7 +988,7 @@ IF(BUILD_DOCUMENTATION)
          ${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)
@@ -136,7 +148,7 @@ index b6007f9..6d32675 100644
  
      # now set up openthreads documentation generation
      IF(BUILD_REF_DOCS_TAGFILE)
-@@ -959,7 +961,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -1004,7 +1004,7 @@ IF(BUILD_DOCUMENTATION)
          ${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)
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.0-ffmpeg.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.0-ffmpeg.patch
new file mode 100644
index 0000000..2157978
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-3.2.0-ffmpeg.patch
@@ -0,0 +1,13 @@
+diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
+index 497969f..4ec9f13 100644
+--- a/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
++++ b/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
+@@ -279,7 +279,7 @@ bool FFmpegDecoder::readNextPacketNormal()
+         int error = av_read_frame(m_format_context.get(), &packet);
+         if (error < 0)
+         {
+-            if (error == AVERROR_EOF || url_feof(m_format_context.get()->pb))
++            if (error == AVERROR_EOF || m_format_context.get()->pb->eof_reached)
+                 end_of_stream = true;
+             else {
+                 OSG_FATAL << "av_read_frame() returned " << AvStrError(error) << std::endl;
diff --git a/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.0.ebuild
index e788633..fbdabb4 100644
--- a/dev-games/openscenegraph/openscenegraph-3.1.4.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.0.ebuild
@@ -83,8 +83,8 @@ S=${WORKDIR}/${MY_P}
 DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.4-cmake.patch
-	"${FILESDIR}"/${PN}-3.1.3-libav-0.7.patch
+	"${FILESDIR}"/${PN}-3.2.0-cmake.patch
+	"${FILESDIR}"/${PN}-3.2.0-ffmpeg.patch
 )
 
 src_configure() {