diff options
author | 2009-02-25 14:00:49 +0000 | |
---|---|---|
committer | 2009-02-25 14:00:49 +0000 | |
commit | 3d6f23f10929622af151b406447118932535ef27 (patch) | |
tree | fccbed15af53747f23d249cd01526edd6bf3d96c /dev-games/openscenegraph | |
parent | Version bump. Generate javadoc manually because build.xml does not support it... (diff) | |
download | gentoo-2-3d6f23f10929622af151b406447118932535ef27.tar.gz gentoo-2-3d6f23f10929622af151b406447118932535ef27.tar.bz2 gentoo-2-3d6f23f10929622af151b406447118932535ef27.zip |
Making xulrunner an optional dependency. Bug #260187
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'dev-games/openscenegraph')
-rw-r--r-- | dev-games/openscenegraph/ChangeLog | 6 | ||||
-rw-r--r-- | dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch | 21 | ||||
-rw-r--r-- | dev-games/openscenegraph/openscenegraph-2.8.0.ebuild | 21 |
3 files changed, 42 insertions, 6 deletions
diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog index 9a50b632b54f..16633a978624 100644 --- a/dev-games/openscenegraph/ChangeLog +++ b/dev-games/openscenegraph/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/openscenegraph # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.1 2009/02/24 13:26:59 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.2 2009/02/25 14:00:49 tupone Exp $ + + 25 Feb 2009; Alfredo Tupone <tupone@gentoo.org> + +files/openscenegraph-2.8.0-magicoff.patch, openscenegraph-2.8.0.ebuild: + Making xulrunner an optional dependency. Bug #260187 by Christian Schmitt *openscenegraph-2.8.0 (24 Feb 2009) diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch new file mode 100644 index 000000000000..18ffd9c0270f --- /dev/null +++ b/dev-games/openscenegraph/files/openscenegraph-2.8.0-magicoff.patch @@ -0,0 +1,21 @@ +--- CMakeLists.txt.old 2009-02-25 10:26:47.000000000 +0100 ++++ CMakeLists.txt 2009-02-25 10:33:07.000000000 +0100 +@@ -287,6 +287,8 @@ + INCLUDE(Find3rdPartyDependencies) + ENDIF(WIN32) + ++OPTION(ENABLE_XUL "Enable plugin gecko if xulrunner is available" ON) ++ + # Common to all platforms: + FIND_PACKAGE(FreeType) + FIND_PACKAGE(Inventor) +@@ -302,7 +304,9 @@ + FIND_PACKAGE(ITK) + FIND_PACKAGE(LibVNCServer) + FIND_PACKAGE(OurDCMTK) ++IF(ENABLE_XUL) + FIND_PACKAGE(XUL) ++ENDIF(ENABLE_XUL) + + #use pkg-config to find various modues + INCLUDE(FindPkgConfig OPTIONAL) diff --git a/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild index 69bf031de8f1..d95799336f56 100644 --- a/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild +++ b/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild,v 1.1 2009/02/24 13:26:59 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.0.ebuild,v 1.2 2009/02/25 14:00:49 tupone Exp $ EAPI=2 -inherit cmake-utils versionator +inherit eutils versionator cmake-utils MY_PN="OpenSceneGraph" MY_P=${MY_PN}-${PV} @@ -16,14 +16,16 @@ SRC_URI="http://www.openscenegraph.org/downloads/stable_releases/${MY_P_MAJOR}/s LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0" KEYWORDS="~x86" -IUSE="" +IUSE="xulrunner" RDEPEND="virtual/opengl virtual/glu net-misc/curl - net-libs/xulrunner + xulrunner? ( net-libs/xulrunner ) gnome-base/librsvg media-libs/jpeg + media-libs/giflib + media-libs/tiff app-text/poppler-bindings" DEPEND="${RDEPEND} @@ -31,5 +33,14 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MY_P} -mycmakeargs="-DBUILD_OSG_APPLICATIONS=OFF" DOCS="AUTHORS.txt ChangeLog NEWS.txt" + +src_prepare() { + epatch "${FILESDIR}"/${P}-magicoff.patch +} + +src_configure() { + mycmakeargs="-DBUILD_OSG_APPLICATIONS=OFF" + mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable xulrunner XUL)" + cmake-utils_src_configure +} |