| 1 |
hasufell 14/06/28 12:05:30 |
| 2 |
|
| 3 |
Added: 04-blender-2.71-unbundle-glog.patch |
| 4 |
02-blender-2.71-unbundle-colamd.patch |
| 5 |
Log: |
| 6 |
version bump wrt #515390 |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch |
| 12 |
|
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: 04-blender-2.71-unbundle-glog.patch |
| 17 |
=================================================================== |
| 18 |
commit 26e853d31931a8bb08695aa98ae53b263236d407 |
| 19 |
Author: hasufell <hasufell@g.o> |
| 20 |
Date: Fri Jul 19 18:40:23 2013 +0200 |
| 21 |
|
| 22 |
unbundle glog/gflags |
| 23 |
|
| 24 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 25 |
index b1a7830..a30831c 100644 |
| 26 |
--- a/CMakeLists.txt |
| 27 |
+++ b/CMakeLists.txt |
| 28 |
@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) |
| 29 |
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) |
| 30 |
|
| 31 |
#----------------------------------------------------------------------------- |
| 32 |
+# Check for some modules |
| 33 |
+if(UNIX) |
| 34 |
+ find_package(PkgConfig) |
| 35 |
+ pkg_check_modules(_PC_GFLAGS libgflags) |
| 36 |
+ pkg_check_modules(_PC_GLOG libglog) |
| 37 |
+endif() |
| 38 |
+ |
| 39 |
+#----------------------------------------------------------------------------- |
| 40 |
# Set default config options |
| 41 |
|
| 42 |
get_blender_version() |
| 43 |
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt |
| 44 |
index 2c9a219..7061e04 100644 |
| 45 |
--- a/extern/libmv/CMakeLists.txt |
| 46 |
+++ b/extern/libmv/CMakeLists.txt |
| 47 |
@@ -47,8 +47,6 @@ |
| 48 |
) |
| 49 |
|
| 50 |
list(APPEND INC |
| 51 |
- third_party/gflags |
| 52 |
- third_party/glog/src |
| 53 |
third_party/ceres/include |
| 54 |
../../intern/guardedalloc |
| 55 |
) |
| 56 |
@@ -208,7 +206,10 @@ |
| 57 |
) |
| 58 |
endif() |
| 59 |
|
| 60 |
+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) |
| 61 |
blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") |
| 62 |
+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) |
| 63 |
+ |
| 64 |
|
| 65 |
if(WITH_LIBMV) |
| 66 |
add_subdirectory(third_party) |
| 67 |
@@ -299,5 +300,5 @@ |
| 68 |
set(GLOG_INC_SYS |
| 69 |
) |
| 70 |
|
| 71 |
- blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}" "${GLOG_INC_SYS}") |
| 72 |
+ # blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}" "${GLOG_INC_SYS}") |
| 73 |
endif() |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.1 media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch |
| 78 |
|
| 79 |
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 |
| 80 |
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 |
| 81 |
|
| 82 |
Index: 02-blender-2.71-unbundle-colamd.patch |
| 83 |
=================================================================== |
| 84 |
commit f6af85bef74ae6d1df1e811db7274829e50f10a9 |
| 85 |
Author: hasufell <hasufell@g.o> |
| 86 |
Date: Fri Jul 19 18:37:21 2013 +0200 |
| 87 |
|
| 88 |
unbundle colamd |
| 89 |
|
| 90 |
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt |
| 91 |
index f6de873..2b40c22 100644 |
| 92 |
--- a/extern/CMakeLists.txt |
| 93 |
+++ b/extern/CMakeLists.txt |
| 94 |
@@ -26,7 +26,6 @@ |
| 95 |
# Otherwise we get warnings here that we cant fix in external projects |
| 96 |
remove_strict_flags() |
| 97 |
|
| 98 |
-add_subdirectory(colamd) |
| 99 |
add_subdirectory(rangetree) |
| 100 |
add_subdirectory(wcwidth) |
| 101 |
add_subdirectory(libmv) |
| 102 |
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt |
| 103 |
index d91319d..bc3baee 100644 |
| 104 |
--- a/source/blenderplayer/CMakeLists.txt |
| 105 |
+++ b/source/blenderplayer/CMakeLists.txt |
| 106 |
@@ -170,8 +170,6 @@ endif() |
| 107 |
list(APPEND BLENDER_SORTED_LIBS extern_ceres) |
| 108 |
endif() |
| 109 |
|
| 110 |
- list(APPEND BLENDER_SORTED_LIBS extern_colamd) |
| 111 |
- |
| 112 |
if(WITH_MOD_BOOLEAN) |
| 113 |
list(APPEND BLENDER_SORTED_LIBS extern_carve) |
| 114 |
endif() |
| 115 |
@@ -214,7 +212,7 @@ endif() |
| 116 |
list(SORT REM_MSG) |
| 117 |
message(STATUS "Player Skipping: (${REM_MSG})") |
| 118 |
endif() |
| 119 |
- target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) |
| 120 |
+ target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd) |
| 121 |
|
| 122 |
unset(SEARCHLIB) |
| 123 |
unset(SORTLIB) |
| 124 |
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt |
| 125 |
index 8ff4ec4..c84d944 100644 |
| 126 |
--- a/source/creator/CMakeLists.txt |
| 127 |
+++ b/source/creator/CMakeLists.txt |
| 128 |
@@ -889,6 +889,6 @@ |
| 129 |
|
| 130 |
setup_blender_sorted_libs() |
| 131 |
|
| 132 |
-target_link_libraries(blender ${BLENDER_SORTED_LIBS}) |
| 133 |
+target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd) |
| 134 |
|
| 135 |
setup_liblinks(blender) |
Archives