From 75fd9ab8692b7e37a431fdefda856cb800dd3eec Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 22 Dec 2014 15:41:31 +0000 Subject: [PATCH] add missing patches Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020 --- media-gfx/blender/ChangeLog | 7 +++- media-gfx/blender/Manifest | 27 +++++++++++++- .../blender/files/blender-2.68-doxyfile.patch | 19 ++++++++++ .../blender-2.68-fix-install-rules.patch | 26 ++++++++++++++ .../blender/files/blender-2.70-sse2.patch | 35 +++++++++++++++++++ 5 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 media-gfx/blender/files/blender-2.68-doxyfile.patch create mode 100644 media-gfx/blender/files/blender-2.68-fix-install-rules.patch create mode 100644 media-gfx/blender/files/blender-2.70-sse2.patch diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index f9a49cf86e93..efb6c809b326 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,11 @@ # 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.281 2014/12/21 22:31:45 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.282 2014/12/22 15:41:27 hasufell Exp $ + + 22 Dec 2014; Julian Ospald + +files/blender-2.68-doxyfile.patch, + +files/blender-2.68-fix-install-rules.patch, +files/blender-2.70-sse2.patch: + add missing patches 21 Dec 2014; Manuel Rüger blender-2.72b-r1.ebuild: Drop blank line. diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index b362dd05300e..7f82e1263f5c 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 01-blender-2.68-doxyfile.patch 732 SHA256 d485da5bdf1f123d945b8f945a84ead947ff123b4126a626bb394256ea07cbec SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7 WHIRLPOOL 5cfdb697bf18aa50488495d017feda2e071332996a72e1a3c347291034c7230ad63c89e38670a86df633d3dc8359962e8888e4f0f1a2fa0b478acdb33a8f4d64 AUX 02-blender-2.71-unbundle-colamd.patch 1592 SHA256 d86234ea75cec01786685e985a6f0f13b60f4fbd296e906d96a24beed9118598 SHA512 f3656380c588ebc54f327e1997e0b0f6fc9b2f3ac6fa2fcae6eb2c217503d5567fb88972d8eec4dd3a1f0dea0aee9171914d0436042d672c097e8777d31ff76b WHIRLPOOL bb8ece004007b4b25a7c772c0a2e8ccdb6ed21e5ab265446465feecd99c803434e0093e9e580893fdda34489cb4c404a56a46f09684a5f3854f23dd2f856eede AUX 04-blender-2.71-unbundle-glog.patch 1650 SHA256 bec78cb9ec67f5a5fafdca06bf796c8e9a4f531fbf3ab78ebe124df317e9c8eb SHA512 92eaca756e5b0c6c1c958cb58a47b9aeb87dcd6494ec7a7fee83ec06887e3fa323886e44cfcc968e40f4cb99a352cdba56ea25c6c5a051b769101e0ae3eecdc1 WHIRLPOOL 54e65ec7e42d4e847caec17312b53e349fb40d2bac0a924ca7cedddaf8773acb30750a1f903b4c9c142c04d2ba76095a16ab50043ab1112b198bca5e048ef202 @@ -6,9 +9,31 @@ AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0d AUX 07-blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7 AUX 08-blender-2.71-gflags.patch 2223 SHA256 295c043088854b62da158ff6a445a8cdb0114a2298de32f4221cb483e9eb407a SHA512 efec5beed218ba0ab3c76ec65c47408631753567c31076cb8431923d5ff0df59c91ab1d2d42007944d307c6aba35746c2435eb9318b65fd69b4c2ed280570f87 WHIRLPOOL 4b5721af9fe9bebe4df1f324eb53f25459f454ce28f46b9af703c47660969b9a6dc1e73d544dbdad2738aad3a9ae53cf8d805bf20af8763f8a59b051302435c2 AUX 09-blender-2.72b-unbundle-minilzo.patch 1170 SHA256 17464deac2c2536b671e16415fc3d37077727f558f8b36e1405ccf179f3c563b SHA512 d062628c837b1f4889bc9616b0814abc27c38cb1f7a77d9276846dccc12c148f22d4647d9aabb41ec342c7c52a4fad95c110869d9599c5204f803a5fb237eed2 WHIRLPOOL 69719041ebe17430fccc45875f08a64c34431c0f6f9e744d2b7d1a3b82c358a69ecbe5d8033eae63d112fcb60ffff108dc03a6b9dad7f0bbdd9c014046781dbc +AUX blender-2.68-doxyfile.patch 732 SHA256 d485da5bdf1f123d945b8f945a84ead947ff123b4126a626bb394256ea07cbec SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7 WHIRLPOOL 5cfdb697bf18aa50488495d017feda2e071332996a72e1a3c347291034c7230ad63c89e38670a86df633d3dc8359962e8888e4f0f1a2fa0b478acdb33a8f4d64 +AUX blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0dbf5966843630edaa4d7828de42d1bb5ba76058d SHA512 dd21cb3aa8bf965631132d39ad8a43c15d0c32faeaee00e8b8a970108fba0ab43b2402e3637dcd0b3430b7023ac9203b0395bbd2dc2dd9eb80d8c1d994d89e4f WHIRLPOOL 7c86d7637fdbf1d4c1f631b6a47c7e02399a00976189acaf9fc041765419cd2ffaaaab0d6fb05f4ba67024d14cfc778f3620f9d6cbf89e81b16a467e45beac75 +AUX blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7 AUX blender-2.72-T42797.diff 338 SHA256 96ea23f8c588dff6a91415fbb69d007bf4ae4d46e5579d2d7421efb0abaa37fc SHA512 a659582b36f8f07bb866fbd97a4393b186e527dabf76c2ab7112a7f0b96504d077cf5ab0422c6eca53c3c70583caa2d280e0fa1f4454d1935ad8d764079f0d84 WHIRLPOOL 1f1d3e50e52f3e9c92db6950f35cafea3410c1bcb109af1e5c91fab289a3c841ab0489164fe81e99c2d8b8ae8ccd5ee6114233ecdadfbf09eb8b67bbfe43461e DIST blender-2.72b.tar.gz 52018242 SHA256 4436c704afa28e2e5e7b28b2c06981806ddedab70565d40972e422c00644bf47 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124 WHIRLPOOL 3687255bc9f4195b25b66a75630676ee15e67cf10a058dca11b3472617b54aae2bebb1810cc16e19c58ca1c09b1ea8b70f72e30c05632ab0bae8910925a37a54 EBUILD blender-2.72b-r1.ebuild 7744 SHA256 45f7cf1d7746fb3b62421e91e09fd76cf9c4528a3cee5d8d40d5a9e32ea8bee4 SHA512 fe290de911203ba7b26eed438fa045c31223dedc7c1bf50e69435ee1530f0cf80ff3c57c414888a2fe5718725a3d29fe9b629091920c5e48e67ca0ba0fa10ade WHIRLPOOL 0c6d89c168a05ef8ed36dc0c4b08fa130e9b827a9df28e8c2a1907e01f34c297df2ebed436628330d45462507d71334431c5f2c7a1eee7e309aa069b0fcab9ea EBUILD blender-2.72b.ebuild 8116 SHA256 00d94fb5af67341b3dd7f218dbb351c6cef2e333dc1bc99af94b58231ff557e2 SHA512 5842be5a16bb893925093e203ca45892791460f2b2e0349337959b724a3df54781731c1d102384773f0f9bbf3bab86d0b21c1bd840eaaad891c5e989b8123f15 WHIRLPOOL 0e25ce96505aaf2752de86e61c62779b52c5b5e0d307dddb61b170e3f3287daec38338de0e7f1287327769b52977097ec601146e070ed48e1374e08bca04eb5c -MISC ChangeLog 50435 SHA256 73b70d09bfabddde6833d78f4e492ecd4333f3e6979739b98488eed4f1f53f8e SHA512 b6d8561e2b14e9b9a249cc6dbb5c73da645d47399ad85a3a63ff30eb376a004f29c927d1ad422ef548e11598f330c41b373f337294fce6da3c53daed077c0faf WHIRLPOOL 21c47fb8927fd2ed38b78e54b4bb1c7cb2df81e6b4d1e11eb20dda2569933ce22bd6144e53e5727c2a1c4d926a2e9ba603e9a624888fbe6e380cb2bdfa982415 +MISC ChangeLog 50629 SHA256 92319d9208b914af011e86ab536bfc0ee796d4f9b2744c5d64632c651479c79d SHA512 caf4be910ddffda3b1ebcdabfc4bd50c1f6b0e79bbf285d7e35b718fa8aa05335d5594c66cd15da5d2c3629109a8c33bf461927f5ad9d76c0381c13566cdcc8b WHIRLPOOL b21865f8c11354d26896fba85118f7c5e6c7524d2026a4ff692333efa1f3dc865d5f20860ebb1fb9d17dfe737c2c74d41028d785fc00d6c5276f3f67b5fccef3 MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCABmBQJUmDupXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgoK8P/0D8Pg6q8lcLCt3PtbxcGG/X +dL6++1NFFhwQrZgbgAVmA/ZlkdI7puQhrpGDqlYyC/9SOcUs0X+5KkqSIiSdjbIJ +CTIB6p3rCqJJcf1k04dCcOuf0OXer71nEmeMIpTq/uRRjxm+eREVCgnnM9y26tMt +5oSx+b6fIb5GVKl4B3hlt1cEK2raZFjCEGhp8YUFqSR+8Q5aSplurKEtDHS2m2Pc +xyTuQNFt0biXRAa0FxBRs2NbilYbiYkURTQGEUkSmiZhA2p3worP1FaPPOLhIqec +3j4jLMsnkDlPIzEszqpeR2bzIvL7doBVUOnKEsCzvCR/0X2qg1PlApgKBkV1UBZi +Hi5kvsh1vo1+mgdKU1bIT/l4SXXyoU+aS89S6I22w/DYSpdSrKzFa9No2mbpBt8I +xIwCGoU1h5uieWem2c8xymoq99Xzs9zapPzFpfuSKCuAGSo0HWoxhKkyWEwy4rZ9 +iXzWQDAKqo33bJfd2habJo1BlJqTWNrkC1hyogIyASkEbkgk4xu3bLZLIqrB3ugr +OUAErIiL+sxdQBiMsEupToe7dCAJ0kTpY+Gpeduv3XprO08dpmh+L6o1RlqEyuKm +F5a56bKax91P+NBuk2oAwo7VsPSEpHEpwbca8+wzC6s7NbdrcrkD1LIAGkrLbDdw +2V7DTDhk0fUUX4+KTm0M +=+ADA +-----END PGP SIGNATURE----- diff --git a/media-gfx/blender/files/blender-2.68-doxyfile.patch b/media-gfx/blender/files/blender-2.68-doxyfile.patch new file mode 100644 index 000000000000..c11c793fda97 --- /dev/null +++ b/media-gfx/blender/files/blender-2.68-doxyfile.patch @@ -0,0 +1,19 @@ +commit 62308d9fc24bde22a50497816c44c8ca91f96f63 +Author: hasufell +Date: Fri Jul 19 18:36:34 2013 +0200 + + remove hhc.exe reference + +diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile +index 397cc30..ac61756 100644 +--- a/doc/doxygen/Doxyfile ++++ b/doc/doxygen/Doxyfile +@@ -1051,7 +1051,7 @@ CHM_FILE = blender.chm + # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run + # the HTML help compiler on the generated index.hhp. + +-HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" ++HHC_LOCATION = + + # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag + # controls if a separate .chi index file is generated (YES) or that diff --git a/media-gfx/blender/files/blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/blender-2.68-fix-install-rules.patch new file mode 100644 index 000000000000..aa8ecc9f6174 --- /dev/null +++ b/media-gfx/blender/files/blender-2.68-fix-install-rules.patch @@ -0,0 +1,26 @@ +commit 94eed33f878e35a8c7b69b0c23b3b30026460f33 +Author: hasufell +Date: Fri Jul 19 18:50:08 2013 +0200 + + remove stupid uninstall snippet + + whoever coded this... it is dangerous + uninstall methods have NO PLACE in install rules + +diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt +index c84d944..2b9bf46 100644 +--- a/source/creator/CMakeLists.txt ++++ b/source/creator/CMakeLists.txt +@@ -268,12 +268,6 @@ endif() + # Install Targets (Generic, All Platforms) + + +-# important to make a clean install each time, else old scripts get loaded. +-install( +- CODE +- "file(REMOVE_RECURSE ${TARGETDIR_VER})" +-) +- + if(WITH_PYTHON) + # install(CODE "message(\"copying blender scripts...\")") + diff --git a/media-gfx/blender/files/blender-2.70-sse2.patch b/media-gfx/blender/files/blender-2.70-sse2.patch new file mode 100644 index 000000000000..6fc870ea3258 --- /dev/null +++ b/media-gfx/blender/files/blender-2.70-sse2.patch @@ -0,0 +1,35 @@ +commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6 +Author: hasufell +Date: Fri Jul 19 18:50:19 2013 +0200 + + add option to explicitly control sse2 optimization + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78bb3c6..d5f4576 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,6 +86,7 @@ + #----------------------------------------------------------------------------- + # Load some macros. + include(build_files/cmake/macros.cmake) ++include(CMakeDependentOption) + + + #----------------------------------------------------------------------------- +@@ -251,6 +252,7 @@ + # Misc + option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) + option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) ++cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) + option(WITH_OPENNL "Enable use of Open Numerical Library" ON) + if(UNIX AND NOT APPLE) + option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) +@@ -1950,7 +1952,7 @@ + set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") + add_definitions(-D__SSE__ -D__MMX__) + endif() +- if(SUPPORT_SSE2_BUILD) ++ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) + set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") + add_definitions(-D__SSE2__) + if(NOT SUPPORT_SSE_BUILD) # dont double up -- 2.26.2