revision bump to fix cuda USE-flag, bug #263811

Package-Manager: portage-2.2_rc31/cvs/Linux i686

4 files changed, 173 insertions, 2 deletions

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index efe23a09a033..143921d2b5ce 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/k3d
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.43 2009/03/24 16:44:52 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.44 2009/04/23 20:30:22 maekke Exp $
+
+*k3d-0.7.11.0-r1 (23 Apr 2009)
+
+  23 Apr 2009; Markus Meier <maekke@gentoo.org>
+  +files/k3d-0.7.11.0-cuda.patch, +k3d-0.7.11.0-r1.ebuild:
+  revision bump to fix cuda USE-flag, bug #263811
 
   24 Mar 2009; Gordon Malm <gengor@gentoo.org> k3d-0.7.11.0.ebuild:
   Add dropped C++ stack-protector filtering.
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index 2e03fbc624c1..d857dd35f6c9 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX k3d-0.6.7.0-gcc43.patch 8957 RMD160 930ae5504b03eba813af5c70c56347bbf3d04955 SHA1 433dc009e8bfddac54d2d9d52d435cf68f42b957 SHA256 3384663135b4d565a67c7b14306ff8727ca1bb49d6a30cf194e1c3453672dc7e
 AUX k3d-0.6.7.0-sigc2.patch 546 RMD160 c1494b7c60ef3fbabcb353b6ebc86dd04f6413bc SHA1 611a87069e6db77b5817e8c0226cf2b2dd990756 SHA256 632325bcb94133500af6eeb41824934b8c0199469923ca7be8a501a61d5db9e6
+AUX k3d-0.7.11.0-cuda.patch 1854 RMD160 084495d805cb368123c3c280e037e0a9e581aaa5 SHA1 4ef74b687b4a3d39c7db94e6fe3734680db2e650 SHA256 710a359506280d6f30c366923327ef0eee02646271f85d83e31acaa9b21fcecc
 AUX k3d-0.7.11.0-fix-potfiles.patch 640 RMD160 44508c7968befaced78d52d4e06e211adc83a754 SHA1 c9d50079825db508deb612dd416223c5b98fe705 SHA256 b86359e5597f8794cbad3f0ee6837bfbf3440ddc435eaed16487f79a3c20a244
 DIST k3d-0.6.7.0-src.tar.bz2 5003324 RMD160 cb3746a9a403e6ac7d334f96db8bc716c06dc55d SHA1 9bcbdb6d8aa274baa7200e3c267f303fb61a733a SHA256 0ee773767868cfe452f95daa03de541488f2ff81c629ba38385c87ff0ed55e9c
 DIST k3d-source-0.7.11.0.tar.gz 7692200 RMD160 41c31d12fe82e92be75a309660ed3811d1aa02df SHA1 cef63043c7bd8d7a130689e9b53d1023280e2978 SHA256 c6364cb9e989f2ac2412541c2a4368279b23e728822ab7e6b5390d579dd49008
 EBUILD k3d-0.6.7.0-r1.ebuild 2118 RMD160 ba4407bc42bd1c141b321468622d8a13d3f883ce SHA1 25b4fd8e18d320d1b4baf3a41e674baea0f12f79 SHA256 486220976a648509b9a1fab41b58eef080fcb98895c1c5efc9499fdb3fd8041f
+EBUILD k3d-0.7.11.0-r1.ebuild 2638 RMD160 b4a9bd8354b6859f80b64d990843a058ff6ec291 SHA1 aa5d05a470d56504b19ab013bdd8cd0019fb8a6c SHA256 7288891d1c0399d556fb5d7ab6532f4b68aead7be92925f751ae7e259afb3d66
 EBUILD k3d-0.7.11.0.ebuild 2585 RMD160 a3ac44ca0d9c8103d208985986d67ed8e6b7a6fd SHA1 c480376f0434e6b1a234b1bdd8f3210162bc5aea SHA256 a36652b4d2926cf1b7b723539b20e7db371104df0b816294c27f910eaabcfba3
-MISC ChangeLog 6634 RMD160 4e2cb6196d39be8295fd465f0dc32ce51aa55144 SHA1 9558871ad4fed02c815fcd4ca1f3996b7f66abc2 SHA256 ed5a778320c3370fb1ec847281e3454c37da2b70f2dddf403ebcec5f7e2bd803
+MISC ChangeLog 6824 RMD160 f09213e0f2ab0d08ff2acee2aa620ec7188ce130 SHA1 b87448e1af70cc55b3e39e58562f5117271b5bec SHA256 0b3db9599b0573f9a814a4e4bad9fb6f1665312c3b4c0b53bd537fa1b97ebffc
 MISC metadata.xml 483 RMD160 9383264af3a54db6b141c575e9eb53768f161323 SHA1 b2095aa028dfa178e57f2a75df201a9f8142dadd SHA256 eea4771e0b2003c621168e8aded70ae25e1c9da49059e09a1f65f21212dc35a4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknw0DYACgkQkKaRLQcq0GJDUQCfcuAoK8dpcjBMT53C4LoKpVQG
+dqcAoI3pQhlyEj4ACYGk/qtL3AIje3x0
+=MWPj
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch b/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch
new file mode 100644
index 000000000000..56beb0badfc9
--- /dev/null
+++ b/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch
@@ -0,0 +1,52 @@
+http://k3d.svn.sourceforge.net/viewvc/k3d/trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp?view=patch&r1=1782&r2=1820
+
+--- trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp	2009/03/14 19:27:16	1782
++++ trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp	2009/03/22 22:32:10	1820
+@@ -23,6 +23,7 @@
+         \author Evan Lezar (evanlezar@gmail.com)
+ */
+ 
++#include <k3dsdk/attribute_array_copier.h>
+ #include <k3dsdk/basic_math.h>
+ #include <k3dsdk/document_plugin_factory.h>
+ #include <k3dsdk/imaterial.h>
+@@ -30,8 +31,8 @@
+ #include <k3dsdk/measurement.h>
+ #include <k3dsdk/mesh_modifier.h>
+ #include <k3dsdk/mesh_selection_sink.h>
+-#include <k3dsdk/attribute_array_copier.h>
+ #include <k3dsdk/node.h>
++#include <k3dsdk/polyhedron.h>
+ #include <k3dsdk/selection.h>
+ #include <k3dsdk/utility.h>
+ #include <k3dsdk/vectors.h>
+@@ -41,6 +42,8 @@
+ #include "cuda_device_mesh.h"
+ #include "cuda_mesh_topology_data.h"
+ 
++#include <boost/scoped_ptr.hpp>
++
+ namespace module
+ {
+ 
+@@ -159,7 +162,8 @@
+ 
+         // If there are no valid polyhedra, we give up
+         document().pipeline_profiler().start_execution(*this, "Create:Validate input");
+-        if(!k3d::validate_polyhedra(Input))
++        boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input));
++        if(!polyhedron)
+         {
+             document().pipeline_profiler().finish_execution(*this, "Create:Validate input");
+             return;
+@@ -297,7 +301,8 @@
+     {
+         document().pipeline_profiler().start_execution(*this, "Update:Validate input");
+ 
+-        if(!k3d::validate_polyhedra(Input))
++        boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input));
++				if(!polyhedron)
+         {
+             document().pipeline_profiler().finish_execution(*this, "Update:Validate input");
+             return;
+
diff --git a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
new file mode 100644
index 000000000000..2a84648963ce
--- /dev/null
+++ b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.1 2009/04/23 20:30:22 maekke Exp $
+
+EAPI="2"
+
+inherit eutils cmake-utils
+
+MY_P="${PN}-source-${PV}"
+
+DESCRIPTION="A free 3D modeling, animation, and rendering system"
+HOMEPAGE="http://www.k-3d.org/"
+SRC_URI="mirror://sourceforge/k3d/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ds cuda gnome graphviz gts imagemagick jpeg nls openexr png python tiff truetype" #TODO cgal tbb
+
+RDEPEND="
+	dev-libs/boost
+	>=dev-cpp/glibmm-2.6
+	>=dev-cpp/gtkmm-2.6
+	dev-libs/expat
+	>=dev-libs/libsigc++-2.2
+	media-libs/mesa
+	virtual/glu
+	virtual/opengl
+	>=x11-libs/gtkglext-1.0.6-r3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	3ds? ( media-libs/lib3ds )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	gnome? ( gnome-base/libgnome )
+	graphviz? ( media-gfx/graphviz )
+	gts? ( sci-libs/gts )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( media-libs/jpeg )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng )
+	python? ( >=dev-lang/python-2.3 dev-python/cgkit )
+	tiff? ( media-libs/tiff )
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="AUTHORS README"
+
+# k3d_use_enable()
+#
+# $1: use flag. ON|OFF is determined by this.
+# $2: part of cmake variable name which appended to the base variable name
+#     that is -DK3D_BUILD_$2
+#
+# e.g.) k3d_use_enable gnome GNOME_MODULE #=> -DK3D_BUILD_GNOME_MODULE=ON
+#
+k3d_use_enable() {
+	echo "-DK3D_BUILD_$2=$(use $1 && echo ON || echo OFF)"
+}
+
+k3d_use_module() {
+	echo "-DK3D_BUILD_$2_MODULE=$(use $1 && echo ON || echo OFF)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-potfiles.patch
+	epatch "${FILESDIR}"/${P}-cuda.patch
+	[[ -f CMakeCache.txt ]] && rm CMakeCache.txt
+}
+
+src_configure() {
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	mycmakeargs="
+		-DK3D_BUILD_SVG_IO_MODULE=ON
+		-DK3D_BUILD_CGAL_MODULE=OFF
+		$(k3d_use_module 3ds 3DS_IO)
+		$(k3d_use_module cuda CUDA)
+		$(k3d_use_module gnome GNOME)
+		$(k3d_use_module graphviz GRAPHVIZ)
+		$(k3d_use_module gts GTS)
+		$(k3d_use_module gts GTS_IO)
+		$(k3d_use_module imagemagick IMAGEMAGICK_IO)
+		$(k3d_use_module jpeg JPEG_IO)
+		$(k3d_use_enable nls NLS)
+		$(k3d_use_module openexr OPENEXR_IO)
+		$(k3d_use_module png PNG_IO)
+		$(k3d_use_module python PYTHON)
+		$(k3d_use_module python PYUI)
+		$(k3d_use_module tiff TIFF_IO)
+		$(k3d_use_module truetype FREETYPE2)"
+
+	cmake-utils_src_configure
+}