public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/k3d/, media-gfx/k3d/files/
@ 2015-12-31 10:49 Pacho Ramos
  0 siblings, 0 replies; only message in thread
From: Pacho Ramos @ 2015-12-31 10:49 UTC (permalink / raw
  To: gentoo-commits

commit:     197f23b1fd0215329fd2c5f75405030eafa024bb
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 10:45:56 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 10:49:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197f23b1

media-gfx/k3d: Version bump

Package-Manager: portage-2.2.26

 media-gfx/k3d/Manifest                             |  1 +
 .../k3d/files/k3d-0.8.0.5-multilib-strict.patch    | 25 ++++++
 media-gfx/k3d/k3d-0.8.0.5.ebuild                   | 98 ++++++++++++++++++++++
 3 files changed, 124 insertions(+)

diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index fb88541..f4917aa 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1 +1,2 @@
+DIST k3d-0.8.0.5.tar.gz 9992671 SHA256 d238d55211695a79b2449b19103068add1900f55f7a2e13765a2dc712e5eeda3 SHA512 229ceb195a07fcf3c07957f5f66b01bbdc03c54d5aa0b2c24be7511864013fb0b58b1e45c4db995c77aa5cc2318b61aed3412c71b16c2c042799863da8912065 WHIRLPOOL d266b4279e4bc7f4beb791451f8f626f229875fc4d6a987f7276e2ecb22e4a1b6b7d31c8e7fa27623d881f03032c76f0a9198ae28c79397aa2c22b261b83ca5b
 DIST k3d-source-0.7.11.0.tar.gz 7692200 SHA256 c6364cb9e989f2ac2412541c2a4368279b23e728822ab7e6b5390d579dd49008 SHA512 023dcdfd4e35c4444b07e2d674824fdc31842847a0f8393641359b25fc3f3a127adf2279606d0322e24c3e66d59709624dcf128eda4260296da2c3dc42d0ac43 WHIRLPOOL e50b07d93b7689454999ec125990871c72f803ba75ae6373f1a201f2393b4fcbd90e3f2b49eca610bbb26a3cf4c4934a0108ed250b2830d58a9d98b92883a99b

diff --git a/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch b/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch
new file mode 100644
index 0000000..24f84d6
--- /dev/null
+++ b/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch
@@ -0,0 +1,25 @@
+From 5d20d8daf3fb753785c78d43d86813348d456868 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
+Date: Tue, 27 Jan 2015 10:54:55 +0100
+Subject: [PATCH 1/4] k3d-0.8.0.2-cmake.diff
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ae8a60d..9f22dae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,7 +362,7 @@ ENDIF()
+ # Setup output directories ...
+ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
+ 
+-SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary.
++SET(K3D_LIBDIR lib${LIB_SUFFIX}) # Allows us to handle 64-bit libs if/when it becomes necessary.
+ 
+ IF(APPLE AND K3D_ENABLE_OSX_BUNDLE)
+ 	SET(K3D_BUNDLE_DIRECTORY ${k3d_BINARY_DIR}/K-3D.app/Contents)
+-- 
+2.5.0
+

diff --git a/media-gfx/k3d/k3d-0.8.0.5.ebuild b/media-gfx/k3d/k3d-0.8.0.5.ebuild
new file mode 100644
index 0000000..5c11510
--- /dev/null
+++ b/media-gfx/k3d/k3d-0.8.0.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="A free 3D modeling, animation, and rendering system"
+HOMEPAGE="http://www.k-3d.org/"
+SRC_URI="https://github.com/K-3D/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="3ds cuda gnome gts imagemagick jpeg nls openexr png python tiff truetype" #TODO cgal tbb
+
+RDEPEND="
+	dev-libs/boost[python]
+	>=dev-cpp/glibmm-2.6:2
+	>=dev-cpp/gtkmm-2.6:2.4
+	dev-libs/expat
+	>=dev-libs/libsigc++-2.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/gnome-vfs:2 )
+	gts? ( sci-libs/gts )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( virtual/jpeg )
+	openexr? ( media-libs/openexr )
+	png? ( >=media-libs/libpng-1.2.43-r2:= )
+	python? ( >=dev-lang/python-2.3 dev-python/cgkit )
+	tiff? ( media-libs/tiff )
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${PN}-${PN}-${PV}"
+
+# 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}"/${PN}-0.8.0.5-multilib-strict.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
+		-DK3D_BUILD_GOOGLE_PERFTOOLS_MODULE=OFF
+		$(k3d_use_module 3ds 3DS_IO)
+		$(k3d_use_module cuda CUDA)
+		$(k3d_use_module gnome GNOME)
+		$(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)
+		-DK3D_ENABLE_PYTHON=$(use python && echo ON || echo OFF)
+		$(k3d_use_module python PYTHON)
+		$(k3d_use_module python PYUI)
+		$(k3d_use_module python NGUI_PYTHON_SHELL)
+		$(k3d_use_module python NGUI_PYTHON_SHELL_MODULE)
+		$(k3d_use_enable python GUIDE)
+		$(k3d_use_module tiff TIFF_IO)
+		$(k3d_use_module truetype FREETYPE2)
+	"
+	cmake-utils_src_configure
+}


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-12-31 10:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-31 10:49 [gentoo-commits] repo/gentoo:master commit in: media-gfx/k3d/, media-gfx/k3d/files/ Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox