summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-09-27 15:03:40 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-09-27 15:03:40 +0000
commit5c9f2eeec79ff197ab4c66f66c00d287f86c7e4f (patch)
tree6611a399516724b07f89aac3bca0eed34214eb1f /media-gfx/blender
parentFix bashism, bug #523862 (diff)
downloadhistorical-5c9f2eeec79ff197ab4c66f66c00d287f86c7e4f.tar.gz
historical-5c9f2eeec79ff197ab4c66f66c00d287f86c7e4f.tar.bz2
historical-5c9f2eeec79ff197ab4c66f66c00d287f86c7e4f.zip
unbundle minilzo wrt #515266
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'media-gfx/blender')
-rw-r--r--media-gfx/blender/ChangeLog8
-rw-r--r--media-gfx/blender/Manifest32
-rw-r--r--media-gfx/blender/blender-2.72-r1.ebuild (renamed from media-gfx/blender/blender-2.72.ebuild)7
3 files changed, 28 insertions, 19 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/Manifest b/media-gfx/blender/Manifest
index f61f72c33919..82213203c730 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -19,25 +19,25 @@ DIST blender-2.71-r2.tar.gz 56881288 SHA256 1d7d5a67a8ce5d258534fc0d426c30dbff56
DIST blender-2.72.tar.gz 57506461 SHA256 17a90210180d6ffa189b3a0546a6b0103aeae3df49ecb5356cc05b5bb455d8b9 SHA512 94f9ad214ccf53e7bea8de327aec745b6c6d77dbb44d3c3ed9703543eb136152bfc54d17f60ce376dc1212f2f7045b07b6d976ccb5ddb9c3f84d684eaa7cb8a0 WHIRLPOOL 8f39c1d78c017968067a2648ef4be6decc914d92fd87f5ee131a4a1a37503e3ed920fa2e73e3d03daeb61ef006cb91b8b99b4e591d29af37af25b3cb70afa21c
EBUILD blender-2.69-r1.ebuild 7376 SHA256 c6eacb81387cd56abf9dd4357338fb592e8b6778bdd114a7b789755f0bc7eaa9 SHA512 729cbcb4963c960315e64b28cc1d011867d6e9792bb423c4fad20330abbabb718792470a2e3235757a05c641d32b6f9f3736ce9535b5db71f54798adb9e2d6a6 WHIRLPOOL a4b5a9540d0f7f72bbc8e8102c80cd6577eba522d933ed3997ee607226eeed8477503e6376811433705395ddeecbd5132c828ee3960f106f85c47967696db809
EBUILD blender-2.71-r2.ebuild 7815 SHA256 b5e8c4c1ba8c18042877f0f6ddfd86ffd63453b893786b99904022349abb1691 SHA512 0effbd4390b41c4fa36db7c42fc41dc7457024c512ac43369a56bd28ec7299918a798cadb17d1ed34234f79c7d8108bc7ee01e6686575dfaddf7ef8ca898a18c WHIRLPOOL 1d70b7727e32b8d4a9e2e173e6f1ea6988936cf653f3d2b6fc716a009159605b4ef79a0fc727a121e407085bfea14dbec7edd79887340fa4513ff9e150197da9
-EBUILD blender-2.72.ebuild 7673 SHA256 fa153e27698a0a7e8e36aed8f7c1fdcdeac6d00f65d72c9997129ee26b36c86c SHA512 108e1c275f3a42007ab6b91e5773590acf61703f622ebbf62d9ec31312cab4dc7e526edade7378dcac3624b2eab852b4c0dcf221c8081e89b6c90bbaf7d83155 WHIRLPOOL deef57c51751dd8f532e35438f0f191f4537900fc08811416d0d37056e8b84140d94e499a3387d7a45cb29de9be31aef893bcd2bc81a2615ac4c8ae5476222bd
-MISC ChangeLog 49044 SHA256 35010b08251157ae8d281ccece384dca289e1a3161b8674b91890cc043911982 SHA512 637f0882e8cb37299f23d57ded84af4e0a486b2df2b7983fd837f5b740f992023fadecafe67b86094322be850be199e1d45ffb5c0633172104c6e10093e62f2e WHIRLPOOL dd222d6c8930dee3d9d2b4a875d6c6291716322ce9840cede1178320655570d86808b9c2a228dd6f30dbe12bbba739c1c70f40a6f1d907bacc8b3b9c3d37ef0a
+EBUILD blender-2.72-r1.ebuild 7769 SHA256 71e14ff8fd27c0e4c2ab30761acea0b2b7cc37fc62b2ff2f64b7adb3fef72116 SHA512 94cd31432186646e41335276ec30cdf097eb5523342a6fab7dc32946916c34c94b2f0d5855ca0bc001ff1e2c4af2942d03033b2080281b8149b35b2a39c197ab WHIRLPOOL fdc68872f033ef6436406c0c208b0a8ce20e1b9161d4df05714fde8e809015c1bee79b4e7d9a55ca50c3f77344bf3fda549cabb407c8542aa2809d46640250a2
+MISC ChangeLog 49208 SHA256 ba94b42e78886c5e128dfff37a298bf99251d60f703ab055dc41e09433fd536e SHA512 c2b100178abe1d8f7b1f8f94f2f2da0d307e84e01a08fc0becefe570608358c249277b4e7a5bd448ca1a9ea277748d17702558864af3f02b53e7d24913464390 WHIRLPOOL e64c1dfb3a3bcad1ebef220e51e233499d5f3980b7089f7d745b1d8bf75df47ce44167117e8012c98595d47daccd09384c0dfeafee39714a72c542e707c1f7b0
MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0
-iQJ8BAEBCABmBQJUJs/zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUJtHLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgtU4P/iMf3lSVH9VDI7wif9ry2Evy
-CZec2ksMZ/YKe83Rw1c1pJLYBWjO85u4U6X3AXwzW+5THEBh7cNvEXWuldDNbdtf
-6DxwZHEDyXXn7ac9itRfT7B/eZthwAPb+uxqKlFw2YkL/sx3bdyR949RbnXushYv
-YHz0pP20QX8iiLYXfsK2hxArhZLfbqlSr5rtpTF/a18dOp+wRnKqX7iIJK0ye1Nc
-WXA1HuVMwaw5qf/YmoDdIJYP09I066pqsyA5JuC1UtpIo5iQRHCtUs5QfcLNc5SQ
-lG04PjWhXwk1ptgqfN5Mrf63m1Vnfjfp0KWzzjA2RUCUfvrvS1XMgIkO8nB6bmmh
-dQ9X7ttAygC04e/pUPd/h3kf/N5OCUAkF/EnxSOm93epHCU7UFnSbBvMvuCQ/ksh
-ct9jCmV3ZlDCzXmUoi+L9sCU7HD5yzQz09QtIj8QT9CppcJtarM2/l9O7D2WqgFC
-Q2pjpVfTs+Vq017aLnooLEatypLiubTHfACfpBPp4V1qX4fJNTsleMvCh116L2kB
-xzIEWcTbu6ObuR4coZRyx6YxkAWbW17sj+FCSzxSDWYqLjhpoWq0sndQGuKppKaa
-S4Nb70hk+meU1kBggREEUpUcQOV9fCLmKu1HKLFeqBjxb2rrhAm+sdEZiQwNABlj
-AT+aICi3tzSjEo9ObdtC
-=eUaF
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg6rsP/iRdFnrX3O7OAME9dReXSWLn
+JgtO9nJzBRfsI2OJK4tmgbSLk38i9wxd7qa/CVbFMRT1g/6UJZLJqL9soF0Ja9ar
+iRIdAay/FVzbNxzI/twWlIMtemrhcC5wmsZaz6u03TSb/JAZUKBCnsmVmjeUYqng
+XxOCvkHo5YEvaLftZGJwZaXeSwXQElnZ+KO5aJFOhCIKk4VFRzG0QKF9cOhG//M8
+anTH1aLab7NvifgjtyCXBlFzb4OYU1msQqQPQUSPjinc7rVP8gIs3nK3RiTfA86u
+PQz9N8OM3By0f69971T6Hn00CA7kE3DW/OkePm0vZvV3ddgrEHGDIydeLmeoNMm4
+0gE/KseIjih07E38IaFDKwooA0HuSzvYjKdGYiPAvbGc7jfO5dNXb0HKNx9iQB8V
+AKaMvKYFI/XsaY4R1x1lr3EnfHwnlO6A2KuHYlFVn/j7aZrMDUsc0SHXqDzPTYkZ
+DaPZj3TJqnGX30FqREVZr4raqx+Q52c81FuPO1PMgFhZnxdacgx7K9H4c9x+etXy
+kRS8lknb50r+XqyU5I+MlJ7P9z7rJcL6V+IlXNwXH72sW3k2fsWBP9DafhoobbzU
+ExK1ufqJaHzb8svvqBjn0KQGPaE8e5+7gvl3DsJcjb37HdI8Sh6EjQ57FlREzC9a
+C53mqjq8THE5MHVCjg+V
+=7ckt
-----END PGP SIGNATURE-----
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