[gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/

["Christian Schmitt" <chris@ilovelinux.de>]

commit:     ac55a47ffb215fd8bb45c6734f5c0fb98dc84c91
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Mon Aug  1 22:15:51 2011 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Tue Aug  2 06:50:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ac55a47f

[dev-games/openscenegraph] version bump to 3.0.1
Removed xulrunner completely. Please test different useflag combinations.

---
 .../files/openscenegraph-cmake.patch               |  140 ++++++++++----------
 dev-games/openscenegraph/metadata.xml              |    1 +
 ...h-2.9.10.ebuild => openscenegraph-3.0.1.ebuild} |   23 ++--
 3 files changed, 83 insertions(+), 81 deletions(-)

diff --git a/dev-games/openscenegraph/files/openscenegraph-cmake.patch b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
index 02503d5..e9809e1 100644
--- a/dev-games/openscenegraph/files/openscenegraph-cmake.patch
+++ b/dev-games/openscenegraph/files/openscenegraph-cmake.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index de8af36..be1a3cf 100644
+index 6858e70..c4cc339 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -374,6 +374,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
+@@ -421,6 +421,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
  
  # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
  
@@ -10,28 +10,34 @@ index de8af36..be1a3cf 100644
  
  ################################################################################
  # Set Version Info resource file
-@@ -400,29 +401,29 @@ IF(WIN32)
- ENDIF()
- 
- # Common to all platforms:
--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(XUL)
--FIND_PACKAGE(FFmpeg)
+@@ -450,30 +451,30 @@ IF(ANDROID)
+     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)
+-    FIND_PACKAGE(DirectShow)
+-    FIND_PACKAGE(SDL)
+-    FIND_PACKAGE(Poppler-glib)
+-    FIND_PACKAGE(RSVG)
+-    FIND_PACKAGE(GtkGl)
+-    FIND_PACKAGE(DirectInput)
+-    FIND_PACKAGE(NVTT)
 +MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
 +MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
 +MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
@@ -48,44 +54,42 @@ index de8af36..be1a3cf 100644
 +MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
 +MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
 +MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
-+MACRO_OPTIONAL_FIND_PACKAGE(XUL)
 +MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
++FIND_PACKAGE(DirectShow)
 +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)
++FIND_PACKAGE(DirectInput)
++FIND_PACKAGE(NVTT)
+ ENDIF()
  
  # Include macro utilities here
- INCLUDE(OsgMacroUtils)
-@@ -432,17 +433,17 @@ INCLUDE(OsgMacroUtils)
- IF  (DESIRED_QT_VERSION)
+@@ -485,17 +486,18 @@ IF(NOT ANDROID)
+     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()
  
-     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)
  
--    FIND_PACKAGE(Qt4)
-+    MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
+         IF  (NOT QT4_FOUND)
+-            FIND_PACKAGE(Qt3)
++            MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
+         ENDIF()
  
-     IF  (NOT QT4_FOUND)
--        FIND_PACKAGE(Qt3)
-+        MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
      ENDIF()
- 
- ENDIF()
-@@ -451,12 +452,12 @@ ENDIF()
- IF   (BUILD_OSG_EXAMPLES)
+@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID)
+ IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
  
  
 -    FIND_PACKAGE(FLTK)
@@ -99,24 +103,24 @@ index de8af36..be1a3cf 100644
 -    FIND_PACKAGE(wxWidgets)
 +    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
  
- ENDIF(BUILD_OSG_EXAMPLES)
+ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
  
-@@ -476,10 +477,10 @@ ENDIF(BUILD_OSG_EXAMPLES)
- # Image readers/writers depend on 3rd party libraries except for OS X which
+@@ -530,10 +532,10 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
  # can use Quicktime.
- 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)
+ 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)
-@@ -816,7 +817,7 @@ IF(BUILD_DOCUMENTATION)
+         # QuickTime is required for OS X, but optional for Windows.
+         IF(WIN32)
+@@ -884,7 +886,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)
@@ -125,7 +129,7 @@ index de8af36..be1a3cf 100644
  
      # now set up openthreads documentation generation
      IF(BUILD_REF_DOCS_TAGFILE)
-@@ -832,7 +833,7 @@ IF(BUILD_DOCUMENTATION)
+@@ -900,7 +902,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)
@@ -255,11 +259,11 @@ index 0000000..f09952f
 +endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
 +
 diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
-index ea63146..242b14e 100644
+index aa607fa..8f3771c 100644
 --- a/CMakeModules/OsgMacroUtils.cmake
 +++ b/CMakeModules/OsgMacroUtils.cmake
-@@ -390,9 +390,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
-         SETUP_EXE(${IS_COMMANDLINE_APP})
+@@ -445,9 +445,9 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
+         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
          
          IF(APPLE)
 -            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            

diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 8bc0717..e069176 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -6,6 +6,7 @@
 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.
 </longdescription>
   <use>
+    <flag name="itk">Build plugin using <pkg>dev-tcltk/itk</pkg> library</flag>
     <flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
     <flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
     <flag name="openinventor">Build OpenInventor plugin</flag>

diff --git a/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
similarity index 87%
rename from dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
rename to dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
index c2990a1..5bd11d1 100644
--- a/dev-games/openscenegraph/openscenegraph-2.9.10.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.0.1.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
-inherit eutils versionator cmake-utils
+inherit eutils versionator cmake-utils wxwidgets
 
 MY_PN="OpenSceneGraph"
 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/developer_releases/${MY_P}.zip"
+SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P}/source/${MY_P}.zip"
 
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg jpeg2k
-openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype vnc
-wxwidgets xine xrandr zlib"
+IUSE="curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk jpeg jpeg2k
+openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truetype
+vnc wxwidgets xine xrandr zlib"
 
 # NOTE: OpenAL (support missing)
-# TODO: COLLADA, FBX, OpenVRML, Performer, ITK, DCMTK
-# 	xulrunner? ( only 1.8 supported for now, ignore it
-#		net-libs/xulrunner:1.8
-#		x11-libs/gtk+:2
-#	)
+# TODO: COLLADA, FBX, OpenVRML, Performer, DCMTK
 RDEPEND="
 	x11-libs/libSM
 	x11-libs/libXext
@@ -48,6 +44,7 @@ RDEPEND="
 	ffmpeg? ( virtual/ffmpeg )
 	gdal? ( sci-libs/gdal )
 	gif? ( media-libs/giflib )
+	itk? ( dev-tcltk/itk )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
 	openexr? (
@@ -95,7 +92,6 @@ src_configure() {
 
 	mycmakeargs=(
 		-DWITH_OpenAL=OFF # Commented out in buildsystem
-		-DWITH_XUL=OFF # Supports only xulrunner 1.8
 		-DGENTOO_DOCDIR="/usr/share/doc/${PF}"
 		$(cmake-utils_use_with curl)
 		$(cmake-utils_use_build doc DOCUMENTATION)
@@ -108,6 +104,7 @@ src_configure() {
 		$(cmake-utils_use_with gif GIFLIB)
 		$(cmake-utils_use_with glut)
 		$(cmake-utils_use_with gtk GtkGl)
+		$(cmake-utils_use_with itk)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with jpeg2k Jasper)
 		$(cmake-utils_use_with openexr OpenEXR)