[gentoo-commits] gentoo-x86 commit in media-gfx/blender/files: 04-blender-2.71-r2-unbundle-glog.patch 09-blender-2.72-unbundle-minilzo.patch

[Julian Ospald (hasufell)]

hasufell    14/09/27 14:55:43

  Added:                04-blender-2.71-r2-unbundle-glog.patch
                        09-blender-2.72-unbundle-minilzo.patch
  Log:
  re-add 2.71 with fixed Manifest wrt #523328 and unbundle minilzo wrt #515266
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

Revision  Changes    Path
1.1                  media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch?rev=1.1&content-type=text/plain

Index: 04-blender-2.71-r2-unbundle-glog.patch
===================================================================
commit 26e853d31931a8bb08695aa98ae53b263236d407
Author: hasufell <hasufell@g.o>
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
@@ -44,8 +44,6 @@
 	)
 
 	list(APPEND INC
-		third_party/gflags
-		third_party/glog/src
 		third_party/ceres/include
 		../../intern/guardedalloc
 	)
@@ -92,10 +90,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-util.h
 		libmv/base/aligned_malloc.h
 		libmv/base/id_generator.h
@@ -149,12 +143,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
 	)
@@ -195,38 +183,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
-		)
 	endif()
 else()
 	list(APPEND SRC
@@ -234,7 +190,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)



1.1                  media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch?rev=1.1&content-type=text/plain

Index: 09-blender-2.72-unbundle-minilzo.patch
===================================================================
From: Julian Ospald <hasufell@g.o>
Date: Sat Sep 27 13:35:35 UTC 2014
Subject: unbundle vulnerable minilzo version

--- source/blender/blenkernel/intern/pointcache.c
+++ source/blender/blenkernel/intern/pointcache.c
@@ -84,10 +84,11 @@
 #endif
 
 #ifdef WITH_LZO
-#include "minilzo.h"
-#else
-/* used for non-lzo cases */
+#include <lzo/lzo1x.h>
 #define LZO_OUT_LEN(size)     ((size) + (size) / 16 + 64 + 3)
+
+#define LZO_HEAP_ALLOC(var,size) \
+    lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ]
 #endif
 
 #ifdef WITH_LZMA
--- extern/CMakeLists.txt
+++ extern/CMakeLists.txt
@@ -62,10 +62,6 @@
 	add_subdirectory(libredcode)
 endif()
 
-if(WITH_LZO)
-	add_subdirectory(lzo)
-endif()
-
 if(WITH_LZMA)
 	add_subdirectory(lzma)
 endif()
--- source/blender/blenkernel/CMakeLists.txt
+++ source/blender/blenkernel/CMakeLists.txt
@@ -397,9 +397,6 @@
 endif()
 
 if(WITH_LZO)
-	list(APPEND INC_SYS
-		../../../extern/lzo/minilzo
-	)
 	add_definitions(-DWITH_LZO)
 endif()
 
--- build_files/cmake/macros.cmake
+++ build_files/cmake/macros.cmake
@@ -304,6 +304,10 @@
 		endif()
 	endif()
 
+	if(WITH_LZO)
+		target_link_libraries(${target} liblzo2.so)
+	endif()
+
 	if(WITH_SYSTEM_GLEW)
 		target_link_libraries(${target} ${GLEW_LIBRARY})
 	endif()