<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138063] trunk/dports/math/caffe</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138063">138063</a></dd>
<dt>Author</dt> <dd>hum@macports.org</dd>
<dt>Date</dt> <dd>2015-06-27 02:59:08 -0700 (Sat, 27 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>caffe: update to 20150624; add -lopencv_imgcodecs to Makefile to link with OpenCV 3.0; see https://github.com/BVLC/caffe/issues/1276</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathcaffePortfile">trunk/dports/math/caffe/Portfile</a></li>
<li><a href="#trunkdportsmathcaffefilespatchMakefilediff">trunk/dports/math/caffe/files/patch-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathcaffePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/caffe/Portfile (138062 => 138063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/caffe/Portfile 2015-06-27 08:06:25 UTC (rev 138062)
+++ trunk/dports/math/caffe/Portfile 2015-06-27 09:59:08 UTC (rev 138063)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup BVLC caffe 2f4a9e40af0c0d08c7b130f4e5091f39a1d33b5a
-version 20150605
</del><ins>+github.setup BVLC caffe af37efdae91744fba989a17419521dbcae126992
+version 20150624
</ins><span class="cx"> categories math science
</span><span class="cx"> maintainers hum openmaintainer
</span><span class="cx">
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="cx">
</span><del>-checksums rmd160 19a2d570c32ec63d6b197bf908958dcdf87165ef \
- sha256 d2ec224ef837764747e41e274a45f24a77c2226056f4bd45d25ffa29a5135833
</del><ins>+checksums rmd160 fc86b19e76f2a6020fb213a26d98f28d43111c04 \
+ sha256 02f53b05a2a5fe46cfd6415a5a23101b6b64fc288fcc63a98d4b60def76a6eb5
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:google-glog \
</span><span class="cx"> port:gflags \
</span></span></pre></div>
<a id="trunkdportsmathcaffefilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/caffe/files/patch-Makefile.diff (138062 => 138063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/caffe/files/patch-Makefile.diff 2015-06-27 08:06:25 UTC (rev 138062)
+++ trunk/dports/math/caffe/files/patch-Makefile.diff 2015-06-27 09:59:08 UTC (rev 138063)
</span><span class="lines">@@ -1,18 +1,19 @@
</span><del>---- Makefile.orig 2015-04-18 04:26:48.000000000 +0900
-+++ Makefile 2015-04-18 21:21:56.000000000 +0900
-@@ -162,9 +162,9 @@
</del><ins>+--- Makefile.orig 2015-06-24 06:48:24.000000000 +0900
++++ Makefile 2015-06-27 18:51:14.000000000 +0900
+@@ -170,9 +170,9 @@
</ins><span class="cx"> LIBRARIES := cudart cublas curand
</span><span class="cx"> endif
</span><span class="cx"> LIBRARIES += glog gflags protobuf leveldb snappy \
</span><span class="cx"> - lmdb boost_system hdf5_hl hdf5 m \
</span><ins>+- opencv_core opencv_highgui opencv_imgproc
+-PYTHON_LIBRARIES := boost_python python2.7
</ins><span class="cx"> + lmdb boost_system-mt hdf5_hl hdf5 m \
</span><del>- opencv_core opencv_highgui opencv_imgproc
--PYTHON_LIBRARIES := boost_python python2.7
</del><ins>++ opencv_core opencv_highgui opencv_imgproc opencv_imgcodecs
</ins><span class="cx"> +PYTHON_LIBRARIES := boost_python-mt python2.7
</span><span class="cx"> WARNINGS := -Wall -Wno-sign-compare
</span><span class="cx">
</span><span class="cx"> ##############################
</span><del>-@@ -232,7 +232,7 @@
</del><ins>+@@ -240,7 +240,7 @@
</ins><span class="cx"> # clang++ instead of g++
</span><span class="cx"> # libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
</span><span class="cx"> ifeq ($(OSX), 1)
</span><span class="lines">@@ -21,7 +22,7 @@
</span><span class="cx"> ifneq ($(CPU_ONLY), 1)
</span><span class="cx"> CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
</span><span class="cx"> ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
</span><del>-@@ -341,7 +341,7 @@
</del><ins>+@@ -349,7 +349,7 @@
</ins><span class="cx">
</span><span class="cx"> # Complete build flags.
</span><span class="cx"> COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
</span><span class="lines">@@ -30,7 +31,7 @@
</span><span class="cx"> NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
</span><span class="cx"> # mex may invoke an older gcc that is too liberal with -Wuninitalized
</span><span class="cx"> MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
</span><del>-@@ -540,7 +540,7 @@
</del><ins>+@@ -554,7 +554,7 @@
</ins><span class="cx"> # Target for extension-less symlinks to tool binaries with extension '*.bin'.
</span><span class="cx"> $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
</span><span class="cx"> @ $(RM) $@
</span></span></pre>
</div>
</div>
</body>
</html>