<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/557612eb4c9e198a513246b736380e56e2f6b017">https://github.com/macports/macports-ports/commit/557612eb4c9e198a513246b736380e56e2f6b017</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 557612eb4c9 vxl: update to version 3.5.0
</span>557612eb4c9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 557612eb4c9e198a513246b736380e56e2f6b017
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Wed Aug 30 08:18:55 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> vxl: update to version 3.5.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/47197
</span>---
devel/vxl/Portfile | 86 ++++++++--------------
.../patch-contrib_mul_tools_crop_image_2d.cxx.diff | 44 -----------
.../patch-contrib_mul_tools_crop_image_3d.cxx.diff | 53 -------------
devel/vxl/files/patch-core_vul_vul_psfile.h.diff | 11 ---
devel/vxl/files/patch-disable-broken-ffmpeg.diff | 20 -----
devel/vxl/files/patch-disable-contrib-prip.diff | 16 ----
devel/vxl/files/patch-jpeg.diff | 24 ------
devel/vxl/files/patch-use-embedded-openjpeg2.diff | 11 ---
8 files changed, 31 insertions(+), 234 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/Portfile b/devel/vxl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ccc1597cf8..29c86c8efad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/vxl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,26 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name vxl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.17.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description C++ libraries for computer vision
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup vxl vxl 3.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description C++ libraries for computer vision
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description \
</span> VXL (the Vision-something-Libraries) is a collection of C++ libraries \
designed for computer vision research and implementation. It was \
created from TargetJr and the IUE with the aim of making a light, \
fast and consistent system. VXL is written in ANSI/ISO C++ and is \
designed to be portable over many platforms.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://vxl.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://vxl.github.io
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/vxl/vxl/${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a00d811aa86b2d3a2dad292ff94991c034092434 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b06b4a087486af3a270ced2597242bd6cc4e3381779f27a944ea0620208ae7e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 525f017bb6b3ff5c15c6b4203b29162259171fb7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1fcdc2f284a301beefcef2e59c495d322dd5765be5c7118c2d2607a25a3c4457 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44264490
</span>
# licenses in vxl:
# (see also: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/debian/copyright?revision=10688&view=markup)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,46 +35,24 @@ checksums rmd160 a00d811aa86b2d3a2dad292ff94991c034092434 \
</span> # zlib for contrib/brl/b3p/minizip/*
# GPL-2+ for vidl_vil1/vidl_vil1_mpegcodec.cxx and vidl1/vidl1_mpegcodec.cxx
# Boost for vcl_atomic_count.h and vcl/internal/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD GPL-2+ zlib MIT Boost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ensure that embedded openjpeg2 openjpeg.h takes precedence over that from external openjpeg15 or openjpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable ffmpeg support that fails to build with current ffmpeg versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable broken contrib/prip code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-use-embedded-openjpeg2.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-contrib_mul_tools_crop_image_2d.cxx.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-contrib_mul_tools_crop_image_3d.cxx.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-disable-broken-ffmpeg.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-disable-contrib-prip.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-jpeg.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD GPL-2+ zlib MIT Boost
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgeotiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdc1394
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set libdir lib/${github.project}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -Werror=gnu -Wno-error=vla -std=c++0x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-core_vul_vul_psfile.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgeotiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_SHARED_LIBS=YES \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_BRL=NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# shuffle directories around to turn ${prefix}/lib into ${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/lib ${destroot}${prefix}/tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/tmp ${destroot}${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for some reason this file doesn't get installed, making rev-upgrade complain
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/lib/libvpgl.dylib ${destroot}${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_SHARED_LIBS=YES \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_NAME_DIR=${prefix}/${libdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVXL_INSTALL_LIBRARY_DIR=${libdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVXL_USE_DCMTK:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVXL_FORCE_V3P_OPENJPEG2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVXL_BUILD_CORE_VIDEO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVXL_BUILD_CONTRIB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVXL_BUILD_VGUI:BOOL=OFF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff b/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a834abddf7c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/files/patch-contrib_mul_tools_crop_image_2d.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- contrib/mul/tools/crop_image_2d.cxx.orig 2011-06-11 22:39:06.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ contrib/mul/tools/crop_image_2d.cxx 2015-06-21 19:56:38.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,16 +54,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vul_arg_parse(argc, argv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Log the program arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), "crop_image_2d: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " img_src: " << img_src());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (bbi.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " bbi: " << bbi.print_value(logger().log(mbl_logger::INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (bbf.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " bbf: " << bbf.print_value(logger().log(mbl_logger::INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (bbw.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " bbw: " << bbw.print_value(logger().log(mbl_logger::INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (logger().level() >= mbl_logger::INFO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), "crop_image_2d: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), " img_src: " << img_src());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (bbi.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << " bbi: "; bbi.print_value(log);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << vcl_endl; // terminate log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (bbf.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << " bbf: "; bbf.print_value(log);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << vcl_endl; // terminate log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (bbw.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << " bbw: "; bbw.print_value(log);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << vcl_endl; // terminate log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Count the number of bbox options specified - should be exactly 1.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned nbb=0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff b/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c93a0a73f9c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/files/patch-contrib_mul_tools_crop_image_3d.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- contrib/mul/tools/crop_image_3d.cxx.orig 2015-06-21 19:57:32.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ contrib/mul/tools/crop_image_3d.cxx 2015-06-21 19:58:23.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,18 +60,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vul_arg_parse(argc, argv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Log the program arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), "crop_image_3d: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " img_src: " << img_src());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (bbi.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " bbi: " << bbi.print_value(logger().log(mbl_logger::INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (bbf.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " bbf: " << bbf.print_value(logger().log(mbl_logger::INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (bbw.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " bbw: " << bbw.print_value(logger().log(mbl_logger::INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (cw.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MBL_LOG(INFO, logger(), " cw: " << cw.print_value(logger().log(mbl_logger::INFO)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Log the program arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (logger().level() >= mbl_logger::INFO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), "crop_image_3d: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), " img_src: " << img_src());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), " img_dst: " << img_dst());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MBL_LOG(INFO, logger(), " use_mm: " << use_mm());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (bbi.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << " bbi: "; bbi.print_value(log);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << vcl_endl; // terminate log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (bbf.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << " bbf: "; bbf.print_value(log);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << vcl_endl; // terminate log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (bbw.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << " bbw: "; bbw.print_value(log);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << vcl_endl; // terminate log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (cw.set())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vcl_ostream& log = logger().log(mbl_logger::INFO); // construct a new log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << " cw: "; cw.print_value(log);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log << vcl_endl; // terminate log message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Count the number of bbox options specified - should be exactly 1.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned nbb=0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/files/patch-core_vul_vul_psfile.h.diff b/devel/vxl/files/patch-core_vul_vul_psfile.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f233df72faa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/files/patch-core_vul_vul_psfile.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- core/vul/vul_psfile.h.orig 2015-06-21 14:19:35.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ core/vul/vul_psfile.h 2015-06-21 19:29:35.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vul_psfile(char const* filename, bool debug_output=false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~vul_psfile();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- operator bool() { return (void*)output_filestream!=(void*)0; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ operator bool() { return !!output_filestream; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void set_paper_type(vul_psfile::paper_type type){printer_paper_type = type;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void set_paper_layout(vul_psfile::paper_layout layout) {printer_paper_layout = layout;}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/files/patch-disable-broken-ffmpeg.diff b/devel/vxl/files/patch-disable-broken-ffmpeg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d525f62f74..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/files/patch-disable-broken-ffmpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- core/vidl/CMakeLists.txt.orig 2011-12-18 02:52:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ core/vidl/CMakeLists.txt 2013-08-11 15:21:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESCRIPTION "Video Sequence Library"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDE( ${VXL_CMAKE_DIR}/NewCMake/FindFFMPEG.cmake )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# INCLUDE( ${VXL_CMAKE_DIR}/NewCMake/FindFFMPEG.cmake )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE( ${VXL_CMAKE_DIR}/NewCMake/FindDC1394.cmake )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE( ${VXL_CMAKE_DIR}/NewCMake/FindDirectShow.cmake )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_FILE (VIDEODEV_FOUND videodev.h /usr/include/linux/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIGURE_FILE( ${vxl_SOURCE_DIR}/core/vidl/vidl_config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${vxl_BINARY_DIR}/core/vidl/vidl_config.h )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(FFMPEG_FOUND "NO")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF( FFMPEG_FOUND )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE_DIRECTORIES(${FFMPEG_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF( FFMPEG_FOUND )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/files/patch-disable-contrib-prip.diff b/devel/vxl/files/patch-disable-contrib-prip.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 13b085926e9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/files/patch-disable-contrib-prip.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- contrib/prip/CMakeLists.txt.orig 2013-08-11 14:24:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ contrib/prip/CMakeLists.txt 2013-08-11 14:24:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,10 +9,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE_DIRECTORIES(${PRIP_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Combinatorial Maps and Topological Maps handling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS( vmap )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#SUBDIRS( vmap )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Digital Topology
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS( vdtop )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#SUBDIRS( vdtop )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Combinatorial Pyramids and Topological Pyramids handling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SUBDIRS( vpyr )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#SUBDIRS( vpyr )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/files/patch-jpeg.diff b/devel/vxl/files/patch-jpeg.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ebd1b12bc61..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/files/patch-jpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- core/vil/file_formats/vil_jpeg_compressor.cxx.orig 2010-09-06 22:37:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ core/vil/file_formats/vil_jpeg_compressor.cxx 2017-10-16 21:50:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,8 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jpeg_set_quality(&jobj, quality, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // start compression
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool write_all_tables = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- jpeg_start_compress (&jobj, write_all_tables);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ jpeg_start_compress (&jobj, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ready = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- core/vil1/file_formats/vil1_jpeg_compressor.cxx.orig 2003-05-21 19:31:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ core/vil1/file_formats/vil1_jpeg_compressor.cxx 2017-10-16 21:55:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,8 +54,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jpeg_set_defaults(&jobj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // start compression
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool write_all_tables = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- jpeg_start_compress (&jobj, write_all_tables);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ jpeg_start_compress (&jobj, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ready = true;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/vxl/files/patch-use-embedded-openjpeg2.diff b/devel/vxl/files/patch-use-embedded-openjpeg2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a03c98d0e9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/vxl/files/patch-use-embedded-openjpeg2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- core/vil/CMakeLists.txt.orig 2013-08-11 09:58:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ core/vil/CMakeLists.txt 2013-08-11 09:59:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ##############################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE( ${VXL_CMAKE_DIR}/FindOpenJPEG2.cmake )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(OPENJPEG2_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INCLUDE_DIRECTORIES(${OPENJPEG2_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INCLUDE_DIRECTORIES(BEFORE ${OPENJPEG2_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS( ${OPENJPEG2_DEFINITIONS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET( vil_sources ${vil_sources}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file_formats/vil_openjpeg.h file_formats/vil_openjpeg.cxx
</span></pre><pre style='margin:0'>
</pre>