[dev-games/openscenegraph] version bump. cmake patch ported again and QA-fixed

3 files changed, 51 insertions, 61 deletions

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 6fc2c71..225e4c5 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,4 +1,4 @@
-AUX openscenegraph-cmake.patch 10921 RMD160 0256ec4e22ad02f6bd5dd0a573314ab9d81084fa SHA1 7917f0546df412afe2bef8b28dcc11702a2dd760 SHA256 c006673a234a53506576213aa8941a37ad0e88b6d47f0a8847c432b6699280b4
-DIST OpenSceneGraph-2.9.9.zip 6632745 RMD160 62f4cbc72b05cd6d8d622fbf04740fd3f22064c3 SHA1 67732d846b12ed1304f56f9ffe1cf6229d553fa0 SHA256 c7f35b675ad305ed0106151d2832f275543bf28ec25bc52314e9c49e8dce9616
-EBUILD openscenegraph-2.9.9.ebuild 3514 RMD160 4cfc2b646623e7e5dc687834f43b71f37f848241 SHA1 9fc7ef19f757322029d08fddaa15159ad54628f9 SHA256 f4f646b35d2b778fa99c0a59607a69cc5c43252e912c5ad75130b92763ebab19
+AUX openscenegraph-cmake.patch 10246 RMD160 8b02dec05ab78ce7d1abf47463fc7f23cd9ed224 SHA1 c34b547b35fc63ffcd4b732455361792ca0b4d1e SHA256 61c7784ce1f9cd21cb7da716a4298840dbc51ff1d103f285cdbc38e901fe7802
+DIST OpenSceneGraph-2.9.10.zip 6910310 RMD160 97bf00c08606d6891ea08f2d6ab027c559037453 SHA1 98aa2ec657610f494ed40bf377e506f34be4c106 SHA256 f7f6be2fc9c7cb3ae2f0c4ad591c8352b2f7e2b9ccce209cc0798415a4ff078c
+EBUILD openscenegraph-2.9.10.ebuild 3538 RMD160 670fb43f93b1fc577b15f6c13657d7d3a073da82 SHA1 5f22feff4ef665e3ab8bc729e356d63e2047e015 SHA256 1d8a6d337b2133b4de293081370196d1c086d3834a229b1057ecbec9ac6008f2
 MISC metadata.xml 1115 RMD160 ca10b4eb4fdf20ffe7db6fe29ee2d290fda4a695 SHA1 eb1cb05392044f03e8d2a6ee5077d933044cabf9 SHA256 f3ea3669edf3bdc96dc9747d59447433fb9677185764d69a3aea6115b9d58643
diff --git a/dev-games/openscenegraph/files/openscenegraph-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
index b0b9637..02503d5 100644
--- a/dev-games/openscenegraph/files/openscenegraph-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
@@ -1,6 +1,8 @@
---- CMakeLists.txt.orig	2010-09-15 14:00:12.000000000 +0200
-+++ CMakeLists.txt	2010-10-19 19:13:40.000000000 +0200
-@@ -340,6 +340,7 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index de8af36..be1a3cf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -374,6 +374,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
  
  # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
  
@@ -8,7 +10,7 @@
  
  ################################################################################
  # Set Version Info resource file
-@@ -366,43 +367,43 @@
+@@ -400,29 +401,29 @@ IF(WIN32)
  ENDIF()
  
  # Common to all platforms:
@@ -51,9 +53,16 @@
 +MACRO_OPTIONAL_FIND_PACKAGE(SDL)
  FIND_PACKAGE(DirectShow)
 -FIND_PACKAGE(SDL)
+-FIND_PACKAGE(Poppler-glib)
+-FIND_PACKAGE(RSVG)
+-FIND_PACKAGE(GtkGl)
++MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
++MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
++MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
  
- # To select a specific version of QT define DESIRED_QT_VERSION
- # via cmake -DDESIRED_QT_VERSION=4
+ # Include macro utilities here
+ INCLUDE(OsgMacroUtils)
+@@ -432,17 +433,17 @@ INCLUDE(OsgMacroUtils)
  IF  (DESIRED_QT_VERSION)
  
      IF  (DESIRED_QT_VERSION MATCHES 4)
@@ -71,37 +80,11 @@
  
      IF  (NOT QT4_FOUND)
 -        FIND_PACKAGE(Qt3)
-+         MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
++        MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
      ENDIF()
  
  ENDIF()
-@@ -414,6 +415,7 @@
- 
-     INCLUDE(FindPkgConfig)
- 
-+    IF(WITH_GTK)
-     PKG_CHECK_MODULES(GTK gtk+-2.0)
- 
-     IF(WIN32)
-@@ -421,10 +423,15 @@
-     ELSE()
-         PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
-     ENDIF()
-+    ENDIF(WITH_GTK)
- 
--    PKG_CHECK_MODULES(RSVG librsvg-2.0)
-+    IF(WITH_SVG)    
-+    	PKG_CHECK_MODULES(RSVG librsvg-2.0)
-+    ENDIF(WITH_SVG)
-     PKG_CHECK_MODULES(CAIRO cairo)
--    PKG_CHECK_MODULES(POPPLER poppler-glib)
-+    IF(WITH_PDF)
-+	PKG_CHECK_MODULES(POPPLER poppler-glib)
-+    ENDIF(WITH_PDF)
- 
- ENDIF()
- 
-@@ -433,12 +440,13 @@
+@@ -451,12 +452,12 @@ ENDIF()
  IF   (BUILD_OSG_EXAMPLES)
  
  
@@ -111,7 +94,6 @@
 +    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)
@@ -119,7 +101,7 @@
  
  ENDIF(BUILD_OSG_EXAMPLES)
  
-@@ -500,10 +508,10 @@
+@@ -476,10 +477,10 @@ ENDIF(BUILD_OSG_EXAMPLES)
  # Image readers/writers depend on 3rd party libraries except for OS X which
  # can use Quicktime.
  IF(NOT APPLE)
@@ -134,7 +116,7 @@
  
      # QuickTime is required for OS X, but optional for Windows.
      IF(WIN32)
-@@ -791,7 +799,7 @@
+@@ -816,7 +817,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)
@@ -143,7 +125,7 @@
  
      # now set up openthreads documentation generation
      IF(BUILD_REF_DOCS_TAGFILE)
-@@ -807,7 +815,7 @@
+@@ -832,7 +833,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)
@@ -152,9 +134,11 @@
  
      # Process our other doxyfiles but don't create targets for these
      CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
-diff -ruN ../OpenSceneGraph-2.9.7.old/CMakeModules/COPYING-CMAKE-SCRIPTS ./CMakeModules/COPYING-CMAKE-SCRIPTS
---- ../OpenSceneGraph-2.9.7.old/CMakeModules/COPYING-CMAKE-SCRIPTS	1970-01-01 01:00:00.000000000 +0100
-+++ ./CMakeModules/COPYING-CMAKE-SCRIPTS	2010-07-26 21:01:52.000000000 +0200
+diff --git a/CMakeModules/COPYING-CMAKE-SCRIPTS b/CMakeModules/COPYING-CMAKE-SCRIPTS
+new file mode 100644
+index 0000000..4b41776
+--- /dev/null
++++ b/CMakeModules/COPYING-CMAKE-SCRIPTS
 @@ -0,0 +1,22 @@
 +Redistribution and use in source and binary forms, with or without
 +modification, are permitted provided that the following conditions
@@ -178,11 +162,13 @@ diff -ruN ../OpenSceneGraph-2.9.7.old/CMakeModules/COPYING-CMAKE-SCRIPTS ./CMake
 +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-2.9.7.old/CMakeModules/FindFLTK.cmake ./CMakeModules/FindFLTK.cmake
---- ../OpenSceneGraph-2.9.7.old/CMakeModules/FindFLTK.cmake	2009-05-18 12:17:57.000000000 +0200
-+++ ./CMakeModules/FindFLTK.cmake	1970-01-01 01:00:00.000000000 +0100
+diff --git a/CMakeModules/FindFLTK.cmake b/CMakeModules/FindFLTK.cmake
+deleted file mode 100644
+index e376b78..0000000
+--- a/CMakeModules/FindFLTK.cmake
++++ /dev/null
 @@ -1,52 +0,0 @@
--# Locate gdal
+-# Locate FLTK
 -# This module defines
 -# FLTK_LIBRARY
 -# FLTK_FOUND, if false, do not try to link to gdal 
@@ -234,9 +220,11 @@ diff -ruN ../OpenSceneGraph-2.9.7.old/CMakeModules/FindFLTK.cmake ./CMakeModules
 -IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
 -    SET(FLTK_FOUND "YES")
 -ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
-diff -ruN ../OpenSceneGraph-2.9.7.old/CMakeModules/MacroOptionalFindPackage.cmake ./CMakeModules/MacroOptionalFindPackage.cmake
---- ../OpenSceneGraph-2.9.7.old/CMakeModules/MacroOptionalFindPackage.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ ./CMakeModules/MacroOptionalFindPackage.cmake	2010-07-26 21:02:42.000000000 +0200
+diff --git a/CMakeModules/MacroOptionalFindPackage.cmake b/CMakeModules/MacroOptionalFindPackage.cmake
+new file mode 100644
+index 0000000..f09952f
+--- /dev/null
++++ b/CMakeModules/MacroOptionalFindPackage.cmake
 @@ -0,0 +1,28 @@
 +# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
 +# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
@@ -266,10 +254,11 @@ diff -ruN ../OpenSceneGraph-2.9.7.old/CMakeModules/MacroOptionalFindPackage.cmak
 +   endif (WITH_${_name})
 +endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
 +
-diff -ruN ../OpenSceneGraph-2.9.7.old/CMakeModules/OsgMacroUtils.cmake ./CMakeModules/OsgMacroUtils.cmake
---- ../OpenSceneGraph-2.9.7.old/CMakeModules/OsgMacroUtils.cmake	2009-10-30 16:17:38.000000000 +0100
-+++ ./CMakeModules/OsgMacroUtils.cmake	2010-07-26 21:00:31.000000000 +0200
-@@ -318,9 +318,9 @@
+diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
+index ea63146..242b14e 100644
+--- a/CMakeModules/OsgMacroUtils.cmake
++++ b/CMakeModules/OsgMacroUtils.cmake
+@@ -390,9 +390,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
          SETUP_EXE(${IS_COMMANDLINE_APP})
          
          IF(APPLE)
@@ -281,9 +270,10 @@ diff -ruN ../OpenSceneGraph-2.9.7.old/CMakeModules/OsgMacroUtils.cmake ./CMakeMo
          ENDIF(APPLE)
  
  ENDMACRO(SETUP_EXAMPLE)
-diff -ruN ../OpenSceneGraph-2.9.7.old/examples/osgviewerFLTK/CMakeLists.txt ./examples/osgviewerFLTK/CMakeLists.txt
---- ../OpenSceneGraph-2.9.7.old/examples/osgviewerFLTK/CMakeLists.txt	2007-06-25 10:35:06.000000000 +0200
-+++ ./examples/osgviewerFLTK/CMakeLists.txt	2010-07-26 21:00:36.000000000 +0200
+diff --git a/examples/osgviewerFLTK/CMakeLists.txt b/examples/osgviewerFLTK/CMakeLists.txt
+index 43c023b..dd177f0 100644
+--- a/examples/osgviewerFLTK/CMakeLists.txt
++++ b/examples/osgviewerFLTK/CMakeLists.txt
 @@ -1,6 +1,6 @@
  SET(TARGET_SRC osgviewerFLTK.cpp )
  
diff --git a/dev-games/openscenegraph/openscenegraph-2.9.9.ebuild b/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
index 98774e2..ee02244 100644
--- a/dev-games/openscenegraph/openscenegraph-2.9.9.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
@@ -107,17 +107,17 @@ src_configure() {
 		$(cmake-utils_use_with gdal)
 		$(cmake-utils_use_with gif GIFLIB)
 		$(cmake-utils_use_with glut)
-		$(cmake-utils_use_with gtk)
+		$(cmake-utils_use_with gtk GtkGl)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with jpeg2k Jasper)
 		$(cmake-utils_use_with openexr OpenEXR)
 		$(cmake-utils_use_with openinventor Inventor)
-		$(cmake-utils_use_with pdf)
+		$(cmake-utils_use_with pdf Poppler-glib)
 		$(cmake-utils_use_with png)
 		$(cmake-utils_use_with qt4)
 		$(cmake-utils_use !static-libs DYNAMIC_OPENSCENEGRAPH)
 		$(cmake-utils_use_with sdl)
-		$(cmake-utils_use_with svg)
+		$(cmake-utils_use_with svg rsvg)
 		$(cmake-utils_use_with tiff)
 		$(cmake-utils_use_with truetype FreeType)
 		$(cmake-utils_use_with vnc LibVNCServer)