public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/blender: metadata.xml ChangeLog blender-2.60a.ebuild
@ 2012-01-16 18:28 Sebastian Pipping (sping)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping (sping) @ 2012-01-16 18:28 UTC (permalink / raw
  To: gentoo-commits

sping       12/01/16 18:28:11

  Modified:             metadata.xml ChangeLog blender-2.60a.ebuild
  Log:
  media-gfx/blender: Collada support (bug #390431)
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 media-gfx/blender/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?r1=1.10&r2=1.11

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml	7 May 2011 00:02:09 -0000	1.10
+++ metadata.xml	16 Jan 2012 18:28:11 -0000	1.11
@@ -26,7 +26,7 @@
 			Install contrib scripts.
 		</flag>
 		<flag name='collada'>
-			Add support for Collada interchange format.
+			Add support for Collada interchange format through <pkg>media-libs/opencollada</pkg>.
 		</flag>
 		<flag name='verse'>
 			Adds verse clustering features to Blender.



1.217                media-gfx/blender/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.217&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.217&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.216&r2=1.217

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- ChangeLog	14 Nov 2011 09:30:17 -0000	1.216
+++ ChangeLog	16 Jan 2012 18:28:11 -0000	1.217
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.216 2011/11/14 09:30:17 lu_zero Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.217 2012/01/16 18:28:11 sping Exp $
+
+  16 Jan 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
+  +files/blender-2.60a-collada.patch, metadata.xml:
+  Enable support for collada based on just-packaged media-libs/opencollada (bug
+  #390431)
 
   14 Nov 2011; Luca Barbato <lu_zero@gentoo.org>
   files/blender-2.60a-libav-0.7.patch:



1.5                  media-gfx/blender/blender-2.60a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?r1=1.4&r2=1.5

Index: blender-2.60a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- blender-2.60a.ebuild	13 Nov 2011 22:43:48 -0000	1.4
+++ blender-2.60a.ebuild	16 Jan 2012 18:28:11 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.5 2012/01/16 18:28:11 sping Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -10,11 +10,11 @@
 ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
 fi
 
-inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
+inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
 
 IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
 	+dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
-	redcode +zlib iconv contrib verse"
+	redcode +zlib iconv contrib collada verse"
 
 LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
 for X in ${LANGS} ; do
@@ -60,7 +60,8 @@
 	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	sndfile? ( media-libs/libsndfile )
-	lcms? ( media-libs/lcms )"
+	lcms? ( media-libs/lcms )
+	collada? ( media-libs/opencollada )"
 
 DEPEND="dev-util/scons
 	apidoc? (
@@ -117,6 +118,7 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-collada.patch
 	epatch "${FILESDIR}"/${PN}-${SLOT}-doxyfile.patch
 
 	# TODO: write a proper Makefile to replace the borked bmake script
@@ -271,10 +273,14 @@
 		'sse rayoptimization' \
 		'redcode' \
 		'zlib' \
+		'collada' \
 		'verse' ; do
 		blend_with ${arg}
 	done
 
+	echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
+	echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
+
 	# libspnav not yet packaged (bug #390427)
 	echo 'WITH_BF_3DMOUSE=0' >> "${S}"/user-config.py
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-gfx/blender: metadata.xml ChangeLog blender-2.60a.ebuild
@ 2012-02-06 21:48 Sebastian Pipping (sping)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping (sping) @ 2012-02-06 21:48 UTC (permalink / raw
  To: gentoo-commits

sping       12/02/06 21:48:18

  Modified:             metadata.xml ChangeLog blender-2.60a.ebuild
  Log:
  media-gfx/blender: 3D mouse support (bug #390427)
  
  (Portage version: 2.1.10.44/cvs/Linux x86_64)

Revision  Changes    Path
1.12                 media-gfx/blender/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/metadata.xml?r1=1.11&r2=1.12

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/metadata.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- metadata.xml	16 Jan 2012 18:28:11 -0000	1.11
+++ metadata.xml	6 Feb 2012 21:48:17 -0000	1.12
@@ -16,6 +16,9 @@
 		Available for Windows, Linux, Irix, Sun Solaris, FreeBSD or Mac OS X.
 	</longdescription>
 	<use>
+		<flag name='3dmouse'>
+			Adds support for space navigator devices through package <pkg>dev-libs/libspnav</pkg>.
+		</flag>
 		<flag name='blender-game'>
 			Adds Game Engine support to Blender (2.4* ebuilds).
 		</flag>



1.219                media-gfx/blender/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.219&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.219&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.218&r2=1.219

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- ChangeLog	23 Jan 2012 18:34:59 -0000	1.218
+++ ChangeLog	6 Feb 2012 21:48:17 -0000	1.219
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.218 2012/01/23 18:34:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.219 2012/02/06 21:48:17 sping Exp $
+
+  06 Feb 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
+  metadata.xml:
+  Introduce support for 3D mouse based on dev-libs/libspnav (bug #390427),
+  co-operation with Anthoine Bourgeois
 
   23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> blender-2.57-r1.ebuild,
   blender-2.60a.ebuild:



1.7                  media-gfx/blender/blender-2.60a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild?r1=1.6&r2=1.7

Index: blender-2.60a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- blender-2.60a.ebuild	23 Jan 2012 18:34:59 -0000	1.6
+++ blender-2.60a.ebuild	6 Feb 2012 21:48:17 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.6 2012/01/23 18:34:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.7 2012/02/06 21:48:17 sping Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -12,7 +12,7 @@
 
 inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
 
-IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
+IUSE="3dmouse +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
 	+dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
 	redcode +zlib iconv contrib collada verse"
 
@@ -61,6 +61,7 @@
 	jack? ( media-sound/jack-audio-connection-kit )
 	sndfile? ( media-libs/libsndfile )
 	lcms? ( media-libs/lcms:0 )
+	3dmouse? ( dev-libs/libspnav )
 	collada? ( media-libs/opencollada )"
 
 DEPEND="dev-util/scons
@@ -274,6 +275,7 @@
 		'redcode' \
 		'zlib' \
 		'collada' \
+		'3dmouse' \
 		'verse' ; do
 		blend_with ${arg}
 	done
@@ -281,9 +283,6 @@
 	echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
 	echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
 
-	# libspnav not yet packaged (bug #390427)
-	echo 'WITH_BF_3DMOUSE=0' >> "${S}"/user-config.py
-
 	# enable debugging/testing support
 	use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
 	use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-02-06 21:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-06 21:48 [gentoo-commits] gentoo-x86 commit in media-gfx/blender: metadata.xml ChangeLog blender-2.60a.ebuild Sebastian Pipping (sping)
  -- strict thread matches above, loose matches on Subject: below --
2012-01-16 18:28 Sebastian Pipping (sping)

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