update to luxrender 1.2.1

3 files changed, 69 insertions, 9 deletions

diff --git a/media-gfx/luxrender/Manifest b/media-gfx/luxrender/Manifest
index 855c4cb..0ccc4f9 100644
--- a/media-gfx/luxrender/Manifest
+++ b/media-gfx/luxrender/Manifest
@@ -1,6 +1,8 @@
-AUX lux-0.7.0-libpng.patch 1020 RMD160 19393c4be6d410d47bdbaff28044f5c81eaf1946 SHA1 bb6a9116eb32ffdacf5fbcc39aa9f39b06ab80e0 SHA256 7d0b68c15b7d163965b73a5ee22a42d3c72beea079b7e43037ebf6f8bb406b98
-DIST 45d3e13eb94c.tar.bz2 2712283 RMD160 55d3b816df0055f08d99e8c6935b6372ac231e8e SHA1 b2accdfcc5da277a0201a1b4b0b65de7231bfee3 SHA256 9e5434f5addf351ffa7f652a6763648db672144c370993740cc074c64c1f288a
-DIST 9206b3ba7011.tar.bz2 1998376 RMD160 72579d731317da86831a678bf7990d0b1dd33dc1 SHA1 0f1a7c25eb9255882a369a3f45b8dfc9ed812006 SHA256 8af12fbebf29e62f3203b02fe28a11304f7d48f23f87e7a053c804149cbfcc56
-EBUILD luxrender-0.7.1.ebuild 1669 RMD160 269e71a953431dc34246fe0ae793f7dede2b4a52 SHA1 48d7eb61bb4d65d1910a1e434a13a9e639d51409 SHA256 f45a0c4e6c7abeb2090c48c9571f10ef59b52b048c70e6e9ec0be21e954c2d06
-EBUILD luxrender-0.8.ebuild 1668 RMD160 cf5ce469cbb5229207b079bfa8fa313dcab8af2c SHA1 1dc00ac9dc7ee1fba3b1c2a2b58bcd92e85158cd SHA256 b4b67c72eda88be0b8a0732324f9e736f8802c979421c43061d7f230ee405bff
-EBUILD luxrender-9999.ebuild 1381 RMD160 7cf9ee582ff0ae2cd0f96fb63339d72ac8df43b8 SHA1 59bd1bdc214dfd70d69ad9829ecf9ac93906480f SHA256 9e5458c94655588d80e9d2dca40dcefb83306ec7082e3a0db95a06b0e4aade13
+AUX lux-0.7.0-libpng.patch 1020 SHA256 7d0b68c15b7d163965b73a5ee22a42d3c72beea079b7e43037ebf6f8bb406b98 SHA512 37dcb3f73624a10645836bc7bedef2195ccdc769d7317effe39cbeb751ec5d0f6672d30b8ba99f1e5d9a36d245aff59b1750a1252c11e1280777a7ded47e3adb WHIRLPOOL c9e634dcfe255757938ebed83395a68a2bf90ae200b3f83e3f326e771d20d91f1f0001e3ba9c981cdba665cf8814cfcf9d28735419be1fa961fa81eda3d6fbc0
+DIST 3066b2161439.tar.bz2 2474519 SHA256 9bb9517b91104743e07922de374daa0d67f37e07c5bf7e3f02161d8cdbb3a673 SHA512 ea22c967a873319750312439cf14467250a0fae50bae0508f0916aba2030fd28240ddbc6120747e1f9836c574d90965e807a3e299b800658b797dc874833774b WHIRLPOOL 5898473b152c0658daa74f092010f94f1972abb2e7824ab5164a8ed13acb572e88fdf248b4c9b15ecdbe3e921b83962ab5fb5d7abdf48fb845ba15d0c062137d
+DIST 45d3e13eb94c.tar.bz2 2712283 SHA256 9e5434f5addf351ffa7f652a6763648db672144c370993740cc074c64c1f288a
+DIST 9206b3ba7011.tar.bz2 1998376 SHA256 8af12fbebf29e62f3203b02fe28a11304f7d48f23f87e7a053c804149cbfcc56
+EBUILD luxrender-0.7.1.ebuild 1669 SHA256 f45a0c4e6c7abeb2090c48c9571f10ef59b52b048c70e6e9ec0be21e954c2d06 SHA512 d72e79b5f3d3cf67c2323c56300aad093fad1c7508c7da1bdc6e0060faad11c0e300352964c9ebb222994d1892086bcf5d8b76f01301f2cf198e8d51a8d6f374 WHIRLPOOL e55de86e8696b3d44c569adf4dd7c054b1eb296a419f31618d2bbc7b867263c0f44a5838d511faf45164bf4f50dd56454f09708679cd7260d86689be003f89a7
+EBUILD luxrender-0.8.ebuild 1668 SHA256 b4b67c72eda88be0b8a0732324f9e736f8802c979421c43061d7f230ee405bff SHA512 c4b44057cc8cd0dfb0dced89a2bcf351df32bf9b060d179453d7424b8ddebc7dbd727cec5c48488afd46430835f5fda260660e78844b0c6b3882d792f12e1528 WHIRLPOOL 0292ac440fc6a20ef1fb1e3bd712d01da88aa25e5f052fea6c0995cd95d6ff6d449a2396e3517a6d07a660f38c9e9bafda9b2c4368e869d5be03c7e9e68e6cfa
+EBUILD luxrender-1.2.1.ebuild 1390 SHA256 afb9322f48039bad916760464ca34acc799f89c55285d1b0fcac90979d7b7774 SHA512 ff1dd5a43f8cdd170d04d2ad5b3a82953bc0b428482a256edd46e85f9c34c5634c901ac34fcdf4188fbed517ee27b403f9cd248e9c8b0598d3c7a3e737ef96a4 WHIRLPOOL e03102ca90e515090ec4dd422ecf17d647c6d3d2270272b952584bdb43f252b9688c764b4de8206fe773d2b96adc3ac73061c8cf75b5e2560179597ad295e8be
+EBUILD luxrender-9999.ebuild 1381 SHA256 9e5458c94655588d80e9d2dca40dcefb83306ec7082e3a0db95a06b0e4aade13 SHA512 71f83c891b42743b3ffd0fe13b64fabdb9b3d261b0d0e770b12fed9765ef245e5f81e66877214346b7772ea5c7e35b72234df2a61d63d393e17ac11aadd1a27f WHIRLPOOL c2c1ee9bbbd8393ea0f5222a2c0c133e53e8c2c4092364d31682d353c0311d795a2571ae6cbcc8843e4a57133801ec22f28ab110e963d8005a56e4496cbbbedf
diff --git a/media-gfx/luxrender/luxrender-1.2.1.ebuild b/media-gfx/luxrender/luxrender-1.2.1.ebuild
new file mode 100644
index 0000000..eff6867
--- /dev/null
+++ b/media-gfx/luxrender/luxrender-1.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit cmake-utils flag-o-matic python
+
+DESCRIPTION="A GPL unbiased renderer."
+HOMEPAGE="http://www.luxrender.net"
+EHG_REVISION="3066b2161439"
+SRC_URI="https://bitbucket.org/luxrender/lux/get/${EHG_REVISION}.tar.bz2"
+
+S="${WORKDIR}/luxrender-lux-${EHG_REVISION}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sse2 doc debug +blender"
+
+RDEPEND=">=dev-libs/boost-1.43[python]
+	media-libs/openexr
+	media-libs/tiff
+	media-libs/libpng
+	media-libs/libjpeg-turbo
+	media-libs/ilmbase
+	>=media-libs/freeimage-3.15.0
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	=media-libs/luxrays-1.2.1[debug?]
+	doc? ( >=app-doc/doxygen-1.5.7[-nodot] )"
+PDEPEND="blender? ( =media-gfx/luxblend25-9999 )"
+
+src_configure() {
+	use sse2 && append-flags "-msse -msse2 -DLUX_USE_SSE"
+	use debug && append-flags -ggdb
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS.txt || die
+
+	# installing API(s) docs
+	if use doc; then
+		pushd "${S}"/doxygen > /dev/null
+		doxygen doxygen.template
+		dohtml html/* || die "Couldn't install API docs"
+		popd > /dev/null
+	fi
+	
+	if use blender; then
+		insinto /usr/share/blender/2.5/scripts/addons/luxrender/
+		doins "${CMAKE_BUILD_DIR}"/pylux.so || die "Couldn't install Pylux"
+	fi
+}
diff --git a/media-libs/luxrays/luxrays-1.2.1.ebuild b/media-libs/luxrays/luxrays-1.2.1.ebuild
index 9bb7684..d6b4516 100644
--- a/media-libs/luxrays/luxrays-1.2.1.ebuild
+++ b/media-libs/luxrays/luxrays-1.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit cmake-utils flag-o-matic
 
-DESCRIPTION="Library to accelerate the ray intersection process by using GPUs (this pkg provides only CPU support atm)"
+DESCRIPTION="Library to accelerate the ray intersection process by using GPUs."
 HOMEPAGE="http://www.luxrender.net"
 EHG_REVISION="475fbf15f0ca"
 SRC_URI="https://bitbucket.org/luxrender/luxrays/get/${EHG_REVISION}.tar.bz2"
@@ -20,10 +20,9 @@ IUSE="debug"
 
 DEPEND=">=dev-libs/boost-1.43
 	media-libs/freeimage
+	virtual/opencl
 	virtual/opengl"
 
-CMAKE_IN_SOURCE_BUILD=1
-
 src_configure() {
 	append-flags "-fPIC"
 	use debug && append-flags -ggdb