From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qo8qa-0001oE-Ug for garchives@archives.gentoo.org; Tue, 02 Aug 2011 06:53:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 154B321C027; Tue, 2 Aug 2011 06:52:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B916821C027 for ; Tue, 2 Aug 2011 06:52:51 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C95861BC016 for ; Tue, 2 Aug 2011 06:52:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9E9153C004 for ; Tue, 2 Aug 2011 06:52:49 +0000 (UTC) From: "Christian Schmitt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christian Schmitt" Message-ID: Subject: [gentoo-commits] proj/gamerlay:master commit in: dev-games/openscenegraph/, dev-games/openscenegraph/files/ X-VCS-Repository: proj/gamerlay X-VCS-Files: dev-games/openscenegraph/files/openscenegraph-cmake.patch dev-games/openscenegraph/metadata.xml dev-games/openscenegraph/openscenegraph-2.9.10.ebuild dev-games/openscenegraph/openscenegraph-3.0.1.ebuild X-VCS-Directories: dev-games/openscenegraph/ dev-games/openscenegraph/files/ X-VCS-Committer: christian X-VCS-Committer-Name: Christian Schmitt X-VCS-Revision: ac55a47ffb215fd8bb45c6734f5c0fb98dc84c91 Date: Tue, 2 Aug 2011 06:52:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c035aa73c0fc3ab1696c1d3a7c739193 commit: ac55a47ffb215fd8bb45c6734f5c0fb98dc84c91 Author: Christian Schmitt ilovelinux de> AuthorDate: Mon Aug 1 22:15:51 2011 +0000 Commit: Christian Schmitt ilovelinux de> CommitDate: Tue Aug 2 06:50:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3Dac55a47f [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 =3D> 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" =20 # INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}") =20 @@ -10,28 +10,34 @@ index de8af36..be1a3cf 100644 =20 #######################################################################= ######### # Set Version Info resource file -@@ -400,29 +401,29 @@ IF(WIN32) - ENDIF() -=20 - # 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() =20 # 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) +=20 + IF (DESIRED_QT_VERSION MATCHES 4) +- FIND_PACKAGE(Qt4) ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) + ELSE() +- FIND_PACKAGE(Qt3) ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) + ENDIF() =20 - IF (DESIRED_QT_VERSION MATCHES 4) -- FIND_PACKAGE(Qt4) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) ++ ELSE() -- FIND_PACKAGE(Qt3) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) - ENDIF() =20 - ELSE() +- FIND_PACKAGE(Qt4) ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) =20 -- FIND_PACKAGE(Qt4) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt4) + IF (NOT QT4_FOUND) +- FIND_PACKAGE(Qt3) ++ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) + ENDIF() =20 - IF (NOT QT4_FOUND) -- FIND_PACKAGE(Qt3) -+ MACRO_OPTIONAL_FIND_PACKAGE(Qt3) ENDIF() -=20 - ENDIF() -@@ -451,12 +452,12 @@ ENDIF() - IF (BUILD_OSG_EXAMPLES) +@@ -504,12 +506,12 @@ ENDIF(NOT ANDROID) + IF (BUILD_OSG_EXAMPLES AND NOT ANDROID) =20 =20 - FIND_PACKAGE(FLTK) @@ -99,24 +103,24 @@ index de8af36..be1a3cf 100644 - FIND_PACKAGE(wxWidgets) + MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets) =20 - ENDIF(BUILD_OSG_EXAMPLES) + ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) =20 -@@ -476,10 +477,10 @@ ENDIF(BUILD_OSG_EXAMPLES) - # Image readers/writers depend on 3rd party libraries except for OS X w= hich +@@ -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) =20 - # 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}ReferenceDo= cs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT opens= cenegraph-doc) @@ -125,7 +129,7 @@ index de8af36..be1a3cf 100644 =20 # 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}ReferenceDo= cs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT opens= cenegraph-doc) @@ -255,11 +259,11 @@ index 0000000..f09952f +endmacro (MACRO_OPTIONAL_FIND_PACKAGE) + diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUti= ls.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 "E= xamples") =20 IF(APPLE) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION sh= are/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin ) = =20 diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/opensceneg= raph/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 toolki= t, used by application developers in fields such as visual simulation, ga= mes, virtual reality, scientific visualization and modelling. Written ent= irely in Standard C++ and OpenGL it runs on all Windows platforms, OSX, G= NU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD operating systems. The Op= enSceneGraph is now well established as the world leading scene graph tec= hnology, used widely in the vis-sim, space, scientific, oil-gas, games an= d virtual reality industries. + Build plugin using dev-tcltk/itk libra= ry Build examples using x11-libs/fox libr= ary Enable support for sci-libs/gdal libr= ary Build OpenInventor plugin 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: $ =20 -EAPI=3D2 +EAPI=3D4 =20 -inherit eutils versionator cmake-utils +inherit eutils versionator cmake-utils wxwidgets =20 MY_PN=3D"OpenSceneGraph" MY_P=3D${MY_PN}-${PV} =20 DESCRIPTION=3D"Open source high performance 3D graphics toolkit" HOMEPAGE=3D"http://www.openscenegraph.org/projects/osg/" -SRC_URI=3D"http://www.openscenegraph.org/downloads/developer_releases/${= MY_P}.zip" +SRC_URI=3D"http://www.openscenegraph.org/downloads/stable_releases/${MY_= P}/source/${MY_P}.zip" =20 LICENSE=3D"wxWinLL-3 LGPL-2.1" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"curl debug doc examples ffmpeg fltk fox gdal gif glut gtk jpeg j= peg2k -openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truety= pe vnc -wxwidgets xine xrandr zlib" +IUSE=3D"curl debug doc examples ffmpeg fltk fox gdal gif glut gtk itk jp= eg jpeg2k +openexr openinventor osgapps pdf png qt4 sdl static-libs svg tiff truety= pe +vnc wxwidgets xine xrandr zlib" =20 # 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=3D" x11-libs/libSM x11-libs/libXext @@ -48,6 +44,7 @@ RDEPEND=3D" 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() { =20 mycmakeargs=3D( -DWITH_OpenAL=3DOFF # Commented out in buildsystem - -DWITH_XUL=3DOFF # Supports only xulrunner 1.8 -DGENTOO_DOCDIR=3D"/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)