[137902] trunk/dports/devel/vxl
stromnov at macports.org
stromnov at macports.org
Mon Jun 22 14:37:49 PDT 2015
Revision: 137902
https://trac.macports.org/changeset/137902
Author: stromnov at macports.org
Date: 2015-06-22 14:37:48 -0700 (Mon, 22 Jun 2015)
Log Message:
-----------
vxl: fix build with latest Clang from XCode
Modified Paths:
--------------
trunk/dports/devel/vxl/Portfile
Added Paths:
-----------
trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff
trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff
trunk/dports/devel/vxl/files/patch-core_vul_vul_psfile.h
Modified: trunk/dports/devel/vxl/Portfile
===================================================================
--- 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)
@@ -22,9 +22,8 @@
master_sites sourceforge:project/vxl/vxl/${branch}
use_zip yes
-checksums md5 95b5ecbbe164d1b540ab52fd0ca26b47 \
- sha1 bfa7e9df3fb8807ef3b14921c31d568e94f3edf4 \
- rmd160 a00d811aa86b2d3a2dad292ff94991c034092434
+checksums rmd160 a00d811aa86b2d3a2dad292ff94991c034092434 \
+ sha256 b06b4a087486af3a270ced2597242bd6cc4e3381779f27a944ea0620208ae7e1
# licenses in vxl:
# (see also: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/debian/copyright?revision=10688&view=markup)
@@ -46,9 +45,11 @@
# disable broken contrib/prip code
patchfiles patch-use-embedded-openjpeg2.diff \
+ patch-contrib_mul_tools_crop_image_2d.cxx.diff \
+ patch-contrib_mul_tools_crop_image_3d.cxx.diff \
patch-disable-broken-ffmpeg.diff \
patch-disable-contrib-prip.diff
-
+
depends_lib-append \
port:jpeg \
port:tiff \
@@ -59,7 +60,8 @@
port:libdc1394
if {[string match *clang* ${configure.compiler}]} {
- configure.cxxflags-append -Werror=gnu -Wno-error=vla
+ configure.cxxflags-append -Werror=gnu -Wno-error=vla -std=c++0x
+ patchfiles-append patch-core_vul_vul_psfile.h
}
configure.args-append \
Added: trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff
===================================================================
--- 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)
@@ -0,0 +1,44 @@
+--- 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;
Added: trunk/dports/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff
===================================================================
--- 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)
@@ -0,0 +1,53 @@
+--- 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;
Added: trunk/dports/devel/vxl/files/patch-core_vul_vul_psfile.h
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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;}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150622/48cef71c/attachment-0001.html>
More information about the macports-changes
mailing list