hasufell 14/03/20 16:56:34
Added: 07-blender-2.70-sse2.patch
04-blender-2.70-unbundle-glog.patch
Log:
version bump wrt #505138, fix redcode USE flag wrt #505178
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
BDEED020)
Revision Changes Path
1.1 media-gfx/blender/files/07-blender-2.70-sse2.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/07-blender-2.70-sse2.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/07-blender-2.70-sse2.patch?rev=1.1&content-type=text/plain
Index: 07-blender-2.70-sse2.patch
===================================================================
commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6
Author: hasufell <[email protected]>
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/04-blender-2.70-unbundle-glog.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch?rev=1.1&content-type=text/plain
Index: 04-blender-2.70-unbundle-glog.patch
===================================================================
commit 26e853d31931a8bb08695aa98ae53b263236d407
Author: hasufell <[email protected]>
Date: Fri Jul 19 18:40:23 2013 +0200
unbundle glog/gflags
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1a7830..a30831c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE
INTERNAL "" FORCE)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
#-----------------------------------------------------------------------------
+# Check for some modules
+if(UNIX)
+ find_package(PkgConfig)
+ pkg_check_modules(_PC_GFLAGS libgflags)
+ pkg_check_modules(_PC_GLOG libglog)
+endif()
+
+#-----------------------------------------------------------------------------
# Set default config options
get_blender_version()
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 2c9a219..7061e04 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -87,10 +87,6 @@
libmv/tracking/track_region.cc
libmv/tracking/trklt_region_tracker.cc
- third_party/gflags/gflags.cc
- third_party/gflags/gflags_completions.cc
- third_party/gflags/gflags_reporting.cc
-
libmv/base/id_generator.h
libmv/base/scoped_ptr.h
libmv/base/vector.h
@@ -140,12 +136,6 @@
libmv/tracking/track_region.h
libmv/tracking/trklt_region_tracker.h
- third_party/gflags/config.h
- third_party/gflags/gflags/gflags_completions.h
- third_party/gflags/gflags/gflags_declare.h
- third_party/gflags/gflags/gflags.h
- third_party/gflags/mutex.h
- third_party/gflags/util.h
third_party/msinttypes/inttypes.h
third_party/msinttypes/stdint.h
)
@@ -186,42 +176,6 @@
third_party/msinttypes
)
endif()
- else()
- list(APPEND SRC
- third_party/glog/src/demangle.cc
- third_party/glog/src/logging.cc
- third_party/glog/src/raw_logging.cc
- third_party/glog/src/signalhandler.cc
- third_party/glog/src/symbolize.cc
- third_party/glog/src/utilities.cc
- third_party/glog/src/vlog_is_on.cc
-
- third_party/glog/src/base/commandlineflags.h
- third_party/glog/src/base/googleinit.h
- third_party/glog/src/base/mutex.h
- third_party/glog/src/config_freebsd.h
- third_party/glog/src/config.h
- third_party/glog/src/config_hurd.h
- third_party/glog/src/config_linux.h
- third_party/glog/src/config_mac.h
- third_party/glog/src/demangle.h
- third_party/glog/src/glog/logging.h
- third_party/glog/src/glog/log_severity.h
- third_party/glog/src/glog/raw_logging.h
- third_party/glog/src/glog/vlog_is_on.h
- third_party/glog/src/stacktrace_generic-inl.h
- third_party/glog/src/stacktrace.h
- third_party/glog/src/stacktrace_libunwind-inl.h
- third_party/glog/src/stacktrace_powerpc-inl.h
- third_party/glog/src/stacktrace_x86_64-inl.h
- third_party/glog/src/stacktrace_x86-inl.h
- third_party/glog/src/symbolize.h
- third_party/glog/src/utilities.h
- )
-
- list(APPEND INC
- third_party/glog/src
- )
endif()
else()
list(APPEND SRC
@@ -229,7 +183,9 @@
)
endif()
+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS})
blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES}
${_PC_GLOG_LIBRARIES})
if(WITH_LIBMV)
add_subdirectory(third_party)
