.gitignore

@@ -1,4 +1,3 @@
 /vxl-1.17.0.tar.gz
 /vxl-1.17.0-clean.tar.gz
 /vxl-2.0.2-clean.tar.gz
-/vxl-3.5.0-clean.tar.gz

0001-BUG-Logic-for-conditional-compilation-was-exactly-wr.patch

@@ -0,0 +1,103 @@
+From c3fd27959f51e0469a7a6075e975f245ac306f3d Mon Sep 17 00:00:00 2001
+From: Hans Johnson <hans-johnson@uiowa.edu>
+Date: Thu, 29 Nov 2018 14:11:12 -0600
+Subject: [PATCH] BUG:  Logic for conditional compilation was exactly wrong
+
+---
+ core/vsl/Templates/vsl_vector_io+int_64-.cxx | 2 +-
+ core/vsl/vsl_binary_explicit_io.h            | 4 ++--
+ core/vsl/vsl_binary_io.cxx                   | 2 +-
+ core/vsl/vsl_binary_io.h                     | 2 +-
+ core/vsl/vsl_block_binary.cxx                | 2 +-
+ core/vsl/vsl_block_binary.h                  | 2 +-
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/core/vsl/Templates/vsl_vector_io+int_64-.cxx b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
+index fcdafc0270..02c7a13c36 100644
+--- a/core/vsl/Templates/vsl_vector_io+int_64-.cxx
++++ b/core/vsl/Templates/vsl_vector_io+int_64-.cxx
+@@ -1,6 +1,6 @@
+ #include <vxl_config.h>
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ #include <vsl/vsl_vector_io.hxx>
+ VSL_VECTOR_IO_INSTANTIATE(vxl_int_64);
+ 
+diff --git a/core/vsl/vsl_binary_explicit_io.h b/core/vsl/vsl_binary_explicit_io.h
+index 9ff669fce0..49536d172c 100644
+--- a/core/vsl/vsl_binary_explicit_io.h
++++ b/core/vsl/vsl_binary_explicit_io.h
+@@ -141,7 +141,7 @@ macro (int);
+ macro (unsigned int);
+ macro (long);
+ macro (unsigned long);
+-#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ macro (vxl_int_64);
+ macro (vxl_uint_64);
+ #endif
+@@ -486,7 +486,7 @@ inline std::size_t vsl_convert_from_arbitrary_length(const unsigned char* buffer
+ 
+ /////////////////////////////////////////////////////////////////////////
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ 
+ //: Decode a buffer of arbitrary length integers
+ // Converts from the integers from the arbitrary length format into
+diff --git a/core/vsl/vsl_binary_io.cxx b/core/vsl/vsl_binary_io.cxx
+index c36142bd41..9477642b0b 100644
+--- a/core/vsl/vsl_binary_io.cxx
++++ b/core/vsl/vsl_binary_io.cxx
+@@ -65,7 +65,7 @@ MACRO_MAKE_INTEGER_READ_WRITE(short);
+ MACRO_MAKE_INTEGER_READ_WRITE(unsigned short);
+ MACRO_MAKE_INTEGER_READ_WRITE(long);
+ MACRO_MAKE_INTEGER_READ_WRITE(unsigned long);
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG)
++#if VXL_INT_64_IS_LONGLONG
+ MACRO_MAKE_INTEGER_READ_WRITE(vxl_int_64);
+ MACRO_MAKE_INTEGER_READ_WRITE(vxl_uint_64);
+ #endif
+diff --git a/core/vsl/vsl_binary_io.h b/core/vsl/vsl_binary_io.h
+index d38478aea5..9498f844c8 100644
+--- a/core/vsl/vsl_binary_io.h
++++ b/core/vsl/vsl_binary_io.h
+@@ -376,7 +376,7 @@ void vsl_b_read(vsl_b_istream& is,unsigned long& n );
+ inline void vsl_print_summary(std::ostream& os, unsigned long n )
+ {  os << n; }
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ 
+ //: Write  to vsl_b_ostream
+ void vsl_b_write(vsl_b_ostream& os,vxl_int_64 n );
+diff --git a/core/vsl/vsl_block_binary.cxx b/core/vsl/vsl_block_binary.cxx
+index 017a651e99..c4220bebf6 100644
+--- a/core/vsl/vsl_block_binary.cxx
++++ b/core/vsl/vsl_block_binary.cxx
+@@ -285,7 +285,7 @@ template void vsl_block_binary_write_byte_impl(vsl_b_ostream &, const unsigned c
+ template void vsl_block_binary_read_byte_impl(vsl_b_istream &, signed char*, std::size_t);
+ template void vsl_block_binary_read_byte_impl(vsl_b_istream &, unsigned char*, std::size_t);
+ 
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_int_64*, std::size_t);
+ template void vsl_block_binary_write_int_impl(vsl_b_ostream &, const vxl_uint_64*, std::size_t);
+ template void vsl_block_binary_read_int_impl(vsl_b_istream &, vxl_int_64*, std::size_t);
+diff --git a/core/vsl/vsl_block_binary.h b/core/vsl/vsl_block_binary.h
+index 014bb8d055..2ceafb0186 100644
+--- a/core/vsl/vsl_block_binary.h
++++ b/core/vsl/vsl_block_binary.h
+@@ -218,7 +218,7 @@ inline void vsl_block_binary_read(vsl_b_istream &is, unsigned long* begin, std::
+ }
+ 
+ /////////////////////////////////////////////////////////////////////////
+-#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG )
++#if VXL_INT_64_IS_LONGLONG
+ 
+ //: Write a block of signed longs to a vsl_b_ostream
+ // This function is very speed efficient, but
+-- 
+2.21.0
+

0001-v2.0.2-unbundle-rply.patch

@@ -1,10 +1,11 @@
-From b7944a8898b3a1aef606cf6f4047dcf11aca11a6 Mon Sep 17 00:00:00 2001
+From 03d46e9ecaae8e18c892aecded6f918f6407344d Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 14:15:02 +0000
-Subject: [PATCH 01/18] v3.5.0: unbundle rply
+Subject: [PATCH 1/8] v2.0.2: unbundle rply
 
 ---
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |    5 +-
+ contrib/brl/bseg/boxm/algo/CMakeLists.txt     |    3 +-
  contrib/brl/bseg/boxm2/cpp/CMakeLists.txt     |    6 +-
  .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt    |    6 +-
  v3p/CMakeLists.txt                            |    1 -
@@ -20,7 +21,7 @@ Subject: [PATCH 01/18] v3.5.0: unbundle rply
  v3p/rply/readme.txt                           |   24 -
  v3p/rply/rply.c                               | 1570 -----------------
  v3p/rply/rply.h                               |  367 ----
- 16 files changed, 11 insertions(+), 3306 deletions(-)
+ 17 files changed, 13 insertions(+), 3307 deletions(-)
  delete mode 100644 v3p/rply/CMakeLists.txt
  delete mode 100644 v3p/rply/LICENSE
  delete mode 100644 v3p/rply/etc/convert.c
@@ -35,7 +36,7 @@ Subject: [PATCH 01/18] v3.5.0: unbundle rply
  delete mode 100644 v3p/rply/rply.h
 
 diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index 5cf355e3fe..662ec284e9 100644
+index 5cf355e3fe3e15f6a8aa78be27469bf31e392716..662ec284e92840ebbcc0b3fc53eeab4561a7f3b8 100644
 --- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 +++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 @@ -1,8 +1,9 @@
@@ -58,8 +59,21 @@ index 5cf355e3fe..662ec284e9 100644
  
  if( BUILD_TESTING )
    add_subdirectory(tests)
+diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+index cee22bd27162f42baca3ea8d7838a88b9ef8ef0b..4714624fa3f1b30ecc5b99278b8782402d18f64d 100644
+--- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # brl/bseg/boxm/algo/CMakeLists.txt
++FIND_PACKAGE(rply REQUIRED)
+ include_directories( ${MUL_INCLUDE_DIR} )
+-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++include_directories( ${RPLY_INCLUDE_DIR} )
+ set(boxm_algo_sources
+     boxm_compute_scene_statistics.h
+     boxm_crop_scene.h
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-index 92b959f740..fff9ae2d84 100644
+index 92b959f740c5de390f76aeda77f05c6f6dc7aa3c..fff9ae2d8404c5631564eddc30c48cae8a69ffc0 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 @@ -1,12 +1,14 @@
@@ -80,7 +94,7 @@ index 92b959f740..fff9ae2d84 100644
  # cpp process APIs.
  add_subdirectory(pro)
 diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-index 1407ed9d31..c3ed4ed27d 100644
+index 1407ed9d31e842ba5826c06f38ac5c2516c22113..c3ed4ed27d4d08902f8b56d158bb89539df76a93 100644
 --- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 @@ -1,6 +1,8 @@
@@ -103,7 +117,7 @@ index 1407ed9d31..c3ed4ed27d 100644
  if(BUILD_TESTING)
    add_subdirectory(tests)
 diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt
-index 251ef9a979..ae9baedaa4 100644
+index 251ef9a97923ff5d6e0063eb8251831c7dde6e57..ae9baedaa4425355b1ab57f68cf7e8f906345b98 100644
 --- a/v3p/CMakeLists.txt
 +++ b/v3p/CMakeLists.txt
 @@ -60,5 +60,4 @@ if(VXL_BUILD_CORE_IMAGING)
@@ -114,7 +128,7 @@ index 251ef9a979..ae9baedaa4 100644
  endif()
 diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt
 deleted file mode 100644
-index 9085a628a1..0000000000
+index 9085a628a1c7a06c7f7bc1c0080b1a1f4beceeb7..0000000000000000000000000000000000000000
 --- a/v3p/rply/CMakeLists.txt
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -129,7 +143,7 @@ index 9085a628a1..0000000000
 -vxl_add_library(LIBRARY_NAME rply LIBRARY_SOURCES ${rply_sources})
 diff --git a/v3p/rply/LICENSE b/v3p/rply/LICENSE
 deleted file mode 100644
-index 02e7c5f385..0000000000
+index 02e7c5f385b5ca8c7e9df071455f3956122e9380..0000000000000000000000000000000000000000
 --- a/v3p/rply/LICENSE
 +++ /dev/null
 @@ -1,20 +0,0 @@
@@ -155,7 +169,7 @@ index 02e7c5f385..0000000000
 -DEALINGS IN THE SOFTWARE.
 diff --git a/v3p/rply/etc/convert.c b/v3p/rply/etc/convert.c
 deleted file mode 100644
-index e90d4cd576..0000000000
+index e90d4cd576f1b980ba45f7fd153b8542e7b0bca3..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/convert.c
 +++ /dev/null
 @@ -1,136 +0,0 @@
@@ -297,7 +311,7 @@ index e90d4cd576..0000000000
 -}
 diff --git a/v3p/rply/etc/dump.c b/v3p/rply/etc/dump.c
 deleted file mode 100644
-index 7ae2341cf1..0000000000
+index 7ae2341cf14962953aeefed659f560e1c486cf40..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/dump.c
 +++ /dev/null
 @@ -1,44 +0,0 @@
@@ -347,7 +361,7 @@ index 7ae2341cf1..0000000000
 -
 diff --git a/v3p/rply/etc/input.ply b/v3p/rply/etc/input.ply
 deleted file mode 100644
-index 87ba8546d0..0000000000
+index 87ba8546d03d8349b773d4a155429853c7591412..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/input.ply
 +++ /dev/null
 @@ -1,16 +0,0 @@
@@ -369,7 +383,7 @@ index 87ba8546d0..0000000000
 -3 1 0 2
 diff --git a/v3p/rply/etc/sconvert.c b/v3p/rply/etc/sconvert.c
 deleted file mode 100644
-index 97209e9b49..0000000000
+index 97209e9b495bbea97c8043298460bce0d4c95197..0000000000000000000000000000000000000000
 --- a/v3p/rply/etc/sconvert.c
 +++ /dev/null
 @@ -1,66 +0,0 @@
@@ -441,7 +455,7 @@ index 97209e9b49..0000000000
 -}
 diff --git a/v3p/rply/manual/manual.html b/v3p/rply/manual/manual.html
 deleted file mode 100644
-index 60b415341f..0000000000
+index 60b415341fa283d2d03c7e1dbdd913892196d407..0000000000000000000000000000000000000000
 --- a/v3p/rply/manual/manual.html
 +++ /dev/null
 @@ -1,993 +0,0 @@
@@ -1440,7 +1454,7 @@ index 60b415341f..0000000000
 -</html>
 diff --git a/v3p/rply/manual/reference.css b/v3p/rply/manual/reference.css
 deleted file mode 100644
-index 821215dc82..0000000000
+index 821215dc8279d81ff09c611166479df78fd2fd15..0000000000000000000000000000000000000000
 --- a/v3p/rply/manual/reference.css
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -1630,7 +1644,7 @@ CHXH8%
 
 diff --git a/v3p/rply/readme.txt b/v3p/rply/readme.txt
 deleted file mode 100644
-index 638124bc3f..0000000000
+index 638124bc3f39c21a2fcbc453a950b026686d4a19..0000000000000000000000000000000000000000
 --- a/v3p/rply/readme.txt
 +++ /dev/null
 @@ -1,24 +0,0 @@
@@ -1660,7 +1674,7 @@ index 638124bc3f..0000000000
 -
 diff --git a/v3p/rply/rply.c b/v3p/rply/rply.c
 deleted file mode 100644
-index bc99b135d2..0000000000
+index bc99b135d21ccb835759ac6335b4e99c40e4decc..0000000000000000000000000000000000000000
 --- a/v3p/rply/rply.c
 +++ /dev/null
 @@ -1,1570 +0,0 @@
@@ -3236,7 +3250,7 @@ index bc99b135d2..0000000000
 - * ---------------------------------------------------------------------- */
 diff --git a/v3p/rply/rply.h b/v3p/rply/rply.h
 deleted file mode 100644
-index 3c604fd88e..0000000000
+index 3c604fd88ee1667d404d7f0e80431f2d83eb9686..0000000000000000000000000000000000000000
 --- a/v3p/rply/rply.h
 +++ /dev/null
 @@ -1,367 +0,0 @@
@@ -3608,5 +3622,5 @@ index 3c604fd88e..0000000000
 - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 - * ---------------------------------------------------------------------- */
 -- 
-2.46.1
+2.21.0
 

0002-v2.0.2-Use-Fedora-expat-and-expatpp.patch

@@ -1,10 +1,10 @@
-From 26d548e302e9fa1bcc2986ba91f12313ccb00829 Mon Sep 17 00:00:00 2001
+From 5b1f1b76bb9c71c46ba867ce2170cb43d7ba0e2e Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:20:08 +0000
-Subject: [PATCH 02/18] v3.5.0 Use Fedora expat and expatpp
+Subject: [PATCH 2/8] v2.0.2 Use Fedora expat and expatpp
 
 ---
- CMakeLists.txt                                |  2 +
+ CMakeLists.txt                                |  3 ++
  config/cmake/fedora-modules/FindEXPATPP.cmake | 37 +++++++++++++++++
  contrib/brl/b3p/expat/CMakeLists.txt          |  3 +-
  contrib/brl/b3p/expatpp/CMakeLists.txt        | 22 +---------
@@ -30,45 +30,55 @@ Subject: [PATCH 02/18] v3.5.0 Use Fedora expat and expatpp
  contrib/brl/bseg/betr_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/bmdl/pro/CMakeLists.txt      |  3 +-
  contrib/brl/bseg/bmdl_batch/CMakeLists.txt    |  3 +-
+ contrib/brl/bseg/boxm/CMakeLists.txt          |  3 +-
+ contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt |  3 +-
+ .../brl/bseg/boxm/algo/rt/pro/CMakeLists.txt  |  3 +-
+ .../brl/bseg/boxm/algo/sp/pro/CMakeLists.txt  |  3 +-
+ contrib/brl/bseg/boxm/pro/CMakeLists.txt      |  3 +-
  contrib/brl/bseg/boxm2/CMakeLists.txt         |  3 +-
  .../bseg/boxm2/boxm2_bounding_box_parser.h    |  2 +-
  contrib/brl/bseg/boxm2/boxm2_scene_parser.h   |  2 +-
  contrib/brl/bseg/boxm2/pro/CMakeLists.txt     |  3 +-
- .../boxm2_ingest_convex_mesh_process.cxx      |  4 +-
+ .../boxm2_ingest_convex_mesh_process.cxx      |  2 +-
  contrib/brl/bseg/boxm2/volm/CMakeLists.txt    |  3 +-
  .../brl/bseg/boxm2/volm/pro/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/boxm2_batch/CMakeLists.txt   |  3 +-
  .../brl/bseg/boxm2_multi/pro/CMakeLists.txt   |  3 +-
+ contrib/brl/bseg/boxm_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/brec_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/bstm/CMakeLists.txt          |  3 +-
  contrib/brl/bseg/bstm/bstm_scene_parser.h     |  2 +-
  contrib/brl/bseg/bstm_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/bstm_multi/CMakeLists.txt    |  3 +-
  .../bseg/bstm_multi/space_time_scene_parser.h |  2 +-
+ .../brl/bseg/bvpl/bvpl_octree/CMakeLists.txt  |  3 +-
+ .../bseg/bvpl/bvpl_octree/pro/CMakeLists.txt  |  3 +-
  contrib/brl/bseg/bvpl/functors/CMakeLists.txt |  3 +-
  contrib/brl/bseg/bvpl/kernels/CMakeLists.txt  |  3 +-
  .../brl/bseg/bvpl/kernels/pro/CMakeLists.txt  |  3 +-
  contrib/brl/bseg/bvpl/pro/CMakeLists.txt      |  3 +-
  contrib/brl/bseg/bvpl_batch/CMakeLists.txt    |  3 +-
+ .../brl/bseg/bvpl_octree_batch/CMakeLists.txt |  3 +-
  contrib/brl/bseg/bvxm/CMakeLists.txt          |  3 +-
  contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt |  3 +-
  .../brl/bseg/bvxm/bvxm_world_params_parser.h  |  2 +-
  contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt |  3 +-
  contrib/brl/bseg/bvxm/pro/CMakeLists.txt      |  3 +-
- contrib/brl/bseg/bvxm_batch/CMakeLists.txt    |  2 +
+ contrib/brl/bseg/bvxm_batch/CMakeLists.txt    |  3 +-
  contrib/brl/bseg/bvxm_bridge/CMakeLists.txt   |  3 +-
  contrib/brl/bseg/vcon/CMakeLists.txt          |  3 +-
- 54 files changed, 144 insertions(+), 109 deletions(-)
+ 63 files changed, 162 insertions(+), 118 deletions(-)
  create mode 100644 config/cmake/fedora-modules/FindEXPATPP.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e5de354156..e52a8c0abb 100644
+index 230de8182541f65b9b20585b4f85c9fe1c7e2b19..dfc509d8fcd380991655331445baca4bcae2d94d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -75,6 +75,8 @@ SET(VXL_API_VERSION "${VXL_VERSION_MAJOR}.${VXL_VERSION_MINOR}")
- SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
-     SOVERSION "${VXL_API_VERSION}")
+@@ -50,6 +50,9 @@ project(VXL #Project name must be all caps to have properly generated VXL_VERSIO
+     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
+     LANGUAGES CXX C)
  
++
 +set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
 +
  include(CMakeDependentOption)
@@ -76,7 +86,7 @@ index e5de354156..e52a8c0abb 100644
  
 diff --git a/config/cmake/fedora-modules/FindEXPATPP.cmake b/config/cmake/fedora-modules/FindEXPATPP.cmake
 new file mode 100644
-index 0000000000..88a29681aa
+index 0000000000000000000000000000000000000000..88a29681aa67eb298662072c3817554bcf52dcf4
 --- /dev/null
 +++ b/config/cmake/fedora-modules/FindEXPATPP.cmake
 @@ -0,0 +1,37 @@
@@ -118,7 +128,7 @@ index 0000000000..88a29681aa
 +    EXPATPP_LIBRARY
 +)
 diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
-index dad475e211..d64a8f3832 100644
+index 5b9d660530acd9310dfb554171d70cdc7417028f..1304b5f634c977f3c7e28182c18db3f5231d0d50 100644
 --- a/contrib/brl/b3p/expat/CMakeLists.txt
 +++ b/contrib/brl/b3p/expat/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -132,7 +142,7 @@ index dad475e211..d64a8f3832 100644
  
    if(WIN32)
 diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
-index 4959c123c3..f25323d0de 100644
+index 4959c123c336ee7935b31dbeffc97f734c07d73a..f25323d0dec43ee770a8506ce7197b77e20135c1 100644
 --- a/contrib/brl/b3p/expatpp/CMakeLists.txt
 +++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
 @@ -1,22 +1,4 @@
@@ -161,7 +171,7 @@ index 4959c123c3..f25323d0de 100644
 +FIND_PACKAGE(EXPAT REQUIRED)
 +FIND_PACKAGE(EXPATPP REQUIRED)
 diff --git a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
-index 11e9d815c3..5797910273 100644
+index 11e9d815c387e06aadfb64bf3903f6fdef4455a6..57979102732f2178d17132c98a76de6b1769a9ac 100644
 --- a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -175,7 +185,7 @@ index 11e9d815c3..5797910273 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
-index 6328cfd419..bb6a65f96d 100644
+index 6328cfd419a620a782f562f8987f663365d96143..bb6a65f96d9e2184fbd477d28ab24e6d111d4713 100644
 --- a/contrib/brl/bbas/bkml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bkml/CMakeLists.txt
 @@ -5,7 +5,7 @@ set(bkml_sources
@@ -188,7 +198,7 @@ index 6328cfd419..bb6a65f96d 100644
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bocl/pro/CMakeLists.txt b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
-index 96e947876d..ba6ba1deb8 100644
+index 96e947876d3b004a2fdc4f2a93f2a63f9d29fe92..ba6ba1deb888221c728ae09aecf499c5bee21564 100644
 --- a/contrib/brl/bbas/bocl/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
 @@ -1,5 +1,6 @@
@@ -200,7 +210,7 @@ index 96e947876d..ba6ba1deb8 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
-index c4da5b9d28..260bcf1d88 100644
+index c4da5b9d289cdbd64ca12e20a8941856f5d91342..260bcf1d88c948689647dd3acf0c9fd6a1ef0547 100644
 --- a/contrib/brl/bbas/bvgl/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvgl/CMakeLists.txt
 @@ -37,7 +37,8 @@ aux_source_directory(Templates bvgl_sources)
@@ -214,7 +224,7 @@ index c4da5b9d28..260bcf1d88 100644
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-index afa5d22968..40327fb9ea 100644
+index afa5d22968ddac11e7730e1a9f1d9ad17531848c..40327fb9ea912dacd877b0b2f8b02bdc2dbf7364 100644
 --- a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
 +++ b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
 @@ -14,7 +14,7 @@
@@ -227,7 +237,7 @@ index afa5d22968..40327fb9ea 100644
  #  include <vcl_msvc_warnings.h>
  #endif
 diff --git a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-index 76995137ed..1cb0736454 100644
+index 76995137ed8d81fb80c10bf6d9f810b9f4003210..1cb0736454e6ac45a95f519b4bd65c4fbab268d4 100644
 --- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
 @@ -16,7 +16,8 @@ set(bvgl_test_sources
@@ -241,7 +251,7 @@ index 76995137ed..1cb0736454 100644
  if(EXPAT_FOUND)
    set(bvgl_test_sources ${bvgl_test_sources} test_bvgl_labelme_parser.cxx)
 diff --git a/contrib/brl/bbas/bwm/CMakeLists.txt b/contrib/brl/bbas/bwm/CMakeLists.txt
-index 4a16a57d9e..72ea30dc37 100644
+index dace2292e7e09803845f90519be8fcb50fc2131a..a05c9d03660c04914676c92274b76c2f60c888a6 100644
 --- a/contrib/brl/bbas/bwm/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/CMakeLists.txt
 @@ -26,7 +26,8 @@ endif()
@@ -255,10 +265,10 @@ index 4a16a57d9e..72ea30dc37 100644
  # Set CMake options for using vgui
  include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
 diff --git a/contrib/brl/bbas/bwm/io/CMakeLists.txt b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-index 918c196161..f0ea9a69c9 100644
+index dc2102047f46fffb68d2f1e92c5718dd656c09a8..ba8c13a7067af11b3dc2958d46191f1598b2c098 100644
 --- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-@@ -8,7 +8,8 @@ set(bwm_io_sources
+@@ -7,7 +7,8 @@ set(bwm_io_sources
  )
  aux_source_directory(Templates bwm_io_sources)
  
@@ -269,7 +279,7 @@ index 918c196161..f0ea9a69c9 100644
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/pro/CMakeLists.txt b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
-index 920f31413c..21949a782c 100644
+index 920f31413c3c37e65df419dc0e35f7299c48c11c..21949a782cf5a94c7160f3f6ff11a73336b4b981 100644
 --- a/contrib/brl/bbas/bwm/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
 @@ -9,7 +9,8 @@ set(bwm_pro_sources
@@ -283,7 +293,7 @@ index 920f31413c..21949a782c 100644
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/video/CMakeLists.txt b/contrib/brl/bbas/bwm/video/CMakeLists.txt
-index 5408fe77a7..0787b9a74e 100644
+index 5408fe77a72b842784b3c05aaf30379f08fcddc1..0787b9a74e2a2c4f33e9741b8cd68133f6842776 100644
 --- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
 @@ -11,7 +11,8 @@ set(bwm_video_sources
@@ -297,7 +307,7 @@ index 5408fe77a7..0787b9a74e 100644
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-index ca3c490d5e..d232649ccb 100644
+index ca3c490d5e9674c465bd5a57f709882bad9c71ac..d232649ccb59bb8385ddfabe99586b65f9740db1 100644
 --- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -311,7 +321,7 @@ index ca3c490d5e..d232649ccb 100644
  if(EXPAT_FOUND)
    if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bxml/CMakeLists.txt b/contrib/brl/bbas/bxml/CMakeLists.txt
-index c027dfaa28..72fed69f82 100644
+index c027dfaa286137f879e6b70043e0b291663039d4..72fed69f82a9e65a1850447fea9cd1d8e70a0168 100644
 --- a/contrib/brl/bbas/bxml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bxml/CMakeLists.txt
 @@ -12,7 +12,8 @@ set( bxml_sources
@@ -343,7 +353,7 @@ index c027dfaa28..72fed69f82 100644
  
  if( BUILD_TESTING )
 diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
-index 72b3b217ea..fe8cf45b75 100644
+index cf11103557090d878dd388f14f3b90e870695e2e..ebb93384f94c3fd40e8b30db85ca1d9a274d5996 100644
 --- a/contrib/brl/bbas/volm/CMakeLists.txt
 +++ b/contrib/brl/bbas/volm/CMakeLists.txt
 @@ -6,7 +6,8 @@
@@ -355,9 +365,9 @@ index 72b3b217ea..fe8cf45b75 100644
 +FIND_PACKAGE(EXPATPP REQUIRED)
  if(EXPAT_FOUND)
    if(EXPATPP_FOUND)
- 
+     include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bbas/volm/volm_osm_parser.h b/contrib/brl/bbas/volm/volm_osm_parser.h
-index 82283250dd..289d5d5265 100644
+index 82283250ddb5aef0de9e06f6346c2de276440851..289d5d5265f551f75e03a530cb79d30655e57201 100644
 --- a/contrib/brl/bbas/volm/volm_osm_parser.h
 +++ b/contrib/brl/bbas/volm/volm_osm_parser.h
 @@ -20,7 +20,7 @@
@@ -370,7 +380,7 @@ index 82283250dd..289d5d5265 100644
  #  include <vcl_msvc_warnings.h>
  #endif
 diff --git a/contrib/brl/bmods/FindEXPAT.cmake b/contrib/brl/bmods/FindEXPAT.cmake
-index 2be7c9a963..cefa9c0a0e 100644
+index 2be7c9a96338d5d4d6187764c6b4dad06caa52aa..cefa9c0a0e5a8a2841133fc9aa27a8995b599397 100644
 --- a/contrib/brl/bmods/FindEXPAT.cmake
 +++ b/contrib/brl/bmods/FindEXPAT.cmake
 @@ -27,6 +27,10 @@ if(NOT EXPAT_FOUND)
@@ -426,7 +436,7 @@ index 2be7c9a963..cefa9c0a0e 100644
 -mark_as_advanced(EXPATPP_SYSTEM_INCLUDE_DIR EXPATPP_SYSTEM_LIBRARY)
 -mark_as_advanced(EXPATPP_INCLUDE_DIR EXPATPP_LIBRARY)
 diff --git a/contrib/brl/bpro/CMakeLists.txt b/contrib/brl/bpro/CMakeLists.txt
-index 637c1ecfa8..bb3562f59d 100644
+index 637c1ecfa8479088678c34f48ce022c7acd533a2..bb3562f59d7dbb62a6d29e40899528007ac76044 100644
 --- a/contrib/brl/bpro/CMakeLists.txt
 +++ b/contrib/brl/bpro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -440,7 +450,7 @@ index 637c1ecfa8..bb3562f59d 100644
  
  # Basic process classes
 diff --git a/contrib/brl/bpro/bprb/tests/CMakeLists.txt b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
-index cfb865611a..954315f1bd 100644
+index cfb865611a04d59d087f42bd0fda75860a187d6a..954315f1bdde7c70677a36f0403d59d47590e67f 100644
 --- a/contrib/brl/bpro/bprb/tests/CMakeLists.txt
 +++ b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
 @@ -1,6 +1,10 @@
@@ -464,7 +474,7 @@ index cfb865611a..954315f1bd 100644
    add_test( NAME bprb_test_process COMMAND $<TARGET_FILE:bprb_test_all> test_process )
    add_test( NAME bprb_test_process_params COMMAND $<TARGET_FILE:bprb_test_all> test_process_params )
 diff --git a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
-index 013afc8146..365ef65b67 100644
+index 013afc8146bbad91ed7599cd054dce44d9596d2b..365ef65b6706cb0c07acc35cfc74fb7df1e4065b 100644
 --- a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -477,35 +487,35 @@ index 013afc8146..365ef65b67 100644
  
  include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
-index fb0836b415..0dfcfc9795 100644
+index cbd9222c7f2efd076eaab8f1ab8bad7a192bd8cc..b9ed6f84597c389fad462ebcbba7883f0f8db24e 100644
 --- a/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bbgm_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/bbgm_batch/CMakeLists.txt
- 
- if( PYTHONLIBS_FOUND )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
 diff --git a/contrib/brl/bseg/betr_batch/CMakeLists.txt b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-index 20df829930..5321bd017e 100644
+index 3c5d70e0c6569aa51761f99782b51b7920e17681..588c0df0c092e5b5b465d656c59cc3a2838bcf20 100644
 --- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-@@ -2,7 +2,8 @@
- project( betr_batch )
+@@ -4,7 +4,8 @@ project( betr_batch )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
  
- if( PYTHONLIBS_FOUND )
+ if( PYTHON_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-index 76fe0891b7..7c73fe1bb0 100644
+index 76fe0891b77404b40bd3de7617c279376a59a248..7c73fe1bb06a7baca4b0dd42dfd41494f89a485b 100644
 --- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
 @@ -9,7 +9,8 @@ if(ZLIB_FOUND)
@@ -519,21 +529,89 @@ index 76fe0891b7..7c73fe1bb0 100644
    include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
    if(TIFF_FOUND)
 diff --git a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
-index fb7fcb176d..52aa721a3f 100644
+index f341e59f07f614bf38bee3f41305bbbd46f63653..6e8186a875d8fb3e28a3dd50dea3c527940438a5 100644
 --- a/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bmdl_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/bmdl_batch/CMakeLists.txt
- 
- if( PYTHONLIBS_FOUND )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
     if(EXPATPP_FOUND)
      include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
+diff --git a/contrib/brl/bseg/boxm/CMakeLists.txt b/contrib/brl/bseg/boxm/CMakeLists.txt
+index 6c9da00de1b62dbeb170d12ed51e29e651ce4eb8..6a0e5159f4f3ccf9caf6837a87492804cca12da1 100644
+--- a/contrib/brl/bseg/boxm/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ # contrib/brl/bseg/boxm/CMakeLists.txt
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ 
+ include_directories( ${EXPAT_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+index 7afa616e35e2cdbb97bb27645f48ec6ed322f091..c821d10a77d9aac7398fe65c2439aece73ca9f5b 100644
+--- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+index 7bb150ce571cbb4b7fa520e15e2b81830dd4b496..112a19f789d109e34272f4134d94657cf29836f0 100644
+--- a/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/rt/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and boxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+index f9cf2251e609b78468224384a10206f9d69f6c40..41fe3f9dbdf4a379c5a9b53793a16bbeda07f264 100644
+--- a/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/sp/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and bvxm_prodepends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+diff --git a/contrib/brl/bseg/boxm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
+index ff6552a58c32238428c1776f77e1189be4f725c8..4c0cd29038a6f396d9a44cb8e3dceed5a1e79c41 100644
+--- a/contrib/brl/bseg/boxm/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/pro/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # boxm's Process Library
+ 
+ # bprb depends on expat and bvxm_prodepends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
-index 4475e418be..476d43b151 100644
+index 4475e418be3d2475f24e6df71a18319efb242e38..476d43b151b8ea5b44de8573ccc09969664b62ad 100644
 --- a/contrib/brl/bseg/boxm2/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
 @@ -21,7 +21,8 @@ set(boxm2_sources
@@ -547,7 +625,7 @@ index 4475e418be..476d43b151 100644
  
    include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
-index d87dc359fe..94f764c61d 100644
+index d87dc359fe443d3ea435abbf720643bf85c11347..94f764c61dca61ec5f96c58735ff9d170a1ac4db 100644
 --- a/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
 +++ b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
 @@ -4,7 +4,7 @@
@@ -560,7 +638,7 @@ index d87dc359fe..94f764c61d 100644
  #include <boxm2/basic/boxm2_block_id.h>
  #include <boxm2/boxm2_block_metadata.h>
 diff --git a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
-index 963a8a803d..b697652f36 100644
+index 963a8a803db514ef1271ae9ff2fce8ef93b8c8e9..b697652f3614d1bf9a757430e443434b16020c95 100644
 --- a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
 +++ b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
 @@ -4,7 +4,7 @@
@@ -573,7 +651,7 @@ index 963a8a803d..b697652f36 100644
  #include <boxm2/basic/boxm2_block_id.h>
  #include <boxm2/boxm2_block_metadata.h>
 diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-index ca91150930..7c2ec1d9c3 100644
+index ca91150930212f8265b9ad154f5356beeec7b600..7c2ec1d9c3c3610bfcf575647d37ce5e13bd646a 100644
 --- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -587,22 +665,20 @@ index ca91150930..7c2ec1d9c3 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
-index 082696b982..605e90bb61 100644
+index 4a640a7120aa6875db5fb297104bc49a6913d086..43fd0d7817e8e193aed8877d0e0d24627d4b20ea 100644
 --- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
 +++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_ingest_convex_mesh_process.cxx
-@@ -31,8 +31,8 @@
- #include <bmsh3d/bmsh3d_mesh.h>
+@@ -32,7 +32,7 @@
  #include <bmsh3d/algo/bmsh3d_fileio.h>
  #include <bmsh3d/bmsh3d_mesh_mc.h>
--#include "vgl/vgl_intersection.h"
+ #include <vgl/vgl_intersection.h>
 -#include <expatpplib.h>
-+#include <vgl/vgl_intersection.h>
 +#include <expatpp.h>
  #include <boxm2/boxm2_bounding_box_parser.h>
  
  namespace boxm2_ingest_convex_mesh_process_globals
 diff --git a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-index 923e37f35f..064003f994 100644
+index 861b960f4d44c92fc900280581cda2b87fce5f0d..24bf5c6f37c5b183ec449df124db4a28d75a8065 100644
 --- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
 @@ -1,6 +1,7 @@
@@ -613,9 +689,9 @@ index 923e37f35f..064003f994 100644
 +FIND_PACKAGE(EXPATPP REQUIRED)
  if(EXPAT_FOUND)
    if(EXPATPP_FOUND)
- 
+     #depends on OPENCL being found...
 diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-index 6ad0bdde83..265cd5d066 100644
+index 6ade9339d001532e1db0e88ccb322d087c6fddf8..bea0c2c32de9a86b55542c642a58e7e34ba07d02 100644
 --- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -629,21 +705,21 @@ index 6ad0bdde83..265cd5d066 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-index 9e1c59a967..c7eb640d55 100644
+index 70e603743b280db75ea9bb006cbf63d867cdd16f..b2282b0c64684ad59b040c602453ce98d89748e1 100644
 --- a/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2_batch/CMakeLists.txt
-@@ -7,7 +7,8 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
+@@ -9,7 +9,8 @@ include( ${BRL_CMAKE_DIR}/FindHadoop.cmake )
  include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
  
- if( PYTHONLIBS_FOUND )
+ if( PYTHON_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
-index c0330db1e2..68ab30dffc 100644
+index c0330db1e2f55a4cf426171ebd6fa101514f2d8b..68ab30dffc882570f04f7c4c34a5066d3b50b04b 100644
 --- a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -656,22 +732,36 @@ index c0330db1e2..68ab30dffc 100644
  if(EXPAT_FOUND)
    include_directories( ${BRL_INCLUDE_DIR}/bseg )
    set(boxm2_multi_pro_sources
+diff --git a/contrib/brl/bseg/boxm_batch/CMakeLists.txt b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+index 1d57861444e72e66e3ee04c96e496ee4b89b206f..643a44165489692f2ebb91c6c0de4a95f3e28e1c 100644
+--- a/contrib/brl/bseg/boxm_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm_batch/CMakeLists.txt
+@@ -4,7 +4,8 @@ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindOpenCL.cmake )
+ 
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
-index a3ab77b316..e228152f4b 100644
+index b7e3039d7ee534d30de991a7e4aae3f940b7b360..a47356c7845562b5b01ac715b79404e1d4dd50c0 100644
 --- a/contrib/brl/bseg/brec_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/brec_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/brec_batch/CMakeLists.txt
- 
- if( PYTHONLIBS_FOUND )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
-index 977d68fdab..77205c2e6b 100644
+index 977d68fdab136cf193f7e712e63bbd607113066a..77205c2e6bb540191efbc2e57e8b53ac719a720a 100644
 --- a/contrib/brl/bseg/bstm/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm/CMakeLists.txt
 @@ -15,7 +15,8 @@ set(bstm_sources bstm_block_metadata.h bstm_block_metadata.cxx
@@ -685,7 +775,7 @@ index 977d68fdab..77205c2e6b 100644
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bstm/bstm_scene_parser.h b/contrib/brl/bseg/bstm/bstm_scene_parser.h
-index 325aee9239..f1b519d12f 100644
+index 325aee9239e41f6fe9df5fb1a1252385de5e9e2b..f1b519d12f03da5cf1d2283f57bd96a3e9519456 100644
 --- a/contrib/brl/bseg/bstm/bstm_scene_parser.h
 +++ b/contrib/brl/bseg/bstm/bstm_scene_parser.h
 @@ -4,7 +4,7 @@
@@ -698,21 +788,21 @@ index 325aee9239..f1b519d12f 100644
  #include <bstm/basic/bstm_block_id.h>
  #include <bstm/bstm_block_metadata.h>
 diff --git a/contrib/brl/bseg/bstm_batch/CMakeLists.txt b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-index e548807de5..b2b047f3b6 100644
+index c94ddbcc4c159b771d85bb6a81a0e38d77750023..18b5e9c5f8388baa8a6295f41db3353c3718be62 100644
 --- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-@@ -10,7 +10,8 @@ if(DIRECTSHOW_FOUND)
+@@ -12,7 +12,8 @@ if(DIRECTSHOW_FOUND)
  endif()
  
- if( PYTHONLIBS_FOUND )
+ if( PYTHON_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
-index ba8815fe6b..1f57d0d958 100644
+index ba8815fe6bef5982f655a3c6f13afefb64743344..1f57d0d9580309206776f921da24dbefeb5b103a 100644
 --- a/contrib/brl/bseg/bstm_multi/CMakeLists.txt
 +++ b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
 @@ -15,7 +15,8 @@ set(bstm_multi_sources
@@ -726,7 +816,7 @@ index ba8815fe6b..1f57d0d958 100644
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
-index 062a2eda8f..c5108c1018 100644
+index 062a2eda8ffa7e9f514d8b801b89b0251bac52d0..c5108c101805a270b30ff359cda5bf1fe705b4f6 100644
 --- a/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
 +++ b/contrib/brl/bseg/bstm_multi/space_time_scene_parser.h
 @@ -20,7 +20,7 @@
@@ -738,8 +828,36 @@ index 062a2eda8f..c5108c1018 100644
  
  #ifdef _MSC_VER
  #  include <vcl_msvc_warnings.h>
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+index a1fd1eb943596f020f3b58d4feaa5af50c8a8180..1f390f966cb5b7451f3598d8c5c474714b2ea76b 100644
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # This is contrib/brl/bseg/bvpl/bvpl_octree/CMakeLists.txt
+ # Brown Voxel Processing library for octrees
+ 
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ 
+ #option( VXL_FORCE_V3P_RPLY "Use v3p ply library" YES)
+ #mark_as_advanced( VXL_FORCE_V3P_RPLY )
+diff --git a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+index 96064e507e6e51ffb27075737e54a8e96e3e8f95..bbc90f7cea4993002dfc553aae6130e152c8a849 100644
+--- a/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl/bvpl_octree/pro/CMakeLists.txt
+@@ -2,7 +2,8 @@
+ # bvxm's Process Library
+ 
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+ if(EXPAT_FOUND)
+ include_directories( ${BRL_INCLUDE_DIR}/bpro )
+ include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-index 25433e56f2..f3659d5390 100644
+index 25433e56f26dd49fb413480b1aa67a312f9999fb..f3659d539033b7a327e5cb935f54f4771f0a499d 100644
 --- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -753,7 +871,7 @@ index 25433e56f2..f3659d5390 100644
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-index 0672b5d3d8..615f02e3fa 100644
+index 0672b5d3d84b7165e5a3a1355dd0bdf7bb237bfc..615f02e3fa17b3b958a23e0ca9e0d78573265f59 100644
 --- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -767,7 +885,7 @@ index 0672b5d3d8..615f02e3fa 100644
  
  include_directories( ${EXPAT_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-index 82ce0655e0..3e7108103d 100644
+index 67cdcf8e00f3541224d581d12ac52d51b07ef7a5..4279f1e47d7046d3dd05c27995a80c0214df7b6b 100644
 --- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -781,7 +899,7 @@ index 82ce0655e0..3e7108103d 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
-index 3f4b2b26bc..03b7df907e 100644
+index 3f4b2b26bc7893084f77f8e739d5bb7be0224e06..03b7df907e515055f44a100fe8393c4eda71f3bc 100644
 --- a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -795,21 +913,35 @@ index 3f4b2b26bc..03b7df907e 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-index 754741a408..9c629d4e5e 100644
+index 90102867454d6308ab766a13d101567562920633..5583214c7bdd0b217693a894a2e84341289899c1 100644
 --- a/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
 @@ -1,7 +1,8 @@
  # contrib/brl/bseg/bvpl_batch/CMakeLists.txt
- 
- if( PYTHONLIBS_FOUND )
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
 -  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
+   if( EXPAT_FOUND )
+     include_directories( ${PYTHON_INCLUDE_DIRS} )
+     include_directories( ${BRL_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+index 052a160d9c4d7c9738b078b4d6729fd9ad908b24..3bf956ba6c1c10579869863d828399680ead74b3 100644
+--- a/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
++++ b/contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ # contrib/brl/bseg/bvpl_octree_batch/CMakeLists.txt
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
++  FIND_PACKAGE(EXPAT REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm/CMakeLists.txt b/contrib/brl/bseg/bvxm/CMakeLists.txt
-index d637fead62..caa2ff3f35 100644
+index fbda67337c4f685b8e4a33f40f9a0a3d4ffdb644..6c7b6091a820f956b0d55c1edac7857b09f5b4ac 100644
 --- a/contrib/brl/bseg/bvxm/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
 @@ -38,7 +38,8 @@ set(bvxm_sources
@@ -823,7 +955,7 @@ index d637fead62..caa2ff3f35 100644
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-index e07b20ebb7..3a0824d257 100644
+index 8a1789161dac46c4e0506c32b261527e9542458d..4917b6eb59db38f9e3b48c0a83c4d7cc7843807e 100644
 --- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
 @@ -1,7 +1,8 @@
@@ -837,7 +969,7 @@ index e07b20ebb7..3a0824d257 100644
   if(EXPATPP_FOUND)
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
-index e58cf620f5..d707da04db 100644
+index e58cf620f556016a078aa677907da215c078b8e4..d707da04db8df2e4f27585d9c56e91e256ad9569 100644
 --- a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
 +++ b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
 @@ -6,7 +6,7 @@
@@ -850,7 +982,7 @@ index e58cf620f5..d707da04db 100644
  #  include <vcl_msvc_warnings.h>
  #endif
 diff --git a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
-index c2901f9c90..a41c67e514 100644
+index c2901f9c9087900fb1007b12ed63734c33f401e9..a41c67e51444fea891f31c18367b9dc60ff1c643 100644
 --- a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -864,7 +996,7 @@ index c2901f9c90..a41c67e514 100644
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
    include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
 diff --git a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
-index 6c98f11cc3..e5b88b5aff 100644
+index 5d107edbd15026bc64905da88ec723161a33cbf5..5c6cbc56e49033c280608810e737c214db39d66b 100644
 --- a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
 @@ -2,7 +2,8 @@
@@ -878,23 +1010,24 @@ index 6c98f11cc3..e5b88b5aff 100644
    include_directories( ${EXPAT_INCLUDE_DIR} )
    include_directories( ${BRL_INCLUDE_DIR}/bpro )
 diff --git a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-index fee846b6d0..2044353da0 100644
+index 58ece0b8d3852237d36db89e868463369dc4502c..ed25993cc7b20d1ae3d6c18bff8b8b05be1f408c 100644
 --- a/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_batch/CMakeLists.txt
-@@ -3,6 +3,8 @@ if(HAS_GEOTIFF)
- 
- if( PYTHONLIBS_FOUND )
-   include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
+@@ -2,7 +2,8 @@
+ if(HAS_GEOTIFF)
+ include( ${VXL_CMAKE_DIR}/NewCMake/FindPython.cmake )
+ if( PYTHON_FOUND )
+-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
 +  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
++FIND_PACKAGE(EXPATPP REQUIRED)
    if( EXPAT_FOUND )
      include_directories( ${PYTHON_INCLUDE_DIRS} )
      include_directories( ${BRL_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-index 76defad7a7..1cfd293103 100644
+index b7b0636f29e443a9e02a6354faf204f01c2617e9..efc4aa9b30b7fcfcb69bb4aadb46a988849936c5 100644
 --- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
 +++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-@@ -5,7 +5,8 @@ if(OpenCL_FOUND)
+@@ -8,7 +8,8 @@ if(OPENCL_FOUND)
    include_directories( ${MUL_INCLUDE_DIR} )
  
    #find expatpp library
@@ -905,7 +1038,7 @@ index 76defad7a7..1cfd293103 100644
      include_directories( ${EXPAT_INCLUDE_DIR} )
      include_directories( ${BRL_INCLUDE_DIR}/b3p/expatpp )
 diff --git a/contrib/brl/bseg/vcon/CMakeLists.txt b/contrib/brl/bseg/vcon/CMakeLists.txt
-index 26504576be..ed189bccd7 100644
+index 26504576be394f4351e7ef1521ab3fff38616003..ed189bccd7ff9a2ca0317b4aa6bd99c18cd5507e 100644
 --- a/contrib/brl/bseg/vcon/CMakeLists.txt
 +++ b/contrib/brl/bseg/vcon/CMakeLists.txt
 @@ -4,7 +4,8 @@
@@ -919,5 +1052,5 @@ index 26504576be..ed189bccd7 100644
    if(EXPATPP_FOUND)
      include_directories( ${BRL_INCLUDE_DIR} )
 -- 
-2.46.1
+2.21.0
 

0003-v2.0.2-Use-Fedora-minizip.patch

@@ -1,15 +1,15 @@
-From c0cc5459f8ee3dfc40cefb26487a1449d5100d8e Mon Sep 17 00:00:00 2001
+From 28d2c2ca3c1ac934b026e733d613cb0c5556a5c3 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 15 Nov 2018 15:31:18 +0000
-Subject: [PATCH 03/18] v3.5.0 Use Fedora minizip
+Subject: [PATCH 3/8] v2.0.2 Use Fedora minizip
 
 ---
  contrib/brl/b3p/CMakeLists.txt                                | 4 ----
- .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 1 +
- 2 files changed, 1 insertion(+), 4 deletions(-)
+ .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 3 ++-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7fefd89f41..b2f4b5f6bd 100644
+index 7fefd89f41c484b877492ac77f3ab7fab3418bc6..b2f4b5f6bdb4ed0cbbde6459cb201578a1823a5d 100644
 --- a/contrib/brl/b3p/CMakeLists.txt
 +++ b/contrib/brl/b3p/CMakeLists.txt
 @@ -19,7 +19,3 @@ add_subdirectory(expatpp)
@@ -21,17 +21,19 @@ index 7fefd89f41..b2f4b5f6bd 100644
 -
 -
 diff --git a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-index daf78da93f..1a2241adbf 100644
+index 7a907be4a4d50c58e8cc77495b03f031419b798d..6580049493239b513796127f225ece807e8f9a90 100644
 --- a/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
 +++ b/contrib/brl/bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx
-@@ -38,6 +38,7 @@
+@@ -37,7 +37,8 @@
+ #include <vul/vul_file.h>
  
  #if HAS_ZLIB
- #include <minizip/zip.h>
+-#include <minizip/zip.h>
++#include <zip.h>
 +#include <zlib.h>
  #endif
  
  #define WRITEBUFFERSIZE (16384)
 -- 
-2.46.1
+2.21.0
 

0004-v2.0.2-Version-shared-objects.patch

@@ -0,0 +1,38 @@
+From e1e1aab38d7328eb616facea21a3cfeb6b2c26c3 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 18 Apr 2019 22:11:41 +0100
+Subject: [PATCH 4/8] v2.0.2 Version shared objects
+
+---
+ CMakeLists.txt | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dfc509d8fcd380991655331445baca4bcae2d94d..0748a6c7371b1fb8ff390f7c465d47f383c0868f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,13 +46,19 @@ foreach(p
+ endforeach()
+ 
+ project(VXL #Project name must be all caps to have properly generated VXL_VERSION_* variables
+-    VERSION 2.0.2.0
+     DESCRIPTION "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding."
+     LANGUAGES CXX C)
+ 
+-
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
+ 
++SET(VXL_MAJOR_VERSION 2)
++SET(VXL_MINOR_VERSION 0)
++SET(VXL_BUILD_VERSION 2)
++SET(VXL_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}.${VXL_BUILD_VERSION}")
++SET(VXL_API_VERSION "${VXL_MAJOR_VERSION}.${VXL_MINOR_VERSION}")
++SET(VXL_LIBRARY_PROPERTIES ${VXL_LIBRARY_PROPERTIES} VERSION "${VXL_VERSION}"
++    SOVERSION "${VXL_API_VERSION}")
++
+ include(CMakeDependentOption)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
+ 
+-- 
+2.21.0
+

0005-v2.0.2-Add-cmake-module-to-find-RPLY.patch

@@ -1,22 +1,23 @@
-From 04c541d97aeb5ccc75615dd537e8a64c1e1f3814 Mon Sep 17 00:00:00 2001
+From aacd92f275ad6f78c8d13441e33baf36161318e6 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 14:11:31 +0100
-Subject: [PATCH 04/18] v3.5.0 Add cmake module to find RPLY
+Subject: [PATCH 5/8] v2.0.2 Add cmake module to find RPLY
 
 ---
  CMakeLists.txt                                |  3 +-
  config/cmake/fedora-modules/FindRPLY.cmake    | 39 +++++++++++++++++++
  contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt   |  2 +-
+ contrib/brl/bseg/boxm/algo/CMakeLists.txt     |  2 +-
  contrib/brl/bseg/boxm2/cpp/CMakeLists.txt     |  2 +-
  .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt    |  2 +-
- 5 files changed, 44 insertions(+), 4 deletions(-)
+ 6 files changed, 45 insertions(+), 5 deletions(-)
  create mode 100644 config/cmake/fedora-modules/FindRPLY.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e52a8c0abb..e1aa0390d4 100644
+index 0748a6c7371b1fb8ff390f7c465d47f383c0868f..dfd9187aa0dab595d943629ecb1fe49c6f25094b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -142,7 +142,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/doxygen/doxygen.cmake)
+@@ -120,7 +120,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/doxygen/doxygen.cmake)
  
  # Location of VXL's FindXXX.cmake CMake modules.
  # This is identical to VXL_CMAKE_DIR.  Perhaps we should eliminate MODULE_PATH?
@@ -28,7 +29,7 @@ index e52a8c0abb..e1aa0390d4 100644
  #
 diff --git a/config/cmake/fedora-modules/FindRPLY.cmake b/config/cmake/fedora-modules/FindRPLY.cmake
 new file mode 100644
-index 0000000000..abe415bd9e
+index 0000000000000000000000000000000000000000..abe415bd9e1e392e242753df7053f8ae8a4b43ac
 --- /dev/null
 +++ b/config/cmake/fedora-modules/FindRPLY.cmake
 @@ -0,0 +1,39 @@
@@ -72,7 +73,7 @@ index 0000000000..abe415bd9e
 +    RPLY_LIBRARY
 +)
 diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index 662ec284e9..1c2e6a7089 100644
+index 662ec284e92840ebbcc0b3fc53eeab4561a7f3b8..1c2e6a70890f7556e387a6446cbb2af764c8907a 100644
 --- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 +++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
 @@ -1,6 +1,6 @@
@@ -83,8 +84,19 @@ index 662ec284e9..1c2e6a7089 100644
  
  include_directories( ${BRL_INCLUDE_DIR} )
  include_directories( ${RPLY_INCLUDE_DIR} )
+diff --git a/contrib/brl/bseg/boxm/algo/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+index 4714624fa3f1b30ecc5b99278b8782402d18f64d..16694fbbc4c2608c650a8f14d8d75e4da8de817e 100644
+--- a/contrib/brl/bseg/boxm/algo/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # brl/bseg/boxm/algo/CMakeLists.txt
+-FIND_PACKAGE(rply REQUIRED)
++FIND_PACKAGE(RPLY REQUIRED)
+ include_directories( ${MUL_INCLUDE_DIR} )
+ include_directories( ${RPLY_INCLUDE_DIR} )
+ set(boxm_algo_sources
 diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-index fff9ae2d84..d7ef6ed5fa 100644
+index fff9ae2d8404c5631564eddc30c48cae8a69ffc0..d7ef6ed5fa345edf70cc5d2074fba2aed5f2d23f 100644
 --- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -94,7 +106,7 @@ index fff9ae2d84..d7ef6ed5fa 100644
  include_directories( ${BRL_INCLUDE_DIR}/bseg )
  include_directories( ${RPLY_INCLUDE_DIR} )
 diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-index c3ed4ed27d..19763fbd71 100644
+index c3ed4ed27d4d08902f8b56d158bb89539df76a93..19763fbd71ca8ee9071483e8ad3a86db8450f852 100644
 --- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -104,5 +116,5 @@ index c3ed4ed27d..19763fbd71 100644
  include_directories( ${BRL_INCLUDE_DIR}/bseg )
  include_directories( ${MUL_INCLUDE_DIR} )
 -- 
-2.46.1
+2.21.0
 

0006-v2.0.2-bbas-baio-Update-function-arguments-in-declar.patch

@@ -0,0 +1,34 @@
+From a7c248224fed9685df171325ed39c7c3664a2158 Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
+Date: Thu, 25 Apr 2019 16:16:56 +0100
+Subject: [PATCH 6/8] v2.0.2 bbas-baio Update function arguments in declaration
+
+---
+ contrib/brl/bbas/baio/baio_unix.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/brl/bbas/baio/baio_unix.cxx b/contrib/brl/bbas/baio/baio_unix.cxx
+index e8af7199f23f25cf09b4c3359690999ca27fd1ed..98fc11027683356a1e57514aafbe63e269b5b9da 100644
+--- a/contrib/brl/bbas/baio/baio_unix.cxx
++++ b/contrib/brl/bbas/baio/baio_unix.cxx
+@@ -34,7 +34,7 @@ baio::~baio()
+ }
+ 
+ //: Opens and reads file asynchronously
+-bool baio::read(std::string filename, char* buff, long BUFSIZE)
++bool baio::read(const std::string& filename, char* buff, long BUFSIZE)
+ {
+   // 1. call c open to get standard file handle
+   int fhandle = open(filename.c_str(), O_RDONLY);
+@@ -68,7 +68,7 @@ bool baio::read(std::string filename, char* buff, long BUFSIZE)
+ }
+ 
+ //: opens and writes file asynchronously
+-bool baio::write(std::string filename, char* buff, long BUFSIZE)
++bool baio::write(const std::string& filename, char* buff, long BUFSIZE)
+ {
+   // 1. call c open to get standard file handle
+   int fhandle = open(filename.c_str(), O_WRONLY | O_CREAT, 0666);
+-- 
+2.21.0
+

0007-v2.0.2-fix-bkml-test.patch

@@ -1,7 +1,7 @@
-From 8697b5c51bf883e04634d49c45421f2776f59fd3 Mon Sep 17 00:00:00 2001
+From bfe8cdb20353b83e3e231fa72e2199e4d716d4cf Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 17:05:39 +0100
-Subject: [PATCH 05/18] v3.5.0 fix bkml test
+Subject: [PATCH 7/8] v2.0.2 fix bkml test
 
 ---
  contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
@@ -9,7 +9,7 @@ Subject: [PATCH 05/18] v3.5.0 fix bkml test
  2 files changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/contrib/brl/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
-index bb6a65f96d..e34211b0f6 100644
+index bb6a65f96d9e2184fbd477d28ab24e6d111d4713..e34211b0f692353b23819618f38c3ef88544c1cc 100644
 --- a/contrib/brl/bbas/bkml/CMakeLists.txt
 +++ b/contrib/brl/bbas/bkml/CMakeLists.txt
 @@ -6,6 +6,7 @@ set(bkml_sources
@@ -21,7 +21,7 @@ index bb6a65f96d..e34211b0f6 100644
  if(EXPAT_FOUND)
   if(EXPATPP_FOUND)
 diff --git a/contrib/brl/bbas/bkml/tests/CMakeLists.txt b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
-index 84c36469a4..9eddec1f66 100644
+index 84c36469a492c95f87f3e766bcc95d7878b4f0aa..9eddec1f6657e6584883c5a7a6f885f1446ea4a9 100644
 --- a/contrib/brl/bbas/bkml/tests/CMakeLists.txt
 +++ b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
 @@ -1,12 +1,24 @@
@@ -54,5 +54,5 @@ index 84c36469a4..9eddec1f66 100644
 +  target_link_libraries( bkml_test_include bkml )
 +endif()
 -- 
-2.46.1
+2.21.0
 

0008-v2.0.2-Correct-rply-includedir.patch

@@ -1,18 +1,19 @@
-From 2252a472803e52dd504e243593f32f4312342591 Mon Sep 17 00:00:00 2001
+From 6a863547324024a17eca177eb73def5a7cd8aeb9 Mon Sep 17 00:00:00 2001
 From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
 Date: Thu, 25 Apr 2019 23:32:15 +0100
-Subject: [PATCH 06/18] v3.5.0 Correct rply includedir
+Subject: [PATCH 8/8] v2.0.2 Correct rply includedir
 
 ---
- contrib/brl/bbas/bvrml/pro/CMakeLists.txt      |  8 +++++++-
- contrib/brl/bbas/bwm/exe/CMakeLists.txt        |  8 +++++++-
- contrib/brl/bbas/volm/pro/CMakeLists.txt       |  8 +++++++-
- contrib/brl/bseg/boxm2/pro/CMakeLists.txt      |  7 +++++++
- contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt | 10 +++++++++-
- 5 files changed, 37 insertions(+), 4 deletions(-)
+ contrib/brl/bbas/bvrml/pro/CMakeLists.txt      | 8 +++++++-
+ contrib/brl/bbas/bwm/exe/CMakeLists.txt        | 8 +++++++-
+ contrib/brl/bbas/volm/pro/CMakeLists.txt       | 8 +++++++-
+ contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt  | 7 +++++++
+ contrib/brl/bseg/boxm2/pro/CMakeLists.txt      | 7 +++++++
+ contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt | 7 +++++++
+ 6 files changed, 42 insertions(+), 3 deletions(-)
 
 diff --git a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
-index c1c82d0dd4..3a82f2e050 100644
+index c1c82d0dd47a4e9f0a20f40d2d84bea93ab3fb15..3a82f2e0506f010264418129369366358da6f0c8 100644
 --- a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
 @@ -4,7 +4,13 @@ if (HAS_GEOTIFF)
@@ -31,7 +32,7 @@ index c1c82d0dd4..3a82f2e050 100644
  set(bvrml_pro_sources
      bvrml_processes.h
 diff --git a/contrib/brl/bbas/bwm/exe/CMakeLists.txt b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
-index 4b642eb232..43de7db5df 100644
+index 4b642eb2324183d68fd5c7783c80d57974632a42..43de7db5df610855d3d2ce3b9630231a28c3e028 100644
 --- a/contrib/brl/bbas/bwm/exe/CMakeLists.txt
 +++ b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
 @@ -1,7 +1,13 @@
@@ -50,7 +51,7 @@ index 4b642eb232..43de7db5df 100644
  include_directories( ${OXL_INCLUDE_DIR} )
  
 diff --git a/contrib/brl/bbas/volm/pro/CMakeLists.txt b/contrib/brl/bbas/volm/pro/CMakeLists.txt
-index 76c1216a4f..aa028ca71f 100644
+index 76c1216a4f91c61a9354ca8dc6cb490c63306e9c..aa028ca71f081ea5db5ffd17f27ee67b3d228d29 100644
 --- a/contrib/brl/bbas/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bbas/volm/pro/CMakeLists.txt
 @@ -4,7 +4,13 @@ if(VXL_BUILD_RPL)
@@ -68,8 +69,33 @@ index 76c1216a4f..aa028ca71f 100644
  
    # The N-dimensional bin structure implementations use rpl/rsdl
  
+diff --git a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+index c821d10a77d9aac7398fe65c2439aece73ca9f5b..2a41c2db1aefe27fe538a16db4be4b9bfdd58bdf 100644
+--- a/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
++++ b/contrib/brl/bseg/boxm/algo/pro/CMakeLists.txt
+@@ -3,13 +3,20 @@
+ # bprb depends on expat and bvxm_pro depends on bprb primarily
+ FIND_PACKAGE(EXPAT REQUIRED)
+ FIND_PACKAGE(EXPATPP REQUIRED)
++
+ if(EXPAT_FOUND)
+   include_directories( ${BRL_INCLUDE_DIR}/bpro )
+   include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
+   include_directories( ${BRL_INCLUDE_DIR}/bseg )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
+   include_directories( ${GEL_INCLUDE_DIR}/mrc )
++
++FIND_PACKAGE(RPLY REQUIRED)
++if(RPLY_FOUND)
++  include_directories( ${RPLY_INCLUDE_DIR} )
++else()
+   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
++endif()
+ 
+   set(boxm_algo_pro_sources
+       boxm_algo_processes.h
 diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-index 7c2ec1d9c3..0536e327fd 100644
+index 7c2ec1d9c3c3610bfcf575647d37ce5e13bd646a..0536e327fdeb5ad650047ec038f77e1fcb3de1f0 100644
 --- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
 @@ -11,7 +11,14 @@ if(EXPAT_FOUND)
@@ -88,10 +114,10 @@ index 7c2ec1d9c3..0536e327fd 100644
    set(boxm2_pro_sources
        boxm2_processes.h
 diff --git a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-index 265cd5d066..2ec707047f 100644
+index bea0c2c32de9a86b55542c642a58e7e34ba07d02..f19374be806992b72f7bfe0b57967d567b8086b2 100644
 --- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
 +++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-@@ -11,8 +11,16 @@ if(EXPAT_FOUND)
+@@ -11,7 +11,14 @@ if(EXPAT_FOUND)
    include_directories( ${BRL_INCLUDE_DIR}/bbas )
    include_directories( ${GEL_INCLUDE_DIR}/mrc/vpgl )
    include_directories( ${GEL_INCLUDE_DIR}/mrc )
@@ -101,14 +127,11 @@ index 265cd5d066..2ec707047f 100644
 +  include_directories( ${RPLY_INCLUDE_DIR} )
 +else()
    include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
--if(OpenCL_FOUND)
 +endif()
 +
-+if(OPENCL_FOUND)
-+  include_directories( ${OPENCL_INCLUDE_PATH} )
+ if(OPENCL_FOUND)
+   include_directories( ${OPENCL_INCLUDE_PATH} )
    set( BOXM2_VOLM_PRO_LIBS boxm2_ocl)
- endif()
- 
 -- 
-2.46.1
+2.21.0
 

0009-v3.5.0-indent-to-keep-gcc-happy.patch

@@ -1,26 +0,0 @@
-From 303abcb68bcc14b04d73460d25d8e4978e5b3617 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Mon, 23 Oct 2023 13:27:34 +0100
-Subject: [PATCH 09/18] v3.5.0: indent to keep gcc happy
-
----
- core/vpgl/vpgl_tri_focal_tensor.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/core/vpgl/vpgl_tri_focal_tensor.h b/core/vpgl/vpgl_tri_focal_tensor.h
-index 21a96688fb..e3f8929767 100644
---- a/core/vpgl/vpgl_tri_focal_tensor.h
-+++ b/core/vpgl/vpgl_tri_focal_tensor.h
-@@ -186,7 +186,8 @@ protected:
- 
- 
-   virtual bool get_epipoles(vgl_homg_point_2d<Type>& e12, vgl_homg_point_2d<Type>& e13)  {
--    if (!epipoles_valid_) compute_epipoles(); e12 = e12_; e13 = e13_; return epipoles_valid_;
-+    if (!epipoles_valid_) compute_epipoles();
-+    e12 = e12_; e13 = e13_; return epipoles_valid_;
-   }
- 
-   bool compute_epipoles();
--- 
-2.46.1
-

0010-v3.5.0-more-linker-fixes.patch

@@ -1,31 +0,0 @@
-From c45defc6a27e344f7d3f69dde806d4b187e2aa27 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Mon, 23 Oct 2023 15:55:38 +0100
-Subject: [PATCH 10/18] v3.5.0: more linker fixes
-
----
- contrib/brl/bbas/imesh/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/brl/bbas/imesh/CMakeLists.txt b/contrib/brl/bbas/imesh/CMakeLists.txt
-index b122b33faf..a8a107e574 100644
---- a/contrib/brl/bbas/imesh/CMakeLists.txt
-+++ b/contrib/brl/bbas/imesh/CMakeLists.txt
-@@ -22,11 +22,11 @@ aux_source_directory(Templates imesh_sources)
- 
- vxl_add_library(LIBRARY_NAME imesh LIBRARY_SOURCES  ${imesh_sources})
- 
--target_link_libraries(imesh ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl)
-+target_link_libraries(imesh ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vul brdb ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl)
- 
- # Algorithms
- add_subdirectory(algo)
- 
- if( BUILD_TESTING )
-   add_subdirectory(tests)
--endif()
-+endif()
-\ No newline at end of file
--- 
-2.46.1
-

0011-v3.5.0-fix-for-gcc11.patch

@@ -1,89 +0,0 @@
-From 690e4102939836f82afb83bba6120698403fcd43 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Mon, 23 Oct 2023 17:05:04 +0100
-Subject: [PATCH 11/18] v3.5.0: fix for gcc11
-
----
- .../brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx    | 1 +
- contrib/brl/bseg/bsgm/bsgm_error_checking.h                      | 1 +
- contrib/brl/bseg/bsgm/bsgm_remove_spikes.h                       | 1 +
- contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h               | 1 +
- core/testlib/testlib_test.h                                      | 1 +
- core/vnl/vnl_bignum.cxx                                          | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
-index 67f6f1582c..185042f4df 100644
---- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
-+++ b/contrib/brl/bseg/boxm2/pro/processes/boxm2_dem_to_xyz_process.cxx
-@@ -2,6 +2,7 @@
- #include <fstream>
- #include <iostream>
- #include <algorithm>
-+#include <limits>
- #include <bprb/bprb_func_process.h>
- //:
- // \file
-diff --git a/contrib/brl/bseg/bsgm/bsgm_error_checking.h b/contrib/brl/bseg/bsgm/bsgm_error_checking.h
-index 3eb3731a48..69ddb9a659 100644
---- a/contrib/brl/bseg/bsgm/bsgm_error_checking.h
-+++ b/contrib/brl/bseg/bsgm/bsgm_error_checking.h
-@@ -11,6 +11,7 @@
- #include <vgl/vgl_box_2d.h>
- #include <vil/vil_image_view.h>
- #include <vector>
-+#include <limits>
- 
- //:
- // \file
-diff --git a/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h b/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
-index fd1ca2a941..c20cfe8b80 100644
---- a/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
-+++ b/contrib/brl/bseg/bsgm/bsgm_remove_spikes.h
-@@ -2,6 +2,7 @@
- #include <iomanip>
- #include <cmath>
- #include <vector>
-+#include <limits>
- #include <vgl/vgl_point_3d.h>
- #include <vil/vil_image_view.h>
- 
-diff --git a/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h b/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
-index 96654ddac0..762d4598bf 100644
---- a/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
-+++ b/contrib/mul/vil3d/algo/vil3d_locally_z_normalise.h
-@@ -10,6 +10,7 @@
- #include <vil3d/vil3d_math.h>
- #include <vil3d/algo/vil3d_exp_filter.h>
- #include <cassert>
-+#include <limits>
- #ifdef _MSC_VER
- #  include <vcl_msvc_warnings.h>
- #endif
-diff --git a/core/testlib/testlib_test.h b/core/testlib/testlib_test.h
-index e070f2aacc..87d5c5ceb1 100644
---- a/core/testlib/testlib_test.h
-+++ b/core/testlib/testlib_test.h
-@@ -14,6 +14,7 @@
- 
- #include <string>
- #include <complex>
-+#include <limits>
- 
- //: initialise test counters, check test name 'name' exists
- void testlib_test_start(const char* name = nullptr);
-diff --git a/core/vnl/vnl_bignum.cxx b/core/vnl/vnl_bignum.cxx
-index 26760c2054..0556918395 100644
---- a/core/vnl/vnl_bignum.cxx
-+++ b/core/vnl/vnl_bignum.cxx
-@@ -6,6 +6,7 @@
- #include <algorithm>
- #include <vector>
- #include <iostream>
-+#include <limits>
- #include "vnl_bignum.h"
- //:
- // \file
--- 
-2.46.1
-

0012-v3.5.0-link-against-acal.patch

@@ -1,45 +0,0 @@
-From 0cee9d18cd8a652145684ac0c74d905b810e5e0c Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Tue, 24 Oct 2023 12:16:41 +0100
-Subject: [PATCH 12/18] v3.5.0: link against acal
-
-To fix:
-```
-/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `acal_f_utils::read_affine_cameras(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::map<unsigned long, vpgl_affine_camera<double>, std::less<unsigned long>, std::allocator<std::pair<unsigned long const, vpgl_affine_camera<double> > > >&)'
-/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `acal_f_utils::datetime_from_iname(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, dtime&)'
-/usr/bin/ld: ../../../../../lib/libbsgm.so.3.5.0.0: undefined reference to `dtime::time_diff(dtime const&, dtime const&)'
-collect2: error: ld returned 1 exit status
-```
----
- contrib/brl/bseg/bsgm/CMakeLists.txt         | 2 +-
- contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bseg/bsgm/CMakeLists.txt b/contrib/brl/bseg/bsgm/CMakeLists.txt
-index 44c4637af2..975ed5364c 100644
---- a/contrib/brl/bseg/bsgm/CMakeLists.txt
-+++ b/contrib/brl/bseg/bsgm/CMakeLists.txt
-@@ -16,7 +16,7 @@ aux_source_directory(Templates bsgm_sources)
- 
- vxl_add_library(LIBRARY_NAME bsgm LIBRARY_SOURCES ${bsgm_sources})
- 
--target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
-+target_link_libraries( bsgm vidl_pro ${VXL_LIB_PREFIX}acal ${VXL_LIB_PREFIX}bpgl_algo ${VXL_LIB_PREFIX}brip ${VXL_LIB_PREFIX}bsta ${VXL_LIB_PREFIX}bjson ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vgl_io ${VXL_LIB_PREFIX}vgl_algo ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vcl)
- 
- add_subdirectory( app )
- 
-diff --git a/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx b/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
-index 6320d290ff..e97e318428 100644
---- a/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
-+++ b/contrib/brl/bseg/bsgm/bsgm_pair_selector.cxx
-@@ -4,6 +4,7 @@
- #include <algorithm>
- #include <fstream>
- #include <bpgl/acal/acal_metadata.h>
-+#include <bpgl/acal/acal_f_utils.h>
- 
- std::string bsgm_pair_selector::remove_crop_postfix(std::string const& iname)
- {
--- 
-2.46.1
-

0013-v3.5.0-more-linkage-fixes.patch

@@ -1,25 +0,0 @@
-From 2757969a8b0e55c2310d50ef4764d3f81ce1d748 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Tue, 24 Oct 2023 13:50:37 +0100
-Subject: [PATCH 13/18] v3.5.0: more linkage fixes
-
----
- contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt b/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
-index 66d543b5c9..0ffff761fd 100644
---- a/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
-+++ b/contrib/brl/bpro/core/vil_pro/tests/CMakeLists.txt
-@@ -8,7 +8,7 @@ if(EXPAT_FOUND)
-   test_vil_crop_image_process.cxx
-  )
- 
--target_link_libraries(vil_pro_test_all ${VXL_LIB_PREFIX}testlib vil_pro bprb sdet ${VXL_LIB_PREFIX}vil expat expatpp)
-+target_link_libraries(vil_pro_test_all ${VXL_LIB_PREFIX}testlib vil_pro bprb brdb sdet ${VXL_LIB_PREFIX}vil expat expatpp)
- 
- add_test( NAME bpro_vil_test_convert_to_n_planes_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_convert_to_n_planes_process )
- add_test( NAME bpro_vil_test_crop_image_process COMMAND $<TARGET_FILE:vil_pro_test_all> test_vil_crop_image_process )
--- 
-2.46.1
-

0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch

@@ -1,52 +0,0 @@
-From ea6a4cc7095db5e98728849f6db505952704ca37 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Mon, 22 Jan 2024 11:40:35 +0000
-Subject: [PATCH 14/18] v3.5.0: use system zlib, tiff, minizip-compat
-
----
- contrib/brl/bseg/bmdl/CMakeLists.txt     | 7 +++++++
- contrib/brl/bseg/bmdl/pro/CMakeLists.txt | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/brl/bseg/bmdl/CMakeLists.txt b/contrib/brl/bseg/bmdl/CMakeLists.txt
-index 4890d2ab29..8db0d2ca1c 100644
---- a/contrib/brl/bseg/bmdl/CMakeLists.txt
-+++ b/contrib/brl/bseg/bmdl/CMakeLists.txt
-@@ -1,5 +1,12 @@
- # This is brl/seg/bmdl/CMakeLists.txt
- 
-+FIND_PACKAGE( ZLIB QUIET )
-+if(ZLIB_FOUND)
-+  include_directories( ${ZLIB_INCLUDE_DIR} )
-+  include_directories( ${BRL_INCLUDE_DIR}/b3p )
-+  add_definitions(-DHAS_ZLIB=1)
-+endif()
-+
- if(HAS_GEOTIFF)
-   include_directories( ${GEOTIFF_INCLUDE_DIR} )
- 
-diff --git a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-index 7c73fe1bb0..cc30626c09 100644
---- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-@@ -1,7 +1,7 @@
- # This is contrib/brl/bseg/bmdl/pro/CMakeLists.txt
- # bmdl's Process Library
- 
--include( ${VXL_CMAKE_DIR}/FindZLIB.cmake )
-+FIND_PACKAGE( ZLIB QUIET )
- if(ZLIB_FOUND)
-   include_directories( ${ZLIB_INCLUDE_DIR} )
-   include_directories( ${BRL_INCLUDE_DIR}/b3p )
-@@ -12,7 +12,7 @@ endif()
- FIND_PACKAGE(EXPAT REQUIRED)
- FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
--  include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
-+  FIND_PACKAGE(TIFF)
-   if(TIFF_FOUND)
-     include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
-     if(GEOTIFF_FOUND)
--- 
-2.46.1
-

0015-v3.5.0-fix-linking.patch

@@ -1,25 +0,0 @@
-From 4f74f5343ff3595872d045c4bf5025e347d18438 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Tue, 23 Jan 2024 16:54:51 +0000
-Subject: [PATCH 15/18] v3.5.0: fix linking
-
----
- contrib/brl/bpro/core/brip_pro/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bpro/core/brip_pro/CMakeLists.txt b/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
-index cfa7d46af8..b8d557cdb9 100644
---- a/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
-+++ b/contrib/brl/bpro/core/brip_pro/CMakeLists.txt
-@@ -14,7 +14,7 @@ aux_source_directory(Templates brip_pro_sources)
- aux_source_directory(processes brip_pro_sources)
- 
- vxl_add_library(LIBRARY_NAME brip_pro LIBRARY_SOURCES ${brip_pro_sources})
--target_link_libraries(brip_pro bprb brdb brip vil_pro ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vsl bil_algo)
-+target_link_libraries(brip_pro bprb brdb brip vpgl_pro vil_pro ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vsl bil_algo)
- 
- if( BUILD_TESTING )
-   add_subdirectory(tests)
--- 
-2.46.1
-

0016-v3.5.0-fix-linking.patch

@@ -1,26 +0,0 @@
-From 4de179f888a8c0ce9bbec7a63c4e86015598a809 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Tue, 1 Oct 2024 16:00:35 +0100
-Subject: [PATCH 16/18] v3.5.0: fix linking
-
----
- contrib/brl/bpro/core/vil_pro/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/brl/bpro/core/vil_pro/CMakeLists.txt b/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
-index 5298c63727..ba36c765bb 100644
---- a/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
-+++ b/contrib/brl/bpro/core/vil_pro/CMakeLists.txt
-@@ -17,7 +17,8 @@ aux_source_directory(processes vil_pro_sources)
- 
- vxl_add_library(LIBRARY_NAME vil_pro LIBRARY_SOURCES ${vil_pro_sources})
- 
--target_link_libraries(vil_pro bbas_pro bprb bil bil_algo brip sdet ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl bsta_vis)
-+target_link_libraries(vil_pro bbas_pro bprb bil bil_algo brip sdet ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vsl bsta_vis vpgl_pro)
-+# Need vpgl_pro only for the instantiation of brdb_value_t<vbl_smart_ptr<vpgl_camera<double> > >
- 
- if( BUILD_TESTING )
-   add_subdirectory(tests)
--- 
-2.46.1
-

0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch

@@ -1,894 +0,0 @@
-From a002d34fee7a0c86de360de5792dbffbbb5255d9 Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Tue, 1 Oct 2024 16:26:23 +0100
-Subject: [PATCH 17/18] v3.5.0: remove boxm2 processes that use sdnet that
- require triangle
-
----
- contrib/brl/bseg/boxm2/pro/boxm2_processes.h  |   3 -
- contrib/brl/bseg/boxm2/pro/boxm2_register.cxx |   3 -
- .../processes/boxm2_export_mesh_process.cxx   | 213 -------
- .../boxm2_export_textured_mesh_process.cxx    | 523 ------------------
- .../pro/processes/boxm2_load_mesh_process.cxx |  78 ---
- 5 files changed, 820 deletions(-)
- delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
- delete mode 100644 contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
-
-diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
-index 4d68be95b0..7094c03fb5 100644
---- a/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
-+++ b/contrib/brl/bseg/boxm2/pro/boxm2_processes.h
-@@ -13,8 +13,6 @@ DECLARE_FUNC_CONS(boxm2_create_cache_process);
- DECLARE_FUNC_CONS(boxm2_create_scene_process);
- DECLARE_FUNC_CONS(boxm2_write_scene_xml_process);
- DECLARE_FUNC_CONS(boxm2_add_block_process);
--DECLARE_FUNC_CONS(boxm2_export_textured_mesh_process);
--DECLARE_FUNC_CONS(boxm2_export_mesh_process);
- DECLARE_FUNC_CONS(boxm2_describe_scene_process);
- DECLARE_FUNC_CONS(boxm2_create_stream_cache_process);
- DECLARE_FUNC_CONS(boxm2_roi_init_process);
-@@ -57,7 +55,6 @@ DECLARE_FUNC_CONS(boxm2_label_to_xyz_process);
- DECLARE_FUNC_CONS(boxm2_label_to_xyz_process2);
- DECLARE_FUNC_CONS(boxm2_prune_scene_blocks_process);
- DECLARE_FUNC_CONS(boxm2_prune_scene_blocks_by_dem_process);
--DECLARE_FUNC_CONS(boxm2_load_mesh_process);
- DECLARE_FUNC_CONS(boxm2_create_camera_from_kml_path_process);  // August 23, 2013 Yi Dong
- 
- DECLARE_FUNC_CONS(boxm2_ortho_geo_cam_from_scene_process);
-diff --git a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
-index a05b9e5c58..e1cefa5765 100644
---- a/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
-+++ b/contrib/brl/bseg/boxm2/pro/boxm2_register.cxx
-@@ -33,8 +33,6 @@ void boxm2_register::register_process()
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_create_scene_process,    "boxm2CreateSceneProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_write_scene_xml_process, "boxm2WriteSceneXMLProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_add_block_process,       "boxm2AddBlockProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_textured_mesh_process,"boxm2ExportTexturedMeshProcess");
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_export_mesh_process,"boxm2ExportMeshProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_describe_scene_process,"boxm2DescribeSceneProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_create_stream_cache_process, "boxm2CreateStreamCacheProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_roi_init_process, "boxm2RoiInitProcess");
-@@ -58,7 +56,6 @@ void boxm2_register::register_process()
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_from_box_cams_process, "boxm2SceneFromBoxCamsProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_from_nvm_txt_process, "boxm2SceneFromNVMtxtProcess");
- 
--  REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_load_mesh_process, "boxm2LoadMeshProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_compactify_mog6_view_process, "boxm2CompactifyMog6ViewProcess");
-   REG_PROCESS_FUNC_CONS(bprb_func_process, bprb_batch_process_manager, boxm2_scene_statistics_process, "boxm2SceneStatisticsProcess");
- 
-diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
-deleted file mode 100644
-index bdc59a32e7..0000000000
---- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
-+++ /dev/null
-@@ -1,213 +0,0 @@
--// This is brl/bseg/boxm2/pro/processes/boxm2_export_mesh_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for exporting a texture mapped mesh of a scene
--//
--// \author Vishal Jain
--// \date Mar 15, 2011
--
--#ifdef _MSC_VER
--#  include "vcl_msvc_warnings.h"
--#endif
--#include "vul/vul_file.h"
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_util.h>
--
--//vil includes
--#include "vil/vil_image_view.h"
--#include "vil/vil_new.h"
--#include "vil/vil_math.h"
--
--//vgl
--#include "vgl/vgl_point_3d.h"
--#include <bvgl/bvgl_triangle_interpolation_iterator.h>
--
--//det and imesh includes
--#include <sdet/sdet_image_mesh.h>
--#include <sdet/sdet_image_mesh_params.h>
--#include <imesh/imesh_fileio.h>
--#include <imesh/imesh_operations.h>
--
--namespace boxm2_export_mesh_process_globals
--{
--  constexpr unsigned n_inputs_ = 4;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm2_export_mesh_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm2_export_mesh_process_globals;
--
--  //process takes 2 inputs
--  int i=0;
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[i++] = "vil_image_view_base_sptr";  //depth image
--  input_types_[i++] = "vil_image_view_base_sptr";  //x image
--  input_types_[i++] = "vil_image_view_base_sptr";  //y image
--  input_types_[i++] = "vcl_string";                //output dir of saved mesh
--
--  // process has 1 output
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "imesh_mesh_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm2_export_mesh_process(bprb_func_process& pro)
--{
--  using namespace boxm2_export_mesh_process_globals;
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned argIdx = 0;
--  vil_image_view_base_sptr img = pro.get_input<vil_image_view_base_sptr>(argIdx++);
--  vil_image_view_base_sptr ximg = pro.get_input<vil_image_view_base_sptr>(argIdx++);
--  vil_image_view_base_sptr yimg = pro.get_input<vil_image_view_base_sptr>(argIdx++);
--  std::string out_dir = pro.get_input<std::string>(argIdx++);
--
--  //create the mesh directory
--  if (out_dir != "") {
--    if (!vul_file::make_directory_path(out_dir.c_str())) {
--      std::cout<<"Couldn't make directory path "<<out_dir<<std::endl;
--      return false;
--    }
--  }
--
--  //cast camera and image so they are useful
--  auto* z_img = (vil_image_view<float>*) img.ptr();
--  auto* x_img = (vil_image_view<float>*) ximg.ptr();
--  auto* y_img = (vil_image_view<float>*) yimg.ptr();
--
--  //determine size of depth image
--  unsigned ni = z_img->ni();
--  unsigned nj = z_img->nj();
--
--  //create new resource sptr
--  vil_image_resource_sptr z_img_res = vil_new_image_resource_of_view(*z_img);
--
--  //initialize some sdet_image_mesh parameters
--  sdet_image_mesh_params imp;
--  // sigma of the Gaussian for smoothing the image prior to edge detection
--  imp.smooth_ = 1.0f;
--  // the edge detection threshold
--  imp.thresh_ = 1.68f;
--  // the shortest edgel chain that is considered for line fitting
--  imp.min_fit_length_ = 5;
--
--  // the threshold on rms pixel distance of edgels to the line
--  imp.rms_distance_ = 0.11;
--  // the width in pixels of the transition of a step edge
--  imp.step_half_width_ = 0.0;
--
--  // the mesh processor
--  sdet_image_mesh im(imp);
--  im.set_image(z_img_res);
--  if (!im.compute_mesh()) {
--    std::cout<<"mesh could not be computed"<<std::endl;
--    return false;
--  }
--  imesh_mesh& mesh = im.get_mesh();
--  std::cout << "Number of vertices " << mesh.num_verts()
--           << "  number of faces "<< mesh.num_faces()<< '\n';
--
--  ////////////////////////////////////////////////////////////////////////////////
--  // Take mesh and add points to triangles of high depth variance
--  // I.E. if a triangle in mesh has corners both very close and very far from top
--  // camera, take it's centroid point and add x,y,z point, creating 3 new faces
--  ////////////////////////////////////////////////////////////////////////////////
--  mesh.compute_vertex_normals_from_faces();
--
--  ////////////////////////////////////////////////////////////////////////////////
--  //// normalize mesh world points to fit in the image_bb from above
--  ////////////////////////////////////////////////////////////////////////////////
--  // get min and max z values
--  float minz=0, maxz=0;
--  vil_math_value_range(*z_img, minz, maxz);
--  std::cout<<"Min z: "<<minz<<" Max z: "<<maxz<<std::endl;
--
--  //grab vertices in the mesh - convert them to scene coordinates (not image)
--  imesh_vertex_array<3>& verts = mesh.vertices<3>();
--  unsigned nverts = mesh.num_verts();
--  for (unsigned iv = 0; iv<nverts; ++iv)
--  {
--    //get coordinates so you can index into the height map
--    auto i = static_cast<unsigned>(verts[iv][0]);
--    auto j = static_cast<unsigned>(verts[iv][1]);
--    if (i<ni && j<nj)
--    {
--      verts[iv][0] = (*x_img)(i,j);
--      verts[iv][1] = (*y_img)(i,j);
--      verts[iv][2] = (*z_img)(i,j);
--    }
--  }
--
--  ////////////////////////////////////////////////////////////////////////////////
--  //// cut tall triangles into quarters (find midpoints of each
--  ////////////////////////////////////////////////////////////////////////////////
--//bool did_divide = true;
--  //while (did_divide)
--  {
--    std::set<unsigned int> sel_faces;
--    double maxLen = (maxz-minz) / 3.0;
--    auto& faces = (imesh_regular_face_array<3>&) mesh.faces();
--    imesh_vertex_array<3>&       verts = mesh.vertices<3>();
--
--    unsigned nfaces = mesh.num_faces();
--    for (unsigned iface = 0; iface<nfaces; ++iface)
--    {
--      //store three 3d points
--      std::vector<vgl_point_3d<double> > points;
--      for (int i=0; i<3; ++i) {
--        unsigned vertexId = faces[iface][i];
--        double x = verts[vertexId][0];
--        double y = verts[vertexId][1];
--        double z = verts[vertexId][2];
--        points.emplace_back(x,y,z );
--      }
--
--      // if any one side of the triangle is too long, cut it
--      double lenA = (points[0]-points[1]).sqr_length(); // vgl_vector length == distance
--      double lenB = (points[1]-points[2]).sqr_length();
--      double lenC = (points[0]-points[2]).sqr_length();
--      maxLen *= maxLen; // sqr
--      if (lenA > maxLen || lenB > maxLen || lenC > maxLen) {
--        sel_faces.insert(iface);
--      }
--    }
--
--    //if the divide face set is not empty, divide the faces
--    if ( !sel_faces.empty() ) {
--//    did_divide = true;
--
--      std::cout<<"Subdividing mesh"<<std::endl;
--      imesh_quad_subdivide(mesh, sel_faces);
--
--      std::cout<<"Re triangulating mesh"<<std::endl;
--      imesh_triangulate(mesh);
--    }
--//  else {
--//    did_divide = false;
--//  }
--  }
--
--  imesh_mesh_sptr mesh_sptr = new imesh_mesh(mesh);
--
--  ////////////////////////////////////////////////////////////////////////////////
--  //// Write out in VRML format
--  ////////////////////////////////////////////////////////////////////////////////
--  std::string vrfile = out_dir + "/untextured.wrl";
--  std::ofstream os(vrfile.c_str());
--  imesh_write_vrml(os, mesh);
--  os.close();
--
--  // store scene smart pointer
--  argIdx = 0;
--  pro.set_output_val<imesh_mesh_sptr>(argIdx++, mesh_sptr);
--  return true;
--}
-diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
-deleted file mode 100644
-index 73e67b8bb6..0000000000
---- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
-+++ /dev/null
-@@ -1,523 +0,0 @@
--// This is brl/bseg/boxm2/pro/processes/boxm2_export_textured_mesh_process.cxx
--#include <bprb/bprb_func_process.h>
--#include <fstream>
--#include <iostream>
--#include <utility>
--//:
--// \file
--// \brief  A process for exporting a texture mapped mesh of a scene
--//
--// \author Vishal Jain
--// \date Mar 15, 2011
--
--#ifdef _MSC_VER
--#  include "vcl_msvc_warnings.h"
--#endif
--#include "vul/vul_file.h"
--#include "vul/vul_timer.h"
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_util.h>
--
--//vil includes
--#include "vil/vil_image_view.h"
--#include "vil/vil_save.h"
--#include "vil/vil_new.h"
--
--//vgl
--#include "vgl/vgl_distance.h"
--#include "vgl/vgl_ray_3d.h"
--#include "vgl/vgl_point_3d.h"
--#include <bvgl/bvgl_triangle_interpolation_iterator.h>
--
--//vpgl camera stuff
--#include "vpgl/vpgl_perspective_camera.h"
--
--//det and imesh includes
--#include <sdet/sdet_image_mesh.h>
--#include <sdet/sdet_image_mesh_params.h>
--#include <imesh/imesh_fileio.h>
--#include <imesh/algo/imesh_render.h>
--
--namespace boxm2_export_textured_mesh_process_globals
--{
--  constexpr unsigned n_inputs_ = 6;
--  constexpr unsigned n_outputs_ = 0;
--
--  //helper texture map methods
--  void boxm2_texture_mesh_from_imgs(std::string im_dir,
--                                    std::string cam_dir,
--                                    imesh_mesh& in_mesh,
--                                    std::map<std::string, imesh_mesh>& meshes);
--
--  //populates a vector of visibility images (by face id int)
--  void boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
--                            std::vector<vil_image_view<int>* >& vis_images,
--                            imesh_mesh& in_mesh);
--
--
--  //checks if a triangle in UV space is visible.  us and vs are double buffers of length 3
--  bool face_is_visible( vpgl_perspective_camera<double>* cam,
--                        vil_image_view<int>* vis_img,
--                        const double* us,
--                        const double* vs,
--                        int face_id);
--}
--
--bool boxm2_export_textured_mesh_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm2_export_textured_mesh_process_globals;
--
--  //process takes 2 inputs
--  int i=0;
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[i++] = "vil_image_view_base_sptr";  //depth image
--  input_types_[i++] = "vpgl_camera_double_sptr";   //depth image cam
--  input_types_[i++] = "boxm2_scene_sptr";          //scene object
--  input_types_[i++] = "vcl_string";                //directory of scene images
--  input_types_[i++] = "vcl_string";                //directory of corresponding cams
--  input_types_[i++] = "vcl_string";                //output dir of saved mesh
--
--  // process has 1 output
--  std::vector<std::string>  output_types_(n_outputs_);
--  //output_types_[0] = "boxm2_scene_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm2_export_textured_mesh_process(bprb_func_process& pro)
--{
--  using namespace boxm2_export_textured_mesh_process_globals;
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--
--  //get the inputs
--  unsigned argIdx = 0;
--  vil_image_view_base_sptr img = pro.get_input<vil_image_view_base_sptr>(argIdx++);
--  vpgl_camera_double_sptr  cam = pro.get_input<vpgl_camera_double_sptr>(argIdx++);
--  boxm2_scene_sptr       scene = pro.get_input<boxm2_scene_sptr>(argIdx++);
--  std::string img_dir = pro.get_input<std::string>(argIdx++);
--  std::string cam_dir = pro.get_input<std::string>(argIdx++);
--  std::string out_dir = pro.get_input<std::string>(argIdx++);
--
--  if (img->pixel_format() == VIL_PIXEL_FORMAT_BYTE)
--  {
--    auto* inim = (vil_image_view<vxl_byte>*) img.ptr();
--    auto* fimg = new vil_image_view<float>(img->ni(), img->nj());
--    for (unsigned int i=0; i<img->ni(); ++i)
--      for (unsigned int j=0; j<img->nj(); ++j)
--        (*fimg)(i,j) = (float) (*inim)(i,j) / 255.0f;
--    img = vil_image_view_base_sptr(fimg);
--  }
--
--  //create the mesh directory
--  if (!vul_file::make_directory_path(out_dir.c_str())) {
--    std::cout<<"Couldn't make directory path "<<out_dir<<std::endl;
--    return false;
--  }
--
--  //cast camera and image so they are useful
--  auto* pcam = (vpgl_perspective_camera<double>*) cam.ptr();
--  auto* depth = (vil_image_view<float>*) img.ptr();
--
--  //determine size of depth image
--  unsigned ni = img->ni();
--  unsigned nj = img->nj();
--
--  //calculate XYZ image image that corresponds to depth image
--  auto* xyz_img = new vil_image_view<vil_rgba<float> >(ni, nj);
--  auto* z_img = new vil_image_view<float>(ni,nj);
--  for (unsigned int i=0; i<ni; ++i) {
--    for (unsigned int j=0; j<nj; ++j) {
--      //grab the ray from the camera
--      vgl_ray_3d<double> ray = pcam->backproject_ray( (double) i+.5, (double) j+.5);
--
--      //ray o
--      float ray_ox = float(ray.origin().x()),
--            ray_oy = float(ray.origin().y()),
--            ray_oz = float(ray.origin().z());
--
--      //ray dir
--      float dray_x = float(ray.direction().x()),
--            dray_y = float(ray.direction().y()),
--            dray_z = float(ray.direction().z());
--
--      //expected ray depth
--      float ray_t = (*depth)(i,j);
--
--      //calculate x,y,z position at expected depth
--      (*xyz_img)(i,j) = vil_rgba<float>(ray_ox - ray_t*dray_x,
--                                        ray_oy - ray_t*dray_y,
--                                        ray_oz - ray_t*dray_z,
--                                        0.0f);
--      (*z_img)(i,j) = ray_oz - ray_t*dray_z;
--    }
--  }
--
--  //////////////////////////////////////////////////////////////////////////////
--  // Generate 3d mesh from depth image
--  //////////////////////////////////////////////////////////////////////////////
--  std::cout<<"Generating image mesh"<<std::endl;
--
--  //create new resource sptr
--  vil_image_resource_sptr z_img_res = vil_new_image_resource_of_view(*z_img);
--
--  //initialize some sdet_image_mesh parameters
--  sdet_image_mesh_params imp;
--  // sigma of the Gaussian for smoothing the image prior to edge detection
--  imp.smooth_ = 2.0f;
--  // the edge detection threshold
--  imp.thresh_ = 2.0f;
--  // the shortest edgel chain that is considered for line fitting
--  imp.min_fit_length_ = 7;
--  // the threshold on rms pixel distance of edgels to the line
--  imp.rms_distance_ = 0.1;
--  // the width in pixels of the transition of a step edge
--  imp.step_half_width_ = 5.0;
--
--  // the mesh processor
--  sdet_image_mesh im(imp);
--  im.set_image(z_img_res);
--  if (!im.compute_mesh()) {
--    std::cout<<"mesh could not be computed"<<std::endl;
--    return false;
--  }
--  imesh_mesh& mesh = im.get_mesh();
--  std::cout << "Number of vertices " << mesh.num_verts()
--           << "  number of faces "<< mesh.num_faces()<< '\n';
--
--  std::string meshFile = out_dir + "/wire.wrl";
--  std::ofstream wos(meshFile.c_str());
--  imesh_write_vrml(wos, mesh);
--  wos.close();
--
--  ////////////////////////////////////////////////////////////////////////////////
--  //// normalize mesh world points to fit in the image_bb from above
--  ////////////////////////////////////////////////////////////////////////////////
--  vul_timer t;
--  //grab vertices in the mesh - convert them to scene coordinates (not image)
--  imesh_vertex_array<3>& verts = mesh.vertices<3>();
--  unsigned nverts = mesh.num_verts();
--  for (unsigned iv = 0; iv<nverts; ++iv)
--  {
--    //get coordinates so you can index into the height map
--    auto i = static_cast<unsigned>(verts[iv][0]);
--    auto j = static_cast<unsigned>(verts[iv][1]);
--    double scene_x=0, scene_y=0,scene_z = 0.0;
--    if (i<ni && j<nj) {
--      scene_x = (*xyz_img)(i,j).R();
--      scene_y = (*xyz_img)(i,j).G();
--      scene_z = (*xyz_img)(i,j).B();
--    }
--    verts[iv][0] = scene_x;
--    verts[iv][1] = scene_y;
--    verts[iv][2] = scene_z;
--  }
--  std::cout<<mesh.has_tex_coords()<<std::endl;
--
--  //////////////////////////////////////////////////////////////////////////////
--  //Texture map the mesh
--  //////////////////////////////////////////////////////////////////////////////
--  //boxm2_texture_mesh_topdown(img_dir, cam_dir, mesh);
--  std::map<std::string, imesh_mesh> meshes;
--  boxm2_texture_mesh_from_imgs(img_dir, cam_dir, mesh, meshes);
--
--  ////////////////////////////////////////////////////////////////////////////////
--  //// Write out in VRML format
--  ////////////////////////////////////////////////////////////////////////////////
--  //output file and stream
--  std::string vrfile = out_dir + "/vrmesh.wrl";
--  std::ofstream os(vrfile.c_str());
--
--  //write each submesh into one file
--  std::map<std::string, imesh_mesh>::iterator subMesh;
--  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh)
--  {
--    imesh_mesh& sMesh = subMesh->second;
--    std::cout<<"Writing sub mesh: "<<sMesh.tex_source()<<" has "<<sMesh.num_faces()<<" faces"<<std::endl;
--    imesh_write_vrml(os, sMesh);
--  }
--  os.close();
--  std::cout<<"Texture Mapping Mesh Time: "<<t.all()<<"ms"<<std::endl;
--
--  return true;
--}
--
--
--//Given a directory of images, dir cams, an input mesh, this function creates
--//map of textured meshes (imesh doesn't ostensibly handle meshes from multiple textures)
--void boxm2_export_textured_mesh_process_globals::boxm2_texture_mesh_from_imgs(std::string im_dir,
--                                                                              std::string cam_dir,
--                                                                              imesh_mesh& in_mesh,
--                                                                              std::map<std::string, imesh_mesh>& meshes)
--{
--  ////////////////////////////////////////////////////////////////////////////////
--  // BEGIN TEXTURE MAPPING
--  // Gather cameras and iamges that will contribute to the texture
--  ////////////////////////////////////////////////////////////////////////////////
--  std::vector<std::string> camfiles = boxm2_util::camfiles_from_directory(std::move(cam_dir));
--  std::vector<std::string> imfiles = boxm2_util::images_from_directory(std::move(im_dir));
--
--  std::vector<vpgl_perspective_camera<double>* > cameras;
--  for (auto & camfile : camfiles) {
--    //build the camera from file
--    std::ifstream ifs(camfile.c_str());
--    auto* icam = new vpgl_perspective_camera<double>;
--    if (!ifs.is_open()) {
--      std::cerr << "Failed to open file " << camfile << '\n';
--      return;
--    }
--    ifs >> *icam;
--    cameras.push_back(icam);
--    std::cout<<icam->principal_axis()<<std::endl;
--  }
--
--  ////////////////////////////////////////////////////////////////////////////////
--  // Grab input mesh vertices and input mesh faces
--  ////////////////////////////////////////////////////////////////////////////////
--  in_mesh.compute_vertex_normals_from_faces();
--  auto& in_faces = (imesh_regular_face_array<3>&) in_mesh.faces();
--  unsigned nfaces = in_mesh.num_faces();
--  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
--
--  ////////////////////////////////////////////////////////////////////////////////
--  // Render Visibility Images
--  ////////////////////////////////////////////////////////////////////////////////
--  std::vector<vil_image_view<int>* > vis_images;
--  boxm2_visible_faces(cameras, vis_images, in_mesh);
--
--  ////////////////////////////////////////////////////////////////////////////////
--  // For each Face:
--  //   determine which image is closest in normal and visible, store face index in a map[image_str, vector<int>face]
--  ////////////////////////////////////////////////////////////////////////////////
--  //texture index
--  std::cout<<"Populating faces for each texture"<<std::endl;
--  std::map<std::string, std::vector<unsigned> > app_faces; //image_name to face_list
--  std::map<std::string, vpgl_perspective_camera<double>* > texture_cams;
--  for (unsigned iface = 0; iface<nfaces; ++iface)
--  {
--    //create list of cameras from which you can see this face
--    std::vector<vpgl_perspective_camera<double>* > visible_views;
--    for (unsigned int i=0; i<vis_images.size(); ++i) {
--      //project triangle
--      double us[3], vs[3];
--      for (int vIdx=0; vIdx<3; ++vIdx) {
--        unsigned vertIdx = in_faces[iface][vIdx];
--
--        //project these verts into UV
--        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
--        double u,v;
--        cameras[i]->project(x, y, z, u, v);
--        us[vIdx] = u;
--        vs[vIdx] = v;
--      }
--      if ( face_is_visible( cameras[i], vis_images[i], us, vs, iface) )
--        visible_views.push_back(cameras[i]);
--    }
--
--    //now compare the normal to each of the visible view cameras
--    vgl_vector_3d<double>& normal = in_faces.normal(iface);
--
--    //find camera with the closest look vector to this normal
--    int closeIdx = boxm2_util::find_nearest_cam(normal, visible_views);
--    vpgl_perspective_camera<double>* closest = nullptr;
--    std::string im_name = "empty";
--    if (closeIdx >= 0) {
--      closest = cameras[closeIdx];
--      im_name = imfiles[closeIdx];
--    }
--
--    //grab appropriate face list (create it if it's not there)
--    auto iter = app_faces.find(im_name);
--    if ( iter == app_faces.end() ) {
--      std::cout<<"Adding image: "<<im_name<<" to texture list"<<std::endl;
--      std::vector<unsigned> faceList;
--      faceList.push_back(iface);
--      app_faces[im_name] = faceList;
--
--      //keep track of the camera
--      texture_cams[im_name] = closest;
--    }
--    else {
--      app_faces[im_name].push_back(iface);
--    }
--  }
--
--  ////////////////////////////////////////////////////////////////////////////////
--  // For each image/appearance:
--  //   - create a vert list
--  //   - create a face list
--  //   - create a sub mesh that is textured
--  ////////////////////////////////////////////////////////////////////////////////
--
--  //for each appearance (texture image), create an imesh_mesh (subMesh);
--  std::cout<<"Creating Sub Meshes for each texture"<<std::endl;
--  std::map<std::string, std::vector<unsigned> >::iterator apps;
--  for (apps = app_faces.begin(); apps != app_faces.end(); ++apps)
--  {
--    //for each appearance, we're creating a whole new mesh
--    // first create the face list
--    auto* flist = new imesh_regular_face_array<3>();
--
--    //now create the vertex list
--    auto* verts3 = new imesh_vertex_array<3>();
--
--    //get faces list corresponding to this texture
--    std::vector<unsigned>& face_list = apps->second;
--    for (unsigned int i=0; i<face_list.size(); ++i) {
--      //get old face
--      unsigned old_fIdx = face_list[i];
--
--      //old face vertices
--      unsigned v1 = in_faces[old_fIdx][0];
--      unsigned v2 = in_faces[old_fIdx][1];
--      unsigned v3 = in_faces[old_fIdx][2];
--
--      //push these vertices onto the new vert list
--      verts3->push_back( imesh_vertex<3>(in_verts[v1][0], in_verts[v1][1], in_verts[v1][2]) );
--      verts3->push_back( imesh_vertex<3>(in_verts[v2][0], in_verts[v2][1], in_verts[v2][2]) );
--      verts3->push_back( imesh_vertex<3>(in_verts[v3][0], in_verts[v3][1], in_verts[v3][2]) );
--
--      imesh_tri tri(3*i, 3*i+1, 3*i+2);
--      flist->push_back(tri);
--    }
--
--    //create the submesh using the auto ptrs
--    std::unique_ptr<imesh_vertex_array_base> v3(verts3);
--    std::unique_ptr<imesh_face_array_base> f3(flist);
--    imesh_mesh subMesh(std::move(v3), std::move(f3));
--
--    std::cout<<"Setting tex source: "<<apps->first<<std::endl;
--    meshes[apps->first] = subMesh;
--    meshes[apps->first].set_tex_source(apps->first);
--  }
--
--  //////////////////////////////////////////////////////////////////////////////
--  //For each mesh, map each vertex
--  //////////////////////////////////////////////////////////////////////////////
--  std::cout<<"Mapping sub meshes for each texture"<<std::endl;
--  std::map<std::string, imesh_mesh>::iterator subMesh;
--  auto txCam = texture_cams.begin();
--  for (subMesh = meshes.begin(); subMesh != meshes.end(); ++subMesh, ++txCam)
--  {
--    imesh_mesh& mesh = subMesh->second;
--    imesh_vertex_array<3>& verts = mesh.vertices<3>();
--    unsigned nverts = mesh.num_verts();
--
--    //texture map the non empty appearances
--    if (txCam->first != "empty")
--    {
--      std::vector<vgl_point_2d<double> > tex_coords(nverts, vgl_point_2d<double>(0.0,0.0));
--      for (unsigned iv = 0; iv<nverts; ++iv)
--      {
--        //find camera corresponding to this texture
--        vpgl_perspective_camera<double>* closest = txCam->second;
--        vgl_point_2d<double> principal_point = closest->get_calibration().principal_point();
--        double ni = principal_point.x()*2.0;
--        double nj = principal_point.y()*2.0;
--
--        //project the vertex onto the camera, store the texture coordinate
--        double x = verts[iv][0];
--        double y = verts[iv][1];
--        double z = verts[iv][2];
--        double u,v;
--        closest->project(x, y, z, u, v);
--
--        //flip v about the y axis
--        v=nj-v;
--
--        //store the tex_coordinate
--        vgl_point_2d<double> uv(u/ni,v/nj);
--        tex_coords[iv] = uv;
--      }
--      mesh.set_tex_coords(tex_coords);
--    }
--  }
--}
--
--bool boxm2_export_textured_mesh_process_globals::face_is_visible( vpgl_perspective_camera<double>*  /*cam*/,
--                                                                  vil_image_view<int>* vis_img,
--                                                                  const double* us,
--                                                                  const double* vs,
--                                                                  int face_id)
--{
--  //now create a polygon, and find the integer image coordinates (U,V) that this polygon covers
--  int ni = vis_img->ni();
--  int nj = vis_img->nj();
--
--  vgl_triangle_scan_iterator<double> tsi;
--  tsi.a.x = us[0];  tsi.a.y = vs[0];
--  tsi.b.x = us[1];  tsi.b.y = vs[1];
--  tsi.c.x = us[2];  tsi.c.y = vs[2];
--  for (tsi.reset(); tsi.next(); ) {
--    int y = tsi.scany();
--    if (y<0 || y>=nj) continue;
--    int min_x = tsi.startx();
--    int max_x = tsi.endx();
--    if (min_x >= ni || max_x < 0)
--      continue;
--    if (min_x < 0) min_x = 0;
--    if (max_x >= ni) max_x = ni-1;
--    for (int x = min_x; x <= max_x; ++x) {
--      if ( (*vis_img)(x,y) != face_id )
--        return false;
--    }
--  }
--
--  //if it made it this far, it's completely visible
--  return true;
--}
--
--
--void boxm2_export_textured_mesh_process_globals::boxm2_visible_faces( std::vector<vpgl_perspective_camera<double>* >& cameras,
--                                                                      std::vector<vil_image_view<int >* >& vis_images,
--                                                                      imesh_mesh& in_mesh)
--{
--  auto& in_faces = (imesh_regular_face_array<3>&) in_mesh.faces();
--  unsigned nfaces = in_mesh.num_faces();
--  imesh_vertex_array<3>& in_verts = in_mesh.vertices<3>();
--
--  //iterate over each camera, creating a visibility image for each
--  for (auto pcam : cameras)
--  {
--    //get the principal point of the cam for image size
--    vgl_point_2d<double> principal_point = pcam->get_calibration().principal_point();
--    auto ni = (unsigned) (principal_point.x()*2.0);
--    auto nj = (unsigned) (principal_point.y()*2.0);
--
--    // render the face_id/distance image
--    vil_image_view<double> depth_im(ni, nj);
--    auto*   face_im = new vil_image_view<int>(ni, nj);
--    depth_im.fill(10e100);  //Initial depth is huge,
--    face_im->fill(-1); //initial face id is -1
--    for (unsigned iface = 0; iface<nfaces; ++iface)
--    {
--      //get the vertices from the face, project into UVs
--      double us[3], vs[3], dists[3];
--      for (int vIdx=0; vIdx<3; ++vIdx) {
--        unsigned vertIdx = in_faces[iface][vIdx];
--
--        //project these verts into UV
--        double x = in_verts[vertIdx][0], y = in_verts[vertIdx][1], z = in_verts[vertIdx][2];
--        double u,v;
--        pcam->project(x, y, z, u, v);
--        us[vIdx] = u;
--        vs[vIdx] = v;
--
--        //keep track of distance to each vertex
--        dists[vIdx] = vgl_distance(vgl_point_3d<double>(x,y,z), pcam->get_camera_center());
--      }
--
--      //render the triangle label onto the label image, using the depth image
--      vgl_point_3d<double> v1(us[0], vs[0], dists[0]);
--      vgl_point_3d<double> v2(us[1], vs[1], dists[1]);
--      vgl_point_3d<double> v3(us[2], vs[2], dists[2]);
--      imesh_render_triangle_label<int>(v1, v2, v3, (int) iface, (*face_im), depth_im);
--    } //end for iface
--
--    //keep the vis_image just calculated
--    vis_images.push_back(face_im);
--    vil_save(depth_im, "/media/VXL/mesh/downtown/dist_im.tif");
--  }
--}
-diff --git a/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx b/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
-deleted file mode 100644
-index 78c545a3fd..0000000000
---- a/contrib/brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
-+++ /dev/null
-@@ -1,78 +0,0 @@
--// This is brl/bseg/boxm2/pro/processes/boxm2_load_mesh_process.cxx
--#include <iostream>
--#include <fstream>
--#include <bprb/bprb_func_process.h>
--//:
--// \file
--// \brief  A process for loading a  mesh
--//
--// \author Vishal Jain
--// \date Mar 15, 2013
--
--#ifdef _MSC_VER
--#  include "vcl_msvc_warnings.h"
--#endif
--#include "vul/vul_file.h"
--#include "vul/vul_timer.h"
--#include "vnl/vnl_random.h"
--#include <boxm2/boxm2_scene.h>
--#include <boxm2/boxm2_util.h>
--
--//vil includes
--#include "vil/vil_image_view.h"
--#include "vil/vil_save.h"
--#include <vil/algo/vil_gauss_filter.h>
--
--//vgl
--#include "vgl/vgl_distance.h"
--#include "vgl/vgl_triangle_scan_iterator.h"
--#include <bvgl/bvgl_triangle_interpolation_iterator.h>
--
--//vpgl camera stuff
--#include "vpgl/vpgl_perspective_camera.h"
--
--//det and imesh includes
--#include <sdet/sdet_image_mesh.h>
--#include <sdet/sdet_image_mesh_params.h>
--#include <imesh/imesh_fileio.h>
--#include <imesh/algo/imesh_render.h>
--
--namespace boxm2_load_mesh_process_globals
--{
--  constexpr unsigned n_inputs_ = 1;
--  constexpr unsigned n_outputs_ = 1;
--}
--
--bool boxm2_load_mesh_process_cons(bprb_func_process& pro)
--{
--  using namespace boxm2_load_mesh_process_globals;
--
--  //process takes 2 inputs
--  int i=0;
--  std::vector<std::string> input_types_(n_inputs_);
--  input_types_[i++] = "vcl_string";       //mesh filename
--
--  // process has 1 output
--  std::vector<std::string>  output_types_(n_outputs_);
--  output_types_[0] = "imesh_mesh_sptr";
--
--  return pro.set_input_types(input_types_) && pro.set_output_types(output_types_);
--}
--
--bool boxm2_load_mesh_process(bprb_func_process& pro)
--{
--  using namespace boxm2_load_mesh_process_globals;
--  if ( pro.n_inputs() < n_inputs_ ) {
--    std::cout << pro.name() << ": The input number should be " << n_inputs_<< std::endl;
--    return false;
--  }
--  unsigned argIdx = 0;
--  std::string mesh_filename = pro.get_input<std::string>(argIdx++);
--  imesh_mesh_sptr mesh = new imesh_mesh();
--  imesh_read(mesh_filename, *(mesh.ptr()));
--  std::cout<<"# of faces "<<mesh->num_faces()<<std::endl;
--  pro.set_output_val<imesh_mesh_sptr>(0,mesh);
--
--
--  return true;
--}
--- 
-2.46.1
-

0018-chore-remove-ctest-dashboard-config.patch

@@ -1,43 +0,0 @@
-From 99f96d0e6d18996ad58d34998d08f022585ae77b Mon Sep 17 00:00:00 2001
-From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
-Date: Wed, 2 Oct 2024 14:39:51 +0100
-Subject: [PATCH 18/18] chore: remove ctest dashboard config
-
----
- CMakeLists.txt    | 4 ----
- CTestConfig.cmake | 8 --------
- 2 files changed, 12 deletions(-)
- delete mode 100644 CTestConfig.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e1aa0390d4..810a1f4b21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -322,10 +322,6 @@ configure_file( ${VXL_CMAKE_DIR}/UseVXL.cmake
- # For use in client projects that call UseVXL.cmake
- set(VXL_LIBRARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE STATIC "Where all the vxl libraries are, for clients to use." )
- 
--# Copy CTestCustom.cmake to top of build tree
--configure_file( ${VXL_CMAKE_DIR}/CTestCustom.cmake
--  ${VXL_BINARY_DIR}/CTestCustom.cmake COPYONLY )
--
- # This command must be the last command in this file
- if(NOT VXL_NO_EXPORT)
-   include(${CMAKE_CURRENT_LIST_DIR}/config/cmake/export/VXLCreateProject.cmake)
-diff --git a/CTestConfig.cmake b/CTestConfig.cmake
-deleted file mode 100644
-index f2620f7bf6..0000000000
---- a/CTestConfig.cmake
-+++ /dev/null
-@@ -1,8 +0,0 @@
--# CTest Configuration for VXL
--set(CTEST_PROJECT_NAME "VXL")
--set(CTEST_NIGHTLY_START_TIME "22:00:00 EST")
--
--set(CTEST_DROP_METHOD "http")
--set(CTEST_DROP_SITE "open.cdash.org")
--set(CTEST_DROP_LOCATION "/submit.php?project=vxl")
--set(CTEST_DROP_SITE_CDASH TRUE)
--- 
-2.46.1
-

changelog

@@ -1,203 +0,0 @@
-* Tue Nov 15 2022 Sandro Mani <manisandro@gmail.com> - 2.0.2-15
-- Rebuild (minizip-ng)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Feb 09 2021 Miro Hrončok <mhroncok@redhat.com> - 2.0.2-11
-- Rebuilt for minizip 3.0.0
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Oct 17 2020 Jeff Law <law@redhat.com> - 2.0.2-9
-- Fix missing #includes for gcc-11
-
-* Mon Jul 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-8
-- Rebuild for libdc1394 soname bump
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Sep 15 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-6
-- Fix failing build: update patch to fix minizip include
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-4
-- Remove obsolete boxm library (was also causing arm build to fail)
-- Remove obsolete octree library
-
-* Tue May 28 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-3
-- Fix 32 bit arch builds: https://github.com/vxl/vxl/issues/638
-- Remove invalid comments
-- Do not make docs require the base package
-
-* Fri Apr 26 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
-- Add complete file list
-- Remove no longer needed BR: klt
-- Remove more unneeded patches
-- Add patch to include FindRPLY.cmake
-- Use system shapelib and expat
-- More patches to complete build
-- Document failing tests, do not let them fail build
-
-* Fri Apr 19 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-2
-- Enable OUL---why was it disabled?
-- Remove rply include patch: build seems to find it just fine.
-- Remove uneeded rply function call fix patch.
-- Remove Coin3D cmake config patch---included in cmake distribution now.
-- Remove SIMVoleon cmake patch---seems to find it just fine.
-- Correct CMake flags.
-- Enable BRL build
-- add Python BR
-- Add expatpp bits manually
-- File upstream issue and use bundled openjpeg2: https://github.com/vxl/vxl/issues/627
-- Remove unneeded xerces BR, and corresponding patch.
-
-* Thu Apr 18 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.0.2-1
-- Update to latest upstream release
-- Temporarily use bundled dcmtk (https://github.com/vxl/vxl/issues/550)
-- Use new github upstream
-- Remove uneeded patches
-- Explicitly list all shared objects
-
-* Sat Mar 09 2019 Antonio Trande <sagitterATfedoraproject.org> - 1.17.0-31
-- Rebuild for dcmtk-3.6.4
-
-* Sun Feb 17 2019 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.17.0-30
-- Use autosetup macro
-- Remove whitespaces, use space instead of tabs for cleanliness
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Aug 28 2018 Patrik Novotný <panovotn@redhat.com> - 1.17.0-28
-- change requires to minizip-compat(-devel), rhbz#1609830, rhbz#1615381
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.17.0-26
-- Rebuild to fix GCC 8 mis-compilation
-  See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-25
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-24
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 25 2016 Tom Callaway <spot@fedoraproject.org> - 1.17.0-20
-- remove non-free lena image file from source tarball (bz1310388)
-- fix FTBFS (bz1303695, bz1308234)
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 16 2015 Sebastian Pölsterl <sebp@k-d-w.org> - 1.17.0-17
-- Rebuilt using hardened build flags: https://fedoraproject.org/wiki/Changes/Harden_All_Packages
-
-* Mon Feb 16 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.17.0-16
-- Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
-- Fix bogus %%changelog date.
-
-* Mon Aug 25 2014 Devrim Gündüz <devrim@gunduz.org> - 1.17.0-15
-- Rebuilt for libgeotiff
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Mar 04 2013 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-11
-- Applied upstream patches (25, 26) to ensure compatibility with ITK
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.17.0-9
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Wed Dec 05 2012 Dan Horák <dan[at]danny.cz> - 1.17.0-8
-- fix build on non-x86 arches
-
-* Sun Nov 25 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-7%{?dist}
-- Changed source0 path to point to vxl 1.17
-- Added missing sonames
-
-* Fri Nov 02 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-6%{?dist}
-- Patched to build BRL
-- Updated to last version
-
-* Mon Oct 29 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-5%{?dist}
-- Removed expatpp bundled library and added corresponding BR
-- Removed bundled bzip
-
-
-* Thu Oct 18 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-4%{?dist}
-- Fixed missing oxl_vrml lib
-- Turn on compilation of BRL
-
-* Sun Oct 14 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-3%{?dist}
-- More fixes from Volker's post https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
-
-* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-2%{?dist}
-- Added patches 12-16 from https://bugzilla.redhat.com/show_bug.cgi?id=567086#c42
-- Minor rework of the spec file as pointed out by Volker in the previous link
-
-* Wed Oct 10 2012 Mario Ceresa mrceresa fedoraproject org vxl 1.17.0-1%{?dist}
-- Updated to new version
-- Reworked patches to the new version
-- Disabled BRL because it gives a compilation error
-
-* Fri May 27 2011 Mario Ceresa mrceresa fedoraproject org vxl 1.14.0-1%{?dist}
-- Updated to new version
-- Added BR doxygen (thanks to Ankur for noticing it)
-- Changed patch naming schema
-- Work around a rply related bug (patches 3-6)
-- Thanks to Thomas Bouffon for patch 7-8
-- Patches 9-10 address http://www.itk.org/pipermail/insight-users/2010-July/037418.html
-- Fixed 70 missing sonames in patch 11
-- Removed bundled expact, shapelib, minizip, dcmtk
-- Force brl build
-- Use system shipped FindEXPAT
-
-
-* Tue Mar 23 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-4%{?dist}
-- sed patch to add ${LIB_SUFFIX} to all lib install target
-- Added soname version info to vil vil_algo lib
-
-* Sun Mar 21 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-3%{?dist}
-- Applied patch to build against newly packaged rply
-
-* Tue Mar 2 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-2%{?dist}
-- Applied patch from debian distribution to force the generation of versioned lib
-
-* Fri Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
-- Initial RPM Release
-
-

licenses.txt

@@ -1,245 +0,0 @@
-# remove bits unbundled and removed in patches and run
-# licensecheck -r . | sed '/UNKNOWN/ d'
-
-# To get a list, run:
-# cat licenses.txt | grep -Ev "^#" | cut -d: -f2 | sort -u
-
-# additional notes on licenses below (also commented by starting line with #):
-
-./core/vxl_copyright.h: BSD 3-Clause License
-./vcl/vcl_atomic_count.h: Boost Software License 1.0
-./config/cmake/CodeCoverage.cmake: BSD 3-Clause License
-./core/vbl/vbl_checked_delete.h: NTP License
-./core/vbl/vbl_disjoint_sets.h: *No copyright* MIT License
-./core/vbl/vbl_scoped_ptr.h: NTP License
-./core/vul/vul_ios_state.h: Boost Software License 1.0
-./scripts/gitsetup/LICENSE: *No copyright* Apache License 2.0
-./scripts/gitsetup/README: *No copyright* Apache License 2.0
-./scripts/gitsetup/git-gerrit-push: Apache License 2.0
-./scripts/gitsetup/setup-gerrit: Apache License 2.0
-./scripts/gitsetup/setup-hooks: Apache License 2.0
-./scripts/gitsetup/setup-sourceforge: Apache License 2.0
-./scripts/gitsetup/setup-ssh: Apache License 2.0
-./scripts/gitsetup/setup-stage: Apache License 2.0
-./scripts/gitsetup/setup-user: Apache License 2.0
-./scripts/gitsetup/tips: Apache License 2.0
-./v3p/clipper/License.txt: *No copyright* Boost Software License 1.0
-./v3p/clipper/clipper.cpp: Boost Software License
-./v3p/clipper/clipper.hxx: Boost Software License
-./v3p/openjpeg2/bio.c: BSD 2-Clause License
-./v3p/openjpeg2/bio.h: BSD 2-Clause License
-./v3p/openjpeg2/cio.c: BSD 2-Clause License
-./v3p/openjpeg2/cio.h: BSD 2-Clause License
-./v3p/openjpeg2/dwt.c: BSD 2-Clause License
-./v3p/openjpeg2/dwt.h: BSD 2-Clause License
-./v3p/openjpeg2/event.c: BSD 2-Clause License
-./v3p/openjpeg2/event.h: BSD 2-Clause License
-./v3p/openjpeg2/fix.h: BSD 2-Clause License
-./v3p/openjpeg2/function_list.c: BSD 2-Clause License
-./v3p/openjpeg2/function_list.h: BSD 2-Clause License
-./v3p/openjpeg2/image.c: BSD 2-Clause License
-./v3p/openjpeg2/image.h: BSD 2-Clause License
-./v3p/openjpeg2/int.h: BSD 2-Clause License
-./v3p/openjpeg2/invert.c: BSD 2-Clause License
-./v3p/openjpeg2/invert.h: BSD 2-Clause License
-./v3p/openjpeg2/j2k.c: BSD 2-Clause License
-./v3p/openjpeg2/j2k.h: BSD 2-Clause License
-./v3p/openjpeg2/j2k_lib.c: BSD 2-Clause License
-./v3p/openjpeg2/j2k_lib.h: BSD 2-Clause License
-./v3p/openjpeg2/jp2.c: BSD 2-Clause License
-./v3p/openjpeg2/jp2.h: BSD 2-Clause License
-./v3p/openjpeg2/jpt.c: BSD 2-Clause License
-./v3p/openjpeg2/jpt.h: BSD 2-Clause License
-./v3p/openjpeg2/license.txt: BSD 2-Clause License
-./v3p/openjpeg2/mct.c: BSD 2-Clause License
-./v3p/openjpeg2/mct.h: BSD 2-Clause License
-./v3p/openjpeg2/mqc.c: BSD 2-Clause License
-./v3p/openjpeg2/mqc.h: BSD 2-Clause License
-./v3p/openjpeg2/openjpeg.c: BSD 2-Clause License
-./v3p/openjpeg2/openjpeg.h: BSD 2-Clause License
-./v3p/openjpeg2/opj_includes.h: BSD 2-Clause License
-./v3p/openjpeg2/opj_malloc.h: BSD 2-Clause License
-./v3p/openjpeg2/pi.c: BSD 2-Clause License
-./v3p/openjpeg2/pi.h: BSD 2-Clause License
-./v3p/openjpeg2/profile.c: BSD 2-Clause License
-./v3p/openjpeg2/profile.h: BSD 2-Clause License
-./v3p/openjpeg2/raw.c: BSD 2-Clause License
-./v3p/openjpeg2/raw.h: BSD 2-Clause License
-./v3p/openjpeg2/t1.c: BSD 2-Clause License
-./v3p/openjpeg2/t1.h: BSD 2-Clause License
-./v3p/openjpeg2/t2.c: BSD 2-Clause License
-./v3p/openjpeg2/t2.h: BSD 2-Clause License
-./v3p/openjpeg2/tcd.c: BSD 2-Clause License
-./v3p/openjpeg2/tcd.h: BSD 2-Clause License
-./v3p/openjpeg2/tgt.c: BSD 2-Clause License
-./v3p/openjpeg2/tgt.h: BSD 2-Clause License
-./vcl/internal/vcl_atomic_count_gcc.h: Boost Software License 1.0
-./vcl/internal/vcl_atomic_count_gcc_x86.h: Boost Software License 1.0
-./vcl/internal/vcl_atomic_count_pthreads.h: Boost Software License 1.0
-./vcl/internal/vcl_atomic_count_solaris.h: Boost Software License 1.0
-./vcl/internal/vcl_atomic_count_sync.h: Boost Software License 1.0
-./vcl/internal/vcl_atomic_count_win32.h: Boost Software License 1.0
-./vcl/internal/vcl_interlocked.h: Boost Software License 1.0
-./contrib/rpl/rgtl/CMakeLists.txt: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_compact_tree.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_compact_tree.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_compact_tree_data_fixed.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_compact_tree_index.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_compact_tree_link.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_compact_tree_node_data.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_compact_tree_policy.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_config.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_license_1_0.txt: *No copyright* Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_meta.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_array.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_array_points.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_array_points.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_array_triangles_3d.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_array_triangles_3d.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_closest_polygon_3d.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_once.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_object_once.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_cell_bounds.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_cell_bounds.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_cell_geometry.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_cell_geometry.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_cell_location.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_cell_location.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_data_fixed.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_data_fixed.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_dual.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_dual_element.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_dual_index.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_dual_location.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_dual_visit.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_objects.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_objects.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_point_location.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_octree_point_location.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_separating_axis.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_separating_axis_projection.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize.txt: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_access.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_base.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_direction.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_istream.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_istream.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_ostream.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_ostream.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_split.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_stl_vector.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_vnl_double_3.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_serialize_vnl_vector_fixed.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_base.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_base.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_cell_bounds.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_cell_bounds.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_cell_geometry.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_cell_geometry.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_cell_location.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_cell_location.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_object_array.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_object_array_triangles_3d.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_object_array_triangles_3d.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_objects.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_objects.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_space.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_sqt_space.hxx: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_static_assert.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_tagged_index.h: Boost Software License 1.0
-./contrib/rpl/rgtl/rgtl_tagged_vector.h: Boost Software License 1.0
-./contrib/rpl/rtvl/CMakeLists.txt: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_intpow.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_license_1_0.txt: *No copyright* Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_refine.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_refine.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_tensor.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_tensor.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_tensor_d.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_tensor_d.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_terms.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_tokens.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_vote.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_vote.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_votee.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_votee.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_votee_d.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_votee_d.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_voter.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_voter.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_weight.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_weight_original.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_weight_original.hxx: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_weight_smooth.h: Boost Software License 1.0
-./contrib/rpl/rtvl/rtvl_weight_smooth.hxx: Boost Software License 1.0
-./core/doc/book/chapter_vnl.texi: *No copyright* Public domain
-./core/vil/file_formats/viffheader.h.original: NTP License (legal disclaimer)
-./core/vil/file_formats/vil_viffheader.h: NTP License (legal disclaimer)
-./core/vil1/file_formats/vil1_viff_support.c: NTP License (legal disclaimer)
-./core/vil1/file_formats/vil1_viffheader.h: NTP License (legal disclaimer)
-./v3p/netlib/libf2c/Notice: Standard ML of New Jersey License
-./v3p/netlib/libf2c/arithchk.c: Standard ML of New Jersey License
-./v3p/netlib/linalg/lsmrBase.cxx: Apache License 2.0
-./v3p/netlib/linalg/lsmrBase.h: Apache License 2.0
-./v3p/netlib/linalg/lsmrDense.cxx: Apache License 2.0
-./v3p/netlib/linalg/lsmrDense.h: Apache License 2.0
-./v3p/netlib/linalg/lsqrBase.cxx: Apache License 2.0
-./v3p/netlib/linalg/lsqrBase.h: Apache License 2.0
-./v3p/netlib/linalg/lsqrDense.cxx: Apache License 2.0
-./v3p/netlib/linalg/lsqrDense.h: Apache License 2.0
-./v3p/netlib/tests/lsmrTest2.cxx: Apache License 2.0
-./v3p/netlib/tests/lsqrTest1.cxx: Apache License 2.0
-./v3p/netlib/tests/lsqrTest2.cxx: Apache License 2.0
-./v3p/netlib/tests/tricall.c: *No copyright* Public domain
-./contrib/brl/bbas/bjson/bjsoncpp.cxx: MIT License
-./contrib/brl/bbas/bjson/jsoncpp.cxx: MIT License
-./contrib/brl/bbas/bnabo/bnabo.cxx: BSD 3-Clause License
-./contrib/brl/bbas/bnabo/bnabo.h: BSD 3-Clause License
-./contrib/brl/bbas/bnabo/bnabo_brute_force.cxx: BSD 3-Clause License
-./contrib/brl/bbas/bnabo/bnabo_index_heap.h: BSD 3-Clause License
-./contrib/brl/bbas/bnabo/bnabo_kdd_tree.cxx: BSD 3-Clause License
-./contrib/brl/bbas/bnabo/bnabo_private.h: BSD 3-Clause License
-./contrib/mul/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
-./contrib/rpl/rgtl/tests/CMakeLists.txt: Boost Software License 1.0
-./contrib/rpl/rgtl/tests/test_compact_tree_data_fixed.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/tests/test_driver.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/tests/test_octree_data_fixed.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/tests/test_octree_dual_visit.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/tests/test_octree_objects.cxx: Boost Software License 1.0
-./contrib/rpl/rgtl/tests/test_sqt_base.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_refine+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_refine+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_tensor+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_tensor+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_tensor_d+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_tensor_d+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_vote+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_vote+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_votee+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_votee+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_votee_d+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_votee_d+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_voter+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_voter+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_weight_original+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_weight_original+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_weight_smooth+2-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/Templates/rtvl_weight_smooth+3-.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/examples/rtvl_hello.cxx: Boost Software License 1.0
-./contrib/rpl/rtvl/examples/rtvl_saliency_image.cxx: Boost Software License 1.0
-./contrib/tbl/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
-./v3p/dcmtk/ofstd/libsrc/ofstd.cxx: BSD 3-Clause License and/or NTP License
-
-./contrib/brl/bbas/bil/algo/bil_edt.h: *No copyright* GNU Lesser General Public License [generated file]
-# ^
-# Not under this license. The text says:
-# //  Implementation influenced by the LTI lib, which is licensed under LGPL:
-# //    http://ltilib.sourceforge.net
-
-./contrib/brl/bseg/boxm2/doc/book/atexinfo.tex: GNU General Public License v2.0 or later
-./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.cookie-min.js: MIT License
-./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.disabletextselect-min.js: MIT License
-./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.min.js: MIT License
-./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.mousewheel-min.js: MIT License
-./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/jquery.reel-min.js: MIT License
-./contrib/brl/bseg/boxm2/ocl/exe/auxiliary/js/miniZoomPan.js: *No copyright* MIT License

sources

@@ -1 +1 @@
-SHA512 (vxl-3.5.0-clean.tar.gz) = cb5eaf88e689216b9de56f9a9e07e2a6a8ce4469d0b990f847e8f1060b0a0d6e621ef128c9878a26cef8816b0efd7e99bcca8bc65a43e091f3650158425ebde9
+SHA512 (vxl-2.0.2-clean.tar.gz) = d8cad8ca6851641bb4c3398b8bf5e3df45a7414fd736acf8e75b79bdd5d18ec3aae4edac5b4c66d98fc499f411a25a443f046859a3544e45228f468052ec79ee