hasufell 14/06/28 12:05:30
Added: 04-blender-2.71-unbundle-glog.patch
02-blender-2.71-unbundle-colamd.patch
Log:
version bump wrt #515390
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
BDEED020)
Revision Changes Path
1.1 media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/04-blender-2.71-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-unbundle-glog.patch?rev=1.1&content-type=text/plain
Index: 04-blender-2.71-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
@@ -47,8 +47,6 @@
)
list(APPEND INC
- third_party/gflags
- third_party/glog/src
third_party/ceres/include
../../intern/guardedalloc
)
@@ -208,7 +206,10 @@
)
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)
@@ -299,5 +300,5 @@
set(GLOG_INC_SYS
)
- blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}"
"${GLOG_INC_SYS}")
+ # blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}"
"${GLOG_INC_SYS}")
endif()
1.1
media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch?rev=1.1&content-type=text/plain
Index: 02-blender-2.71-unbundle-colamd.patch
===================================================================
commit f6af85bef74ae6d1df1e811db7274829e50f10a9
Author: hasufell <[email protected]>
Date: Fri Jul 19 18:37:21 2013 +0200
unbundle colamd
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index f6de873..2b40c22 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -26,7 +26,6 @@
# Otherwise we get warnings here that we cant fix in external projects
remove_strict_flags()
-add_subdirectory(colamd)
add_subdirectory(rangetree)
add_subdirectory(wcwidth)
add_subdirectory(libmv)
diff --git a/source/blenderplayer/CMakeLists.txt
b/source/blenderplayer/CMakeLists.txt
index d91319d..bc3baee 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -170,8 +170,6 @@ endif()
list(APPEND BLENDER_SORTED_LIBS extern_ceres)
endif()
- list(APPEND BLENDER_SORTED_LIBS extern_colamd)
-
if(WITH_MOD_BOOLEAN)
list(APPEND BLENDER_SORTED_LIBS extern_carve)
endif()
@@ -214,7 +212,7 @@ endif()
list(SORT REM_MSG)
message(STATUS "Player Skipping: (${REM_MSG})")
endif()
- target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS})
+ target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd)
unset(SEARCHLIB)
unset(SORTLIB)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8ff4ec4..c84d944 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -889,6 +889,6 @@
setup_blender_sorted_libs()
-target_link_libraries(blender ${BLENDER_SORTED_LIBS})
+target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd)
setup_liblinks(blender)
