hasufell 14/12/22 15:41:27
Added: blender-2.68-fix-install-rules.patch
blender-2.70-sse2.patch blender-2.68-doxyfile.patch
Log:
add missing patches
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
BDEED020)
Revision Changes Path
1.1
media-gfx/blender/files/blender-2.68-fix-install-rules.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.68-fix-install-rules.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.68-fix-install-rules.patch?rev=1.1&content-type=text/plain
Index: blender-2.68-fix-install-rules.patch
===================================================================
commit 94eed33f878e35a8c7b69b0c23b3b30026460f33
Author: hasufell <hasuf...@gentoo.org>
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...\")")
1.1 media-gfx/blender/files/blender-2.70-sse2.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.70-sse2.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.70-sse2.patch?rev=1.1&content-type=text/plain
Index: blender-2.70-sse2.patch
===================================================================
commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6
Author: hasufell <hasuf...@gentoo.org>
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
1.1 media-gfx/blender/files/blender-2.68-doxyfile.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.68-doxyfile.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.68-doxyfile.patch?rev=1.1&content-type=text/plain
Index: blender-2.68-doxyfile.patch
===================================================================
commit 62308d9fc24bde22a50497816c44c8ca91f96f63
Author: hasufell <hasuf...@gentoo.org>
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
