summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-09-27 15:03:38 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-09-27 15:03:38 +0000
commit2b613193b3e54f80e781cf31f3fc83082ca34e70 (patch)
treeb55957d51f0877d92b3dd4b85eff498c141b0f0e /media-gfx
parentFix bashism, bug #523862 (diff)
downloadgentoo-2-2b613193b3e54f80e781cf31f3fc83082ca34e70.tar.gz
gentoo-2-2b613193b3e54f80e781cf31f3fc83082ca34e70.tar.bz2
gentoo-2-2b613193b3e54f80e781cf31f3fc83082ca34e70.zip
unbundle minilzo wrt #515266
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/ChangeLog8
-rw-r--r--media-gfx/blender/blender-2.72-r1.ebuild (renamed from media-gfx/blender/blender-2.72.ebuild)7
2 files changed, 12 insertions, 3 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 91f703e4380f..6e59ccf0ae8f 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/blender
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.273 2014/09/27 14:55:43 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.274 2014/09/27 15:03:38 hasufell Exp $
+
+*blender-2.72-r1 (27 Sep 2014)
+
+ 27 Sep 2014; Julian Ospald <hasufell@gentoo.org> -blender-2.72.ebuild,
+ +blender-2.72-r1.ebuild:
+ unbundle minilzo wrt #515266
*blender-2.71-r2 (27 Sep 2014)
diff --git a/media-gfx/blender/blender-2.72.ebuild b/media-gfx/blender/blender-2.72-r1.ebuild
index 9570f815c85a..7a6c17179480 100644
--- a/media-gfx/blender/blender-2.72.ebuild
+++ b/media-gfx/blender/blender-2.72-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72.ebuild,v 1.1 2014/09/27 12:10:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72-r1.ebuild,v 1.1 2014/09/27 15:03:38 hasufell Exp $
# TODO:
# bundled-deps: bullet is modified
@@ -41,6 +41,7 @@ RDEPEND="
${PYTHON_DEPS}
>=dev-cpp/gflags-2.1.1-r1
>=dev-cpp/glog-0.3.3-r1[gflags]
+ >=dev-libs/lzo-2.08:2
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
>=media-libs/freetype-2.0
@@ -113,7 +114,8 @@ src_prepare() {
"${FILESDIR}"/05-${PN}-2.72-unbundle-eigen3.patch \
"${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \
"${FILESDIR}"/07-${PN}-2.70-sse2.patch \
- "${FILESDIR}"/08-${PN}-2.71-gflags.patch
+ "${FILESDIR}"/08-${PN}-2.71-gflags.patch \
+ "${FILESDIR}"/09-${PN}-2.72-unbundle-minilzo.patch
epatch_user
@@ -123,6 +125,7 @@ src_prepare() {
extern/libopenjpeg \
extern/glew \
extern/colamd \
+ extern/lzo \
extern/libmv/third_party/{glog,gflags} \
|| die