<!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>[137902] trunk/dports/devel/vxl</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/137902">137902</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2015-06-22 14:37:48 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>vxl: fix build with latest Clang from XCode</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelvxlPortfile">trunk/dports/devel/vxl/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelvxlfilespatchcontrib_mul_tools_crop_image_2dcxxdiff">trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff</a></li>
<li><a href="#trunkdportsdevelvxlfilespatchcontrib_mul_tools_crop_image_3dcxxdiff">trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff</a></li>
<li><a href="#trunkdportsdevelvxlfilespatchcore_vul_vul_psfileh">trunk/dports/devel/vxl/files/patch-core_vul_vul_psfile.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelvxlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/vxl/Portfile (137901 => 137902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/vxl/Portfile 2015-06-22 21:12:10 UTC (rev 137901)
+++ trunk/dports/devel/vxl/Portfile 2015-06-22 21:37:48 UTC (rev 137902)
</span><span class="lines">@@ -22,9 +22,8 @@
</span><span class="cx">
</span><span class="cx"> master_sites sourceforge:project/vxl/vxl/${branch}
</span><span class="cx"> use_zip yes
</span><del>-checksums md5 95b5ecbbe164d1b540ab52fd0ca26b47 \
- sha1 bfa7e9df3fb8807ef3b14921c31d568e94f3edf4 \
- rmd160 a00d811aa86b2d3a2dad292ff94991c034092434
</del><ins>+checksums rmd160 a00d811aa86b2d3a2dad292ff94991c034092434 \
+ sha256 b06b4a087486af3a270ced2597242bd6cc4e3381779f27a944ea0620208ae7e1
</ins><span class="cx">
</span><span class="cx"> # licenses in vxl:
</span><span class="cx"> # (see also: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/debian/copyright?revision=10688&view=markup)
</span><span class="lines">@@ -46,9 +45,11 @@
</span><span class="cx"> # disable broken contrib/prip code
</span><span class="cx">
</span><span class="cx"> patchfiles patch-use-embedded-openjpeg2.diff \
</span><ins>+ patch-contrib_mul_tools_crop_image_2d.cxx.diff \
+ patch-contrib_mul_tools_crop_image_3d.cxx.diff \
</ins><span class="cx"> patch-disable-broken-ffmpeg.diff \
</span><span class="cx"> patch-disable-contrib-prip.diff
</span><del>-
</del><ins>+
</ins><span class="cx"> depends_lib-append \
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:tiff \
</span><span class="lines">@@ -59,7 +60,8 @@
</span><span class="cx"> port:libdc1394
</span><span class="cx">
</span><span class="cx"> if {[string match *clang* ${configure.compiler}]} {
</span><del>- configure.cxxflags-append -Werror=gnu -Wno-error=vla
</del><ins>+ configure.cxxflags-append -Werror=gnu -Wno-error=vla -std=c++0x
+ patchfiles-append patch-core_vul_vul_psfile.h
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span></span></pre></div>
<a id="trunkdportsdevelvxlfilespatchcontrib_mul_tools_crop_image_2dcxxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff (0 => 137902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff (rev 0)
+++ trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff 2015-06-22 21:37:48 UTC (rev 137902)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+--- contrib/mul/tools/crop_image_2d.cxx.orig 2011-06-11 22:39:06.000000000 +0400
++++ contrib/mul/tools/crop_image_2d.cxx 2015-06-21 19:56:38.000000000 +0300
+@@ -54,16 +54,31 @@
+ vul_arg_parse(argc, argv);
+
+ // Log the program arguments
+- MBL_LOG(INFO, logger(), "crop_image_2d: ");
+- MBL_LOG(INFO, logger(), " img_src: " << img_src());
+- MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
+- MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
+- if (bbi.set())
+- MBL_LOG(INFO, logger(), " bbi: " << bbi.print_value(logger().log(mbl_logger::INFO)));
+- if (bbf.set())
+- MBL_LOG(INFO, logger(), " bbf: " << bbf.print_value(logger().log(mbl_logger::INFO)));
+- if (bbw.set())
+- MBL_LOG(INFO, logger(), " bbw: " << bbw.print_value(logger().log(mbl_logger::INFO)));
++ if (logger().level() >= mbl_logger::INFO)
++ {
++ MBL_LOG(INFO, logger(), "crop_image_2d: ");
++ MBL_LOG(INFO, logger(), " img_src: " << img_src());
++ MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
++ MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
++ if (bbi.set())
++ {
++ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
++ log << " bbi: "; bbi.print_value(log);
++ log << vcl_endl; // terminate log message
++ }
++ if (bbf.set())
++ {
++ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
++ log << " bbf: "; bbf.print_value(log);
++ log << vcl_endl; // terminate log message
++ }
++ if (bbw.set())
++ {
++ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
++ log << " bbw: "; bbw.print_value(log);
++ log << vcl_endl; // terminate log message
++ }
++ }
+
+ // Count the number of bbox options specified - should be exactly 1.
+ unsigned nbb=0;
</ins></span></pre></div>
<a id="trunkdportsdevelvxlfilespatchcontrib_mul_tools_crop_image_3dcxxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff (0 => 137902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff (rev 0)
+++ trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff 2015-06-22 21:37:48 UTC (rev 137902)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+--- contrib/mul/tools/crop_image_3d.cxx.orig 2015-06-21 19:57:32.000000000 +0300
++++ contrib/mul/tools/crop_image_3d.cxx 2015-06-21 19:58:23.000000000 +0300
+@@ -60,18 +60,38 @@
+ vul_arg_parse(argc, argv);
+
+ // Log the program arguments
+- MBL_LOG(INFO, logger(), "crop_image_3d: ");
+- MBL_LOG(INFO, logger(), " img_src: " << img_src());
+- MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
+- MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
+- if (bbi.set())
+- MBL_LOG(INFO, logger(), " bbi: " << bbi.print_value(logger().log(mbl_logger::INFO)));
+- if (bbf.set())
+- MBL_LOG(INFO, logger(), " bbf: " << bbf.print_value(logger().log(mbl_logger::INFO)));
+- if (bbw.set())
+- MBL_LOG(INFO, logger(), " bbw: " << bbw.print_value(logger().log(mbl_logger::INFO)));
+- if (cw.set())
+- MBL_LOG(INFO, logger(), " cw: " << cw.print_value(logger().log(mbl_logger::INFO)));
++ // Log the program arguments
++ if (logger().level() >= mbl_logger::INFO)
++ {
++ MBL_LOG(INFO, logger(), "crop_image_3d: ");
++ MBL_LOG(INFO, logger(), " img_src: " << img_src());
++ MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
++ MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
++ if (bbi.set())
++ {
++ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
++ log << " bbi: "; bbi.print_value(log);
++ log << vcl_endl; // terminate log message
++ }
++ if (bbf.set())
++ {
++ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
++ log << " bbf: "; bbf.print_value(log);
++ log << vcl_endl; // terminate log message
++ }
++ if (bbw.set())
++ {
++ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
++ log << " bbw: "; bbw.print_value(log);
++ log << vcl_endl; // terminate log message
++ }
++ if (cw.set())
++ {
++ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
++ log << " cw: "; cw.print_value(log);
++ log << vcl_endl; // terminate log message
++ }
++ }
+
+ // Count the number of bbox options specified - should be exactly 1.
+ unsigned nbb=0;
</ins></span></pre></div>
<a id="trunkdportsdevelvxlfilespatchcore_vul_vul_psfileh"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/vxl/files/patch-core_vul_vul_psfile.h (0 => 137902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/vxl/files/patch-core_vul_vul_psfile.h (rev 0)
+++ trunk/dports/devel/vxl/files/patch-core_vul_vul_psfile.h 2015-06-22 21:37:48 UTC (rev 137902)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- core/vul/vul_psfile.h.orig 2015-06-21 14:19:35.000000000 +0300
++++ core/vul/vul_psfile.h 2015-06-21 19:29:35.000000000 +0300
+@@ -37,7 +37,7 @@
+
+ vul_psfile(char const* filename, bool debug_output=false);
+ ~vul_psfile();
+- operator bool() { return (void*)output_filestream!=(void*)0; }
++ operator bool() { return !!output_filestream; }
+
+ void set_paper_type(vul_psfile::paper_type type){printer_paper_type = type;}
+ void set_paper_layout(vul_psfile::paper_layout layout) {printer_paper_layout = layout;}
</ins></span></pre>
</div>
</div>
</body>
</html>