2016-10-19: Retired orphaned package, because it was orphaned for

more than six weeks.
2016-10-19 08:47:16 +02:00
24 changed files with 3 additions and 29588 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +0,0 @@
-/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
--- a/0001-v3.5.0-unbundle-rply.patch
+++ b/0001-v3.5.0-unbundle-rply.patch
--- a/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
+++ b/0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
@ -1,923 +0,0 @@
-From 26d548e302e9fa1bcc2986ba91f12313ccb00829 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
-
---
- CMakeLists.txt                                |  2 +
- config/cmake/fedora-modules/FindEXPATPP.cmake | 37 +++++++++++++++++
- contrib/brl/b3p/expat/CMakeLists.txt          |  3 +-
- contrib/brl/b3p/expatpp/CMakeLists.txt        | 22 +---------
- contrib/brl/bbas/bhdfs/pro/CMakeLists.txt     |  3 +-
- contrib/brl/bbas/bkml/CMakeLists.txt          |  2 +-
- contrib/brl/bbas/bocl/pro/CMakeLists.txt      |  3 +-
- contrib/brl/bbas/bvgl/CMakeLists.txt          |  3 +-
- contrib/brl/bbas/bvgl/bvgl_labelme_parser.h   |  2 +-
- contrib/brl/bbas/bvgl/tests/CMakeLists.txt    |  3 +-
- contrib/brl/bbas/bwm/CMakeLists.txt           |  3 +-
- contrib/brl/bbas/bwm/io/CMakeLists.txt        |  3 +-
- contrib/brl/bbas/bwm/pro/CMakeLists.txt       |  3 +-
- contrib/brl/bbas/bwm/video/CMakeLists.txt     |  3 +-
- contrib/brl/bbas/bwm/video/exe/CMakeLists.txt |  3 +-
- contrib/brl/bbas/bxml/CMakeLists.txt          |  9 ++--
- contrib/brl/bbas/volm/CMakeLists.txt          |  3 +-
- contrib/brl/bbas/volm/volm_osm_parser.h       |  2 +-
- contrib/brl/bmods/FindEXPAT.cmake             | 41 ++-----------------
- contrib/brl/bpro/CMakeLists.txt               |  3 +-
- contrib/brl/bpro/bprb/tests/CMakeLists.txt    |  6 ++-
- contrib/brl/bseg/bbgm/pro/CMakeLists.txt      |  3 +-
- contrib/brl/bseg/bbgm_batch/CMakeLists.txt    |  3 +-
- 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/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 +-
- 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/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 +-
- 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 +-
- 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_bridge/CMakeLists.txt   |  3 +-
- contrib/brl/bseg/vcon/CMakeLists.txt          |  3 +-
- 54 files changed, 144 insertions(+), 109 deletions(-)
- create mode 100644 config/cmake/fedora-modules/FindEXPATPP.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e5de354156..e52a8c0abb 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}")
- 
-+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
-+
- include(CMakeDependentOption)
- include(${CMAKE_CURRENT_SOURCE_DIR}/config/cmake/VXLInitializeBuildType.cmake)
- 
-diff --git a/config/cmake/fedora-modules/FindEXPATPP.cmake b/config/cmake/fedora-modules/FindEXPATPP.cmake
-new file mode 100644
-index 0000000000..88a29681aa
--- /dev/null
-+++ b/config/cmake/fedora-modules/FindEXPATPP.cmake
-@@ -0,0 +1,37 @@
-+# Adapted from https://github.com/jirihnidek/verse-ply-uploader/blob/master/build_files/cmake/modules/FindEXPATPP.cmake
-+# This module tries to find EXPATPP library and include files
-+#
-+# EXPATPP_INCLUDE_DIR, where to find verse.h
-+# EXPATPP_LIBRARY_DIR, where to find libverse.so
-+# EXPATPP_LIBRARIES, the library to link against
-+# EXPATPP_FOUND, IF false, do not try to use Verse
-+#
-+
-+FIND_PATH ( EXPATPP_INCLUDE_DIR expatpp.h
-+    /usr/include
-+    /usr/include/expatpp
-+    /usr/local/include
-+    /usr/local/include/expatpp
-+)
-+
-+FIND_LIBRARY ( EXPATPP_LIBRARIES
-+    NAMES expatpp libexpatpp
-+    PATHS /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64
-+)
-+
-+GET_FILENAME_COMPONENT( EXPATPP_LIBRARY_DIR ${EXPATPP_LIBRARIES} PATH )
-+
-+SET ( EXPATPP_FOUND "NO" )
-+IF ( EXPATPP_INCLUDE_DIR )
-+    IF ( EXPATPP_LIBRARIES )
-+        SET ( EXPATPP_LIBRARY ${EXPATPP_LIBRARIES} )
-+        SET ( EXPATPP_FOUND "YES" )
-+    ENDIF ( EXPATPP_LIBRARIES )
-+ENDIF ( EXPATPP_INCLUDE_DIR )
-+
-+MARK_AS_ADVANCED (
-+    EXPATPP_LIBRARY_DIR
-+    EXPATPP_INCLUDE_DIR
-+    EXPATPP_LIBRARIES
-+    EXPATPP_LIBRARY
-+)
-diff --git a/contrib/brl/b3p/expat/CMakeLists.txt b/contrib/brl/b3p/expat/CMakeLists.txt
-index dad475e211..d64a8f3832 100644
--- a/contrib/brl/b3p/expat/CMakeLists.txt
-+++ b/contrib/brl/b3p/expat/CMakeLists.txt
-@@ -1,7 +1,8 @@
- project(expat C)
- #include_regular_expression("^.*$")
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(NOT VXL_USING_NATIVE_EXPAT)
- 
-   if(WIN32)
-diff --git a/contrib/brl/b3p/expatpp/CMakeLists.txt b/contrib/brl/b3p/expatpp/CMakeLists.txt
-index 4959c123c3..f25323d0de 100644
--- a/contrib/brl/b3p/expatpp/CMakeLists.txt
-+++ b/contrib/brl/b3p/expatpp/CMakeLists.txt
-@@ -1,22 +1,4 @@
- #This is brl/b3p/expatpp
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-if( EXPAT_FOUND )
-
-  if( VXL_USING_NATIVE_EXPAT )
-    include_directories( ${EXPAT_INCLUDE_DIR} )
-  else()
-    include_directories( ${BRL_BINARY_DIR}/b3p/expat )
-  endif()
-
-  set( expatpp_sources expatpp.h expatpp.cpp expatpplib.h )
-
-  vxl_add_library(LIBRARY_NAME expatpp LIBRARY_SOURCES ${expatpp_sources} )
-  target_link_libraries( expatpp ${EXPAT_LIBRARIES} )
-
-  if( BUILD_TESTING )
-    add_subdirectory(tests)
-  endif()
-
-
-endif()
-+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
--- a/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
-+++ b/contrib/brl/bbas/bhdfs/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # bhdfs's Process Library
- 
- # bprb depends on expat and bhdfs_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/bbas/bkml/CMakeLists.txt b/contrib/brl/bbas/bkml/CMakeLists.txt
-index 6328cfd419..bb6a65f96d 100644
--- a/contrib/brl/bbas/bkml/CMakeLists.txt
-+++ b/contrib/brl/bbas/bkml/CMakeLists.txt
-@@ -5,7 +5,7 @@ set(bkml_sources
-   bkml_write.h bkml_write.cxx
- )
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
- 
- 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
--- a/contrib/brl/bbas/bocl/pro/CMakeLists.txt
-+++ b/contrib/brl/bbas/bocl/pro/CMakeLists.txt
-@@ -1,5 +1,6 @@
- # bprb depends on expat and boxm_ocl_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/bbas/bvgl/CMakeLists.txt b/contrib/brl/bbas/bvgl/CMakeLists.txt
-index c4da5b9d28..260bcf1d88 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)
- 
- 
- #find expatpp library for
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   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
--- a/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-+++ b/contrib/brl/bbas/bvgl/bvgl_labelme_parser.h
-@@ -14,7 +14,7 @@
- #include <string>
- #include <iostream>
- #include <sstream>
-#include <expatpplib.h>
-+#include <expatpp.h>
- #ifdef _MSC_VER
- #  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
--- a/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-+++ b/contrib/brl/bbas/bvgl/tests/CMakeLists.txt
-@@ -16,7 +16,8 @@ set(bvgl_test_sources
- )
- 
- #Make sure expat library is found
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- 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
--- a/contrib/brl/bbas/bwm/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/CMakeLists.txt
-@@ -26,7 +26,8 @@ endif()
- 
- include( ${BRL_MODULE_PATH}/FindSHAPELIB.cmake )
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- # 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
--- a/contrib/brl/bbas/bwm/io/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/io/CMakeLists.txt
-@@ -8,7 +8,8 @@ set(bwm_io_sources
- )
- aux_source_directory(Templates bwm_io_sources)
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- 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
--- a/contrib/brl/bbas/bwm/pro/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/pro/CMakeLists.txt
-@@ -9,7 +9,8 @@ set(bwm_pro_sources
-     bwm_register.h    bwm_register.cxx
- )
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- 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
--- a/contrib/brl/bbas/bwm/video/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/video/CMakeLists.txt
-@@ -11,7 +11,8 @@ set(bwm_video_sources
-                                  bwm_video_site_io_defs.h
- )
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- 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
--- a/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/video/exe/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # This is contrib/bwm/exe/CMakeLists.txt
- # World Modeling GUI executables
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- 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
--- a/contrib/brl/bbas/bxml/CMakeLists.txt
-+++ b/contrib/brl/bbas/bxml/CMakeLists.txt
-@@ -12,7 +12,8 @@ set( bxml_sources
-     bxml_find.cxx                bxml_find.h
- )
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- if(EXPAT_FOUND)
-  if(EXPATPP_FOUND)
-@@ -28,13 +29,15 @@ aux_source_directory(Templates bxml_sources)
- 
- vxl_add_library(LIBRARY_NAME bxml LIBRARY_SOURCES ${bxml_sources})
- 
-target_link_libraries( bxml ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
- if(EXPAT_FOUND)
-  if(EXPATPP_FOUND)
-  target_link_libraries( bxml ${EXPATPP_LIBRARIES})
-+  target_link_libraries( bxml ${EXPATPP_LIBRARIES} ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
-  endif()
-+else()
-+  target_link_libraries( bxml ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl )
- endif()
- 
-+
- add_subdirectory(bsvg)
- 
- if( BUILD_TESTING )
-diff --git a/contrib/brl/bbas/volm/CMakeLists.txt b/contrib/brl/bbas/volm/CMakeLists.txt
-index 72b3b217ea..fe8cf45b75 100644
--- a/contrib/brl/bbas/volm/CMakeLists.txt
-+++ b/contrib/brl/bbas/volm/CMakeLists.txt
-@@ -6,7 +6,8 @@
- include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
- if(HAS_GEOTIFF)
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   if(EXPATPP_FOUND)
- 
-diff --git a/contrib/brl/bbas/volm/volm_osm_parser.h b/contrib/brl/bbas/volm/volm_osm_parser.h
-index 82283250dd..289d5d5265 100644
--- a/contrib/brl/bbas/volm/volm_osm_parser.h
-+++ b/contrib/brl/bbas/volm/volm_osm_parser.h
-@@ -20,7 +20,7 @@
- #include <map>
- #include <vector>
- #include <utility>
-#include <expatpplib.h>
-+#include <expatpp.h>
- #ifdef _MSC_VER
- #  include <vcl_msvc_warnings.h>
- #endif
-diff --git a/contrib/brl/bmods/FindEXPAT.cmake b/contrib/brl/bmods/FindEXPAT.cmake
-index 2be7c9a963..cefa9c0a0e 100644
--- a/contrib/brl/bmods/FindEXPAT.cmake
-+++ b/contrib/brl/bmods/FindEXPAT.cmake
-@@ -27,6 +27,10 @@ if(NOT EXPAT_FOUND)
-     if(EXPAT_FOUND)
-       set(VXL_USING_NATIVE_EXPAT "YES")
-     endif()
-+    find_package(EXPATPP)
-+    if(EXPATPP_FOUND)
-+      set(VXL_USING_NATIVE_EXPATPP "YES")
-+    endif()
-   endif()
- 
- 
-@@ -48,40 +52,3 @@ if(NOT EXPAT_FOUND)
- 
- endif()
- #mark_as_advanced(EXPAT_INCLUDE_DIR EXPAT_LIBRARY)
-
-if(EXPAT_FOUND) # EXPATPP requires EXPAT
-  find_path(EXPATPP_SYSTEM_INCLUDE_DIR NAMES expatpp.h )
-  find_library(EXPATPP_SYSTEM_LIBRARY NAMES expatpp libexpatpp )
-
-  if( EXPATPP_SYSTEM_INCLUDE_DIR AND EXPATPP_SYSTEM_LIBRARY )
-    set(VXL_USING_NATIVE_EXPATPP "YES")
-    set(EXPATPP_LIBRARIES ${EXPATPP_SYSTEM_LIBRARY})
-    set(EXPATPP_INCLUDE_DIRS ${EXPATPP_SYSTEM_INCLUDE_DIR})
-  else()
-    set(VXL_USING_NATIVE_EXPATPP NO)
-    if(EXISTS ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp/expatpp.h)
-      set( EXPATPP_FOUND YES )
-      set( EXPATPP_LIBRARIES expatpp )
-      set( EXPATPP_LIBRARY expatpp )
-      set( EXPATPP_INCLUDE_DIRS ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp ${BRL_BINARY_DIR}/b3p/expatpp )
-      set( EXPATPP_INCLUDE_DIR ${VXL_ROOT_SOURCE_DIR}/contrib/brl/b3p/expatpp ${BRL_BINARY_DIR}/b3p/expatpp )
-      set( EXPATPP_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/vxl/contrib/brl/b3p/expatpp)
-    else()
-      unset(EXPATPP_SYSTEM_INCLUDE_DIR) #If not found, keep out of cmake window
-      unset(EXPATPP_SYSTEM_LIBRARY)  # If not found, keep out of cmake window
-      unset(EXPATPP_LIBRARIES)
-      unset(EXPATPP_INCLUDE_DIRS)
-      unset(EXPAT_FOUND)
-      unset(EXPATPP_FOUND)
-    endif()
-  endif()
-
-  include(FindPackageHandleStandardArgs)
-  # FOUND_VAR EXPATPP_FOUND  not supported in cmake 2.8.9
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS( EXPATPP
-             REQUIRED_VARS EXPATPP_LIBRARY EXPATPP_INCLUDE_DIR
-             FAIL_MESSAGE "MISSING: "
-     )
-endif()
-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
--- a/contrib/brl/bpro/CMakeLists.txt
-+++ b/contrib/brl/bpro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # brl/bpro/CMakeLists.txt
- # main package for processing operations
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
- 
- # 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
--- a/contrib/brl/bpro/bprb/tests/CMakeLists.txt
-+++ b/contrib/brl/bpro/bprb/tests/CMakeLists.txt
-@@ -1,6 +1,10 @@
- # brl/bpro/bprb/tests/CMakeLists.txt
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/params.xml
-                 ${CMAKE_CURRENT_BINARY_DIR}/params.xml)
-+
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
-+
- if(EXPAT_FOUND)
-  if(EXPATPP_FOUND)
- 
-@@ -10,7 +14,7 @@ if(EXPAT_FOUND)
-    test_process_params.cxx
-    bprb_test_process.h bprb_test_process.cxx
-   )
-  target_link_libraries( bprb_test_all bprb ${VXL_LIB_PREFIX}testlib expat expatpp)
-+  target_link_libraries( bprb_test_all bprb ${VXL_LIB_PREFIX}testlib ${EXPAT_LIBRARIES} ${EXPATPP_LIBRARIES})
- 
-   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
--- a/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bbgm/pro/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # brl/bseg/bbgm/pro/CMakeLists.txt
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
- 
- 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
--- 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( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT 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
--- a/contrib/brl/bseg/betr_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/betr_batch/CMakeLists.txt
-@@ -2,7 +2,8 @@
- project( betr_batch )
- 
- if( PYTHONLIBS_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/bmdl/pro/CMakeLists.txt b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-index 76fe0891b7..7c73fe1bb0 100644
--- a/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bmdl/pro/CMakeLists.txt
-@@ -9,7 +9,8 @@ if(ZLIB_FOUND)
- endif()
- 
- # bprb depends on expat and bmdl_prodepends on bprb primarily
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   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
--- 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( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-+  FIND_PACKAGE(EXPATPP REQUIRED)
-   if( EXPAT_FOUND )
-    if(EXPATPP_FOUND)
-     include(${VXL_CMAKE_DIR}/FindTIFF.cmake)
-diff --git a/contrib/brl/bseg/boxm2/CMakeLists.txt b/contrib/brl/bseg/boxm2/CMakeLists.txt
-index 4475e418be..476d43b151 100644
--- a/contrib/brl/bseg/boxm2/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/CMakeLists.txt
-@@ -21,7 +21,8 @@ set(boxm2_sources
-     boxm2_blocks_vis_graph.h          boxm2_blocks_vis_graph.cxx
-    )
- 
-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/boxm2/boxm2_bounding_box_parser.h b/contrib/brl/bseg/boxm2/boxm2_bounding_box_parser.h
-index d87dc359fe..94f764c61d 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 @@
- #include <string>
- #include <iostream>
- #include <map>
-#include <expatpplib.h>
-+#include <expatpp.h>
- 
- #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
--- a/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
-+++ b/contrib/brl/bseg/boxm2/boxm2_scene_parser.h
-@@ -4,7 +4,7 @@
- #include <string>
- #include <iostream>
- #include <map>
-#include <expatpplib.h>
-+#include <expatpp.h>
- 
- #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
--- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # boxm2's Process Library
- 
- # bprb depends on expat and boxm2_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/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
--- 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>
- #include <bmsh3d/algo/bmsh3d_fileio.h>
- #include <bmsh3d/bmsh3d_mesh_mc.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
--- a/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/volm/CMakeLists.txt
-@@ -1,6 +1,7 @@
- # This is contrib/brl/bseg/boxm2/volm/CMakeLists
- # volm depends on bkml and expat
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   if(EXPATPP_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
--- a/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/volm/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # boxm2's Process Library
- 
- # bprb depends on expat and boxm2_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/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
--- 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 )
- include( ${VXL_CMAKE_DIR}/UseVGUI.cmake )
- 
- if( PYTHONLIBS_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/boxm2_multi/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
-index c0330db1e2..68ab30dffc 100644
--- a/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2_multi/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # boxm2 multi gpu or cpu Process Library
- 
- # bprb depends on expat and boxm2_multi_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}/bseg )
-   set(boxm2_multi_pro_sources
-diff --git a/contrib/brl/bseg/brec_batch/CMakeLists.txt b/contrib/brl/bseg/brec_batch/CMakeLists.txt
-index a3ab77b316..e228152f4b 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( ${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/bstm/CMakeLists.txt b/contrib/brl/bseg/bstm/CMakeLists.txt
-index 977d68fdab..77205c2e6b 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
-                  bstm_time_block.h bstm_time_block.cxx
-                  bstm_util.cxx bstm_util.h)
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   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
--- a/contrib/brl/bseg/bstm/bstm_scene_parser.h
-+++ b/contrib/brl/bseg/bstm/bstm_scene_parser.h
-@@ -4,7 +4,7 @@
- #include <string>
- #include <iostream>
- #include <map>
-#include <expatpplib.h>
-+#include <expatpp.h>
- 
- #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
--- a/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-+++ b/contrib/brl/bseg/bstm_batch/CMakeLists.txt
-@@ -10,7 +10,8 @@ if(DIRECTSHOW_FOUND)
- endif()
- 
- if( PYTHONLIBS_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/bstm_multi/CMakeLists.txt b/contrib/brl/bseg/bstm_multi/CMakeLists.txt
-index ba8815fe6b..1f57d0d958 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
-   space_time_scene_parser.h space_time_scene_parser.hxx
-   )
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if (EXPAT_FOUND)
-   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
--- 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 @@
- #include <map>
- #include <string>
- #include <vector>
-#include <expatpplib.h>
-+#include <expatpp.h>
- 
- #ifdef _MSC_VER
- #  include <vcl_msvc_warnings.h>
-diff --git a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-index 25433e56f2..f3659d5390 100644
--- a/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/functors/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
- # The kernel-related files for Brown Voxel Processing Library (BVPL)
- 
-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/bvpl/kernels/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-index 0672b5d3d8..615f02e3fa 100644
--- a/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # This is contrib/brl/bseg/bvpl/kernels/CMakeLists.txt
- # The kernel-related files for Brown Voxel Processing Library (BVPL)
- 
-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/bvpl/kernels/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-index 82ce0655e0..3e7108103d 100644
--- a/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/kernels/pro/CMakeLists.txt
-@@ -2,7 +2,8 @@
- # BVPL kenel's related processes
- 
- # 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/pro/CMakeLists.txt b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
-index 3f4b2b26bc..03b7df907e 100644
--- a/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvpl/pro/CMakeLists.txt
-@@ -2,7 +2,8 @@
- # bvpl's Process Library
- 
- # bprb depends on expat and bvpl_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_batch/CMakeLists.txt b/contrib/brl/bseg/bvpl_batch/CMakeLists.txt
-index 754741a408..9c629d4e5e 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( ${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
--- a/contrib/brl/bseg/bvxm/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/CMakeLists.txt
-@@ -38,7 +38,8 @@ set(bvxm_sources
- aux_source_directory(Templates bvxm_sources)
- 
- #find expatpp library for bvxm_world_params parser
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   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
--- a/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/algo/pro/CMakeLists.txt
-@@ -1,7 +1,8 @@
- # bvxm_algo Process Library
- 
- # bprb depends on expat and this process library depends on bprb
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
-  if(EXPAT_FOUND)
-  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
--- a/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
-+++ b/contrib/brl/bseg/bvxm/bvxm_world_params_parser.h
-@@ -6,7 +6,7 @@
- #include <string>
- #include <iostream>
- #include <sstream>
-#include <expatpplib.h>
-+#include <expatpp.h>
- #ifdef _MSC_VER
- #  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
--- a/contrib/brl/bseg/bvxm/grid/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/grid/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/bvxm/pro/CMakeLists.txt b/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
-index 6c98f11cc3..e5b88b5aff 100644
--- a/contrib/brl/bseg/bvxm/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm/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( ${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
--- 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 )
-+  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_bridge/CMakeLists.txt b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-index 76defad7a7..1cfd293103 100644
--- a/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-+++ b/contrib/brl/bseg/bvxm_bridge/CMakeLists.txt
-@@ -5,7 +5,8 @@ if(OpenCL_FOUND)
-   include_directories( ${MUL_INCLUDE_DIR} )
- 
-   #find expatpp library
-  include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+  FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
-   if(EXPAT_FOUND)
-     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
--- a/contrib/brl/bseg/vcon/CMakeLists.txt
-+++ b/contrib/brl/bseg/vcon/CMakeLists.txt
-@@ -4,7 +4,8 @@
- include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake)
- if(HAS_GEOTIFF)
- 
-include( ${BRL_MODULE_PATH}/FindEXPAT.cmake )
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- if(EXPAT_FOUND)
-   if(EXPATPP_FOUND)
-     include_directories( ${BRL_INCLUDE_DIR} )
-- 
-2.46.1
-
--- a/0003-v3.5.0-Use-Fedora-minizip.patch
+++ b/0003-v3.5.0-Use-Fedora-minizip.patch
@ -1,37 +0,0 @@
-From c0cc5459f8ee3dfc40cefb26487a1449d5100d8e 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
-
---
- contrib/brl/b3p/CMakeLists.txt                                | 4 ----
- .../bseg/bmdl/pro/processes/bmdl_generate_mesh_process.cxx    | 1 +
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/contrib/brl/b3p/CMakeLists.txt b/contrib/brl/b3p/CMakeLists.txt
-index 7fefd89f41..b2f4b5f6bd 100644
--- a/contrib/brl/b3p/CMakeLists.txt
-+++ b/contrib/brl/b3p/CMakeLists.txt
-@@ -19,7 +19,3 @@ add_subdirectory(expatpp)
- option( VXL_FORCE_B3P_SHAPELIB "Use B3P instead of any native SHAPELIB library?" YES)
- mark_as_advanced( VXL_FORCE_B3P_SHAPELIB )
- add_subdirectory(shapelib)
-
-add_subdirectory(minizip)
-
-
-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
--- 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 @@
- 
- #if HAS_ZLIB
- #include <minizip/zip.h>
-+#include <zlib.h>
- #endif
- 
- #define WRITEBUFFERSIZE (16384)
-- 
-2.46.1
-
--- a/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
+++ b/0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
@ -1,108 +0,0 @@
-From 04c541d97aeb5ccc75615dd537e8a64c1e1f3814 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
-
---
- CMakeLists.txt                                |  3 +-
- config/cmake/fedora-modules/FindRPLY.cmake    | 39 +++++++++++++++++++
- contrib/brl/bbas/bmsh3d/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(-)
- create mode 100644 config/cmake/fedora-modules/FindRPLY.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e52a8c0abb..e1aa0390d4 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,7 +142,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?
-set( MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/config/cmake/Modules CACHE STATIC "VXL module path" )
-+set( MODULE_PATH "${CMAKE_SOURCE_DIR}/config/cmake/Modules" CACHE PATH "VXL module path" )
-+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/cmake/fedora-modules")
- 
- # Options to add extra compiler and linker flags
- #
-diff --git a/config/cmake/fedora-modules/FindRPLY.cmake b/config/cmake/fedora-modules/FindRPLY.cmake
-new file mode 100644
-index 0000000000..abe415bd9e
--- /dev/null
-+++ b/config/cmake/fedora-modules/FindRPLY.cmake
-@@ -0,0 +1,39 @@
-+# Adapted from https://github.com/jirihnidek/verse-ply-uploader/blob/master/build_files/cmake/modules/FindRPLY.cmake
-+# This module tries to find RPLY library and include files
-+#
-+# RPLY_INCLUDE_DIR, where to find verse.h
-+# RPLY_LIBRARY_DIR, where to find libverse.so
-+# RPLY_LIBRARIES, the library to link against
-+# RPLY_FOUND, IF false, do not try to use Verse
-+#
-+
-+FIND_PATH ( RPLY_INCLUDE_DIR rply.h
-+    /usr/include
-+    /usr/include/rply
-+    /usr/local/include
-+    /usr/local/include/rply
-+)
-+
-+FIND_LIBRARY ( RPLY_LIBRARIES rply
-+    /usr/local/lib
-+    /usr/local/lib64
-+    /usr/lib
-+    /usr/lib64
-+)
-+
-+GET_FILENAME_COMPONENT( RPLY_LIBRARY_DIR ${RPLY_LIBRARIES} PATH )
-+
-+SET ( RPLY_FOUND "NO" )
-+IF ( RPLY_INCLUDE_DIR )
-+    IF ( RPLY_LIBRARIES )
-+        SET ( RPLY_LIBRARY ${RPLY_LIBRARIES} )
-+        SET ( RPLY_FOUND "YES" )
-+    ENDIF ( RPLY_LIBRARIES )
-+ENDIF ( RPLY_INCLUDE_DIR )
-+
-+MARK_AS_ADVANCED (
-+    RPLY_LIBRARY_DIR
-+    RPLY_INCLUDE_DIR
-+    RPLY_LIBRARIES
-+    RPLY_LIBRARY
-+)
-diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-index 662ec284e9..1c2e6a7089 100644
--- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-+++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # This is bbas/bmsh3d/algo/CMakeLists.txt
- # Brown 3D Mesh Algorithm Library
-FIND_PACKAGE(rply REQUIRED)
-+FIND_PACKAGE(RPLY REQUIRED)
- 
- include_directories( ${BRL_INCLUDE_DIR} )
- include_directories( ${RPLY_INCLUDE_DIR} )
-diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-index fff9ae2d84..d7ef6ed5fa 100644
--- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt
-@@ -1,4 +1,4 @@
-FIND_PACKAGE(rply REQUIRED)
-+FIND_PACKAGE(RPLY REQUIRED)
- 
- 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
--- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt
-@@ -1,4 +1,4 @@
-FIND_PACKAGE(rply REQUIRED)
-+FIND_PACKAGE(RPLY REQUIRED)
- 
- include_directories( ${BRL_INCLUDE_DIR}/bseg )
- include_directories( ${MUL_INCLUDE_DIR} )
-- 
-2.46.1
-
--- a/0005-v3.5.0-fix-bkml-test.patch
+++ b/0005-v3.5.0-fix-bkml-test.patch
@ -1,58 +0,0 @@
-From 8697b5c51bf883e04634d49c45421f2776f59fd3 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
-
---
- contrib/brl/bbas/bkml/CMakeLists.txt       |  1 +
- contrib/brl/bbas/bkml/tests/CMakeLists.txt | 20 ++++++++++++++++----
- 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
--- a/contrib/brl/bbas/bkml/CMakeLists.txt
-+++ b/contrib/brl/bbas/bkml/CMakeLists.txt
-@@ -6,6 +6,7 @@ set(bkml_sources
- )
- 
- FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- 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
--- a/contrib/brl/bbas/bkml/tests/CMakeLists.txt
-+++ b/contrib/brl/bbas/bkml/tests/CMakeLists.txt
-@@ -1,12 +1,24 @@
- # This is contrib/brl/bbas/bkml/tests/CMakeLists.txt
-+FIND_PACKAGE(EXPAT REQUIRED)
-+FIND_PACKAGE(EXPATPP REQUIRED)
- 
- add_executable(bkml_test_all
-                 test_driver.cxx
-                 test_bkml.cxx
-               )
- 
-target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
-add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
-+if(EXPAT_FOUND)
-+  if(EXPATPP_FOUND)
-+    target_link_libraries(bkml_test_all bkml expatpp expat ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
-+    add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
- 
-add_executable(bkml_test_include test_include.cxx )
-target_link_libraries( bkml_test_include bkml )
-+    add_executable(bkml_test_include test_include.cxx )
-+    target_link_libraries( bkml_test_include bkml expatpp expat)
-+  endif()
-+else()
-+  target_link_libraries(bkml_test_all bkml ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}testlib )
-+  add_test( NAME bkml_test_bkml COMMAND $<TARGET_FILE:bkml_test_all> test_bkml)
-+
-+  add_executable(bkml_test_include test_include.cxx )
-+  target_link_libraries( bkml_test_include bkml )
-+endif()
-- 
-2.46.1
-
--- a/0006-v3.5.0-Correct-rply-includedir.patch
+++ b/0006-v3.5.0-Correct-rply-includedir.patch
@ -1,114 +0,0 @@
-From 2252a472803e52dd504e243593f32f4312342591 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
-
---
- 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(-)
-
-diff --git a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
-index c1c82d0dd4..3a82f2e050 100644
--- a/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
-+++ b/contrib/brl/bbas/bvrml/pro/CMakeLists.txt
-@@ -4,7 +4,13 @@ if (HAS_GEOTIFF)
- include_directories( ${BRL_INCLUDE_DIR}/bpro )
- include_directories( ${BRL_INCLUDE_DIR}/bpro/bprb )
- include_directories( ${BRL_INCLUDE_DIR}/bbas )
-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+
-+FIND_PACKAGE(RPLY REQUIRED)
-+if(RPLY_FOUND)
-+  include_directories( ${RPLY_INCLUDE_DIR} )
-+else()
-+  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+endif()
- 
- 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
--- a/contrib/brl/bbas/bwm/exe/CMakeLists.txt
-+++ b/contrib/brl/bbas/bwm/exe/CMakeLists.txt
-@@ -1,7 +1,13 @@
- # This is brl/bbas/bwm/exe/CMakeLists.txt
- # World Modeling GUI executables
- 
-include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+FIND_PACKAGE(RPLY REQUIRED)
-+if(RPLY_FOUND)
-+  include_directories( ${RPLY_INCLUDE_DIR} )
-+else()
-+  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+endif()
-+
- include_directories( ${MUL_INCLUDE_DIR} )
- 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
--- a/contrib/brl/bbas/volm/pro/CMakeLists.txt
-+++ b/contrib/brl/bbas/volm/pro/CMakeLists.txt
-@@ -4,7 +4,13 @@ if(VXL_BUILD_RPL)
- include_directories( ${BRL_INCLUDE_DIR}/bbas )
- include_directories( ${BRL_INCLUDE_DIR}/bpro/core )
- include_directories( ${MUL_INCLUDE_DIR} )
-include_directories( ${VTHREEP_INCLUDE_DIR}/rply)
-+
-+FIND_PACKAGE(RPLY REQUIRED)
-+if(RPLY_FOUND)
-+  include_directories( ${RPLY_INCLUDE_DIR} )
-+else()
-+  include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+endif()
- 
-   # The N-dimensional bin structure implementations use rpl/rsdl
- 
-diff --git a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-index 7c2ec1d9c3..0536e327fd 100644
--- a/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-+++ b/contrib/brl/bseg/boxm2/pro/CMakeLists.txt
-@@ -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 )
-+
-+FIND_PACKAGE(RPLY REQUIRED)
-+if(RPLY_FOUND)
-+  include_directories( ${RPLY_INCLUDE_DIR} )
-+else()
-   include_directories( ${VTHREEP_INCLUDE_DIR}/rply )
-+endif()
-+
- 
-   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
--- 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)
-   include_directories( ${BRL_INCLUDE_DIR}/bbas )
-   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 )
-if(OpenCL_FOUND)
-+endif()
-+
-+if(OPENCL_FOUND)
-+  include_directories( ${OPENCL_INCLUDE_PATH} )
-   set( BOXM2_VOLM_PRO_LIBS boxm2_ocl)
- endif()
- 
-- 
-2.46.1
-
--- a/0007-v3.5.0-remove-triangle.patch
+++ b/0007-v3.5.0-remove-triangle.patch
--- a/0008-v3.5.0-remove-bits-using-triangle.patch
+++ b/0008-v3.5.0-remove-bits-using-triangle.patch
--- a/0009-v3.5.0-indent-to-keep-gcc-happy.patch
+++ b/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
-
--- a/0010-v3.5.0-more-linker-fixes.patch
+++ b/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
-
--- a/0011-v3.5.0-fix-for-gcc11.patch
+++ b/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
-
--- a/0012-v3.5.0-link-against-acal.patch
+++ b/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
-
--- a/0013-v3.5.0-more-linkage-fixes.patch
+++ b/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
-
--- a/0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
+++ b/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
-
--- a/0015-v3.5.0-fix-linking.patch
+++ b/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
-
--- a/0016-v3.5.0-fix-linking.patch
+++ b/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
-
--- a/0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
+++ b/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
-
--- a/0018-chore-remove-ctest-dashboard-config.patch
+++ b/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
-
--- a/203
+++ b/203
@ -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
-
-
--- a/dead.package
+++ b/dead.package
@ -0,0 +1,3 @@
+2016-10-19: Retired orphaned package, because it was orphaned for
+more than six weeks.
+
--- a/licenses.txt
+++ b/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
--- a/1
+++ b/1
@ -1 +0,0 @@
-SHA512 (vxl-3.5.0-clean.tar.gz) = cb5eaf88e689216b9de56f9a9e07e2a6a8ce4469d0b990f847e8f1060b0a0d6e621ef128c9878a26cef8816b0efd7e99bcca8bc65a43e091f3650158425ebde9
--- a/vxl.spec
+++ b/vxl.spec
@ -1,869 +0,0 @@
-%undefine __cmake_in_source_build
-
-# shared objects version: API
-%global major 3
-%global minor 5
-%global patch 0
-
-Name:       vxl
-Version:    3.5.0
-Release:    %autorelease
-Summary:    C++ Libraries for Computer Vision Research and Implementation
-
-# see licenses.txt for a complete break down of licenses (using licensecheck)
-# other licenses are not included because the files they refer to are not used/included in our build
-License:    BSD-3-Clause AND NTP AND BSL-1.0 AND BSD-2-Clause AND MIT AND Apache-2.0 AND LicenseRef-Fedora-Public-Domain AND SMLNJ
-
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch: %{ix86}
-
-URL:        https://vxl.github.io/
-# Need to remove the non-free lena image from the sources
-# tar xf vxl-%%{version}.tar.gz
-# rm -rf vxl-%%{version}/contrib/prip/vdtop/tests/lena.org.pgm
-# tar cfz vxl-%%{version}-clean.tar.gz vxl-%%{version}/
-#Source0:  https://github.com/vxl/vxl/archive/v%%{version}/%%{name}-%%{version}.tar.gz
-Source0:    %{name}-%{version}-clean.tar.gz
-
-# Patches generated from tree here:
-# https://github.com/sanjayankur31/vxl/tree/fedora-3.5.0
-# use system rply and don't use mpeg2
-Patch:     0001-v3.5.0-unbundle-rply.patch
-Patch:     0002-v3.5.0-Use-Fedora-expat-and-expatpp.patch
-Patch:     0003-v3.5.0-Use-Fedora-minizip.patch
-Patch:     0004-v3.5.0-Add-cmake-module-to-find-RPLY.patch
-Patch:     0005-v3.5.0-fix-bkml-test.patch
-Patch:     0006-v3.5.0-Correct-rply-includedir.patch
-Patch:     0007-v3.5.0-remove-triangle.patch
-Patch:     0008-v3.5.0-remove-bits-using-triangle.patch
-Patch:     0009-v3.5.0-indent-to-keep-gcc-happy.patch
-# otherwise we get:
-# /usr/bin/ld: ../../../../../lib/libimesh.so.3.5.0.0: undefined reference to `brdb_value::registrar::registrar(brdb_value const*)'
-# collect2: error: ld returned 1 exit status
-# gmake[2]: *** [contrib/brl/bseg/baml/tests/CMakeFiles/baml_test_all.dir/build.make:172: bin/baml_test_all] Error 1
-# gmake[2]: Leaving directory '/builddir/build/BUILD/vxl-3.5.0/redhat-linux-build'
-# gmake[1]: *** [CMakeFiles/Makefile2:46025: contrib/brl/bseg/baml/tests/CMakeFiles/baml_test_all.dir/all] Error 2
-Patch:     0010-v3.5.0-more-linker-fixes.patch
-
-# Fix missing #include caught by gcc-11
-Patch:     0011-v3.5.0-fix-for-gcc11.patch
-# For linker error
-Patch:     0012-v3.5.0-link-against-acal.patch
-Patch:     0013-v3.5.0-more-linkage-fixes.patch
-Patch:     0014-v3.5.0-use-system-zlib-tiff-minizip-compat.patch
-Patch:     0015-v3.5.0-fix-linking.patch
-Patch:     0016-v3.5.0-fix-linking.patch
-# remove more bits that used triangle
-Patch:     0017-v3.5.0-remove-boxm2-processes-that-use-sdnet-that-re.patch
-# remove ctest dashboard config
-Patch:     0018-chore-remove-ctest-dashboard-config.patch
-
-BuildRequires:  cmake
-BuildRequires:  Coin4-devel
-BuildRequires:  doxygen
-BuildRequires:  expat-devel
-BuildRequires:  expatpp-devel
-BuildRequires:  freeglut-devel
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  git
-
-# Use bundled dcmtk until upstream updates their code to use newer dcmtk
-# https://github.com/vxl/vxl/issues/550
-# BuildRequires:  dcmtk-devel
-
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  libXmu-devel
-BuildRequires:  libXi-devel
-BuildRequires:  libjpeg-devel
-%ifnarch s390 s390x
-BuildRequires:  libdc1394-devel
-%endif
-BuildRequires:  libgeotiff-devel
-BuildRequires:  libjpeg-turbo-devel
-BuildRequires:  minizip-ng-compat-devel
-
-# Does not build with latest version
-# https://github.com/vxl/vxl/issues/627
-# BuildRequires:  openjpeg2-devel
-# Bundled
-Provides:  bundled(libopenjpeg2) = 2.0.0
-
-
-# Py2 only from the looks of it
-# BuildRequires:  python3-devel
-
-BuildRequires:  rply-devel
-BuildRequires:  shapelib-devel
-BuildRequires:  texi2html
-BuildRequires:  zlib-ng-compat-devel
-
-#GUI needs wx, a desktop file and an icon
-
-%description
-VXL (the Vision-something-Libraries) is a collection of C++ libraries designed
-for computer vision research and implementation. It was created from TargetJr
-and the IUE with the aim of making a light, fast and consistent system.
-VXL is written in ANSI/ISO C++ and is designed to be portable over many
-platforms.
-
-
-%package    doc
-Summary:    Documentation for VXL library
-BuildArch:  noarch
-
-%description doc
-
-You should install this package if you would like to
-have all the documentation
-
-%package    devel
-Summary:    Headers and development libraries for VXL
-Requires:   %{name}%{?_isa} = %{version}-%{release}
-
-%description devel
-
-You should install this package if you would like to
-develop code based on VXL.
-
-%prep
-%autosetup -S git
-
-# remove bundled bits
-# triangle removed in patch (bad license: https://github.com/vxl/vxl/issues/752#issuecomment-655526696)
-
-# remove other bits, only leave CMakeLists.txt
-for l in jpeg png zlib tiff geotiff bzlib
-do
-    find v3p/$l -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
-done
-find contrib/brl/b3p/shapelib -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
-find contrib/brl/b3p/minizip -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
-find contrib/brl/b3p/expat -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
-find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm -fv {} +
-
-# Fix executable permissions on source file
-# not using "." for find since it sometimes crashes within the .git folder
-for f in config contrib core scripts v3p vcl; do
-    find $f -name "*.h" -execdir chmod -x '{}' \;
-    find $f -name "*.cxx" -execdir chmod -x '{}' \;
-    find $f -name "*.txx" -execdir chmod -x '{}' \;
-done
-
-%build
-%cmake -DVXL_INSTALL_LIBRARY_DIR:PATH=%{_lib} \
-    -DCMAKE_INSTALL_DATAROOTDIR:PATH=%{_datadir}/%{name} \
-    -DBUILD_SHARED_LIBS:BOOL=TRUE \
-    -DVXL_USE_GEOTIFF:BOOL=TRUE \
-    -DVXL_FORCE_B3P_EXPAT:BOOL=FALSE \
-    -DVXL_FORCE_V3P_DCMTK:BOOL=TRUE \
-    -DVXL_FORCE_V3P_GEOTIFF:BOOL=FALSE \
-    -DVXL_FORCE_V3P_JPEG:BOOL=FALSE \
-    -DVXL_FORCE_V3P_PNG:BOOL=FALSE \
-    -DVXL_FORCE_V3P_TIFF:BOOL=FALSE \
-    -DVXL_FORCE_V3P_ZLIB:BOOL=FALSE \
-    -DVXL_FORCE_V3P_RPLY:BOOL=FALSE \
-    -DVXL_FORCE_V3P_OPENJPEG2:BOOL=TRUE \
-    -DVXL_USING_NATIVE_ZLIB:BOOL=TRUE \
-    -DVXL_USING_NATIVE_JPEG:BOOL=TRUE \
-    -DVXL_USING_NATIVE_PNG:BOOL=TRUE \
-    -DVXL_USING_NATIVE_TIFF:BOOL=TRUE \
-    -DVXL_USING_NATIVE_GEOTIFF:BOOL=TRUE \
-    -DVXL_USING_NATIVE_EXPAT:BOOL=TRUE \
-    -DVXL_USING_NATIVE_EXPATPP:BOOL=TRUE \
-    -DVXL_USING_NATIVE_SHAPELIB:BOOL=TRUE \
-    -DVXL_USING_NATIVE_BZLIB2:BOOL=TRUE \
-    -DVXL_BUILD_VGUI:BOOL=FALSE \
-    -DVXL_BUILD_BGUI3D:BOOL=FALSE \
-    -DVXL_BUILD_OXL:BOOL=TRUE \
-    -DVXL_BUILD_BRL:BOOL=TRUE \
-    -DVXL_BUILD_BRL_PYTHON:BOOL=FALSE \
-    -DVXL_BUILD_GEL:BOOL=TRUE \
-    -DVXL_BUILD_PRIP:BOOL=TRUE \
-    -DVXL_BUILD_CONVERSIONS:BOOL=TRUE \
-    -DVXL_BUILD_CUL:BOOL=TRUE \
-    -DVXL_BUILD_RPL:BOOL=TRUE \
-    -DVXL_BUILD_CONTRIB:BOOL=TRUE \
-    -DVXL_BUILD_CORE_SERIALISATION:BOOL=TRUE \
-    -DVXL_BUILD_CORE_GEOMETRY:BOOL=TRUE \
-    -DVXL_BUILD_CORE_IMAGING:BOOL=TRUE \
-    -DVXL_BUILD_CORE_NUMERICS:BOOL=TRUE \
-    -DVXL_BUILD_CORE_PROBABILITY:BOOL=TRUE \
-    -DVXL_BUILD_CORE_UTILITIES:BOOL=TRUE \
-    -DVXL_BUILD_CORE_VIDEO:BOOL=TRUE \
-    -DVXL_BUILD_EXAMPLES:BOOL=FALSE \
-    -DBUILD_TESTING:BOOL=TRUE \
-    -DVXL_BUILD_DOCUMENTATION:BOOL=TRUE \
-    -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
-    -DCMAKE_CXX_FLAGS:STRING="$RPM_OPT_FLAGS -fpermissive" \
-    -DVNL_CONFIG_LEGACY_METHODS:BOOL=TRUE
-
-# Other stuff
-# -DEXPATPP_INCLUDE_DIR:PATH=%%{_includedir} \
-# -DEXPATPP_LIBRARY:PATH=%%{_libdir}/libexpatpp.so \
-# -DPYTHON_LIBRARY=/usr/lib64/libpython2.7.so \
-
-# These comments from older spec versions need verification:
-#BUILD_VGUI? NO, it depends on box2m which in turns relies on OPENCL which is not available in FEDORA
-#wxwidgets seems to be found
-#Multiple versions of QT found please set DESIRED_QT_VERSION
-
-%cmake_build
-
-%install
-%cmake_install
-
-# Stray file installed in a random location
-rm -fv %{buildroot}/usr/contrib/brl/bseg/boxm2/ocl/boxm2_ocl_where_root_dir.h
-
-%check
-# different tests fail on different arches
-
-%ifarch x86_64
-# 99% tests passed, 5 tests failed out of 997
-# Total Test time (real) =  23.64 sec
-# The following tests FAILED:
-#        30 -  vul_vul_test_driver (invalid test name)
-#        781 - acal_test_metadata (Failed)
-#        816 - bkml_test_bkml (Subprocess aborted)
-#        836 - volm_test_candidate_region_parser (Subprocess aborted)
-#        979 - vifa_test_int_faces_attr (Subprocess aborted)
-#        980 - vifa_test_int_faces_adj_attr (Subprocess aborted)
-%ctest -E "(acal_test_metadata|bkml_test_bkml|volm_test_candidate_region_parser|vifa_test_int_faces_attr|vifa_test_int_faces_adj_attr|vul_vul_test_driver)"
-%else
-# A number of test fail, but not deterministically on aarch and ppc64le etc, e.g:
-
-#    183 - vgl_test_frustum_3d (Failed)
-#    557 - m23d_test_ortho_flexible_builder (Failed)
-#    638 - vepl_test_gradient_dir (Failed)
-#    732 - bil_test_warp (Failed)
-#    748 - vsph_test_camera_bounds (Failed)
-#    768 - icam_test_transform (Failed)
-#    812 - imesh_test_imls_surface (Failed)
-#    886 - breg3d_test_ekf_camera_optimizer (Failed)
-# Do not make build fail for this arch
-%ctest || true
-%endif
-
-%files
-%doc core/vxl_copyright.h
-%{_bindir}/octree
-%{_libdir}/libacal.so.%{major}.%{minor}
-%{_libdir}/libacal.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libacal_io.so.%{major}.%{minor}
-%{_libdir}/libacal_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbaio.so.%{major}.%{minor}
-%{_libdir}/libbaio.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbaml.so.%{major}.%{minor}
-%{_libdir}/libbaml.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbapl.so.%{major}.%{minor}
-%{_libdir}/libbapl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbapl_io.so.%{major}.%{minor}
-%{_libdir}/libbapl_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbapl_pro.so.%{major}.%{minor}
-%{_libdir}/libbapl_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbbas_pro.so.%{major}.%{minor}
-%{_libdir}/libbbas_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbbgm.so.%{major}.%{minor}
-%{_libdir}/libbbgm.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbbgm_pro.so.%{major}.%{minor}
-%{_libdir}/libbbgm_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbcvr.so.%{major}.%{minor}
-%{_libdir}/libbcvr.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbdgl.so.%{major}.%{minor}
-%{_libdir}/libbdgl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbdpg.so.%{major}.%{minor}
-%{_libdir}/libbdpg.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbetr.so.%{major}.%{minor}
-%{_libdir}/libbetr.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbetr_pro.so.%{major}.%{minor}
-%{_libdir}/libbetr_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbgrl.so.%{major}.%{minor}
-%{_libdir}/libbgrl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbgrl2.so.%{major}.%{minor}
-%{_libdir}/libbgrl2.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbgrl2_algo.so.%{major}.%{minor}
-%{_libdir}/libbgrl2_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbil.so.%{major}.%{minor}
-%{_libdir}/libbil.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbil_algo.so.%{major}.%{minor}
-%{_libdir}/libbil_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbjson.so.%{major}.%{minor}
-%{_libdir}/libbjson.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbkml.so.%{major}.%{minor}
-%{_libdir}/libbkml.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbmdl.so.%{major}.%{minor}
-%{_libdir}/libbmdl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbmdl_pro.so.%{major}.%{minor}
-%{_libdir}/libbmdl_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbmsh3d.so.%{major}.%{minor}
-%{_libdir}/libbmsh3d.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbmsh3d_algo.so.%{major}.%{minor}
-%{_libdir}/libbmsh3d_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbmsh3d_pro.so.%{major}.%{minor}
-%{_libdir}/libbmsh3d_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbnabo.so.%{major}.%{minor}
-%{_libdir}/libbnabo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbnl.so.%{major}.%{minor}
-%{_libdir}/libbnl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbnl_algo.so.%{major}.%{minor}
-%{_libdir}/libbnl_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboct.so.%{major}.%{minor}
-%{_libdir}/libboct.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2.so.%{major}.%{minor}
-%{_libdir}/libboxm2.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_basic.so.%{major}.%{minor}
-%{_libdir}/libboxm2_basic.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_class.so.%{major}.%{minor}
-%{_libdir}/libboxm2_class.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_cpp.so.%{major}.%{minor}
-%{_libdir}/libboxm2_cpp.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_cpp_algo.so.%{major}.%{minor}
-%{_libdir}/libboxm2_cpp_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_cpp_pro.so.%{major}.%{minor}
-%{_libdir}/libboxm2_cpp_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_io.so.%{major}.%{minor}
-%{_libdir}/libboxm2_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_pro.so.%{major}.%{minor}
-%{_libdir}/libboxm2_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_util.so.%{major}.%{minor}
-%{_libdir}/libboxm2_util.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_vecf.so.%{major}.%{minor}
-%{_libdir}/libboxm2_vecf.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_volm.so.%{major}.%{minor}
-%{_libdir}/libboxm2_volm.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_volm_conf.so.%{major}.%{minor}
-%{_libdir}/libboxm2_volm_conf.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_volm_desc.so.%{major}.%{minor}
-%{_libdir}/libboxm2_volm_desc.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_volm_io.so.%{major}.%{minor}
-%{_libdir}/libboxm2_volm_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libboxm2_volm_pro.so.%{major}.%{minor}
-%{_libdir}/libboxm2_volm_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbpgl.so.%{major}.%{minor}
-%{_libdir}/libbpgl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbpgl_algo.so.%{major}.%{minor}
-%{_libdir}/libbpgl_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbprb.so.%{major}.%{minor}
-%{_libdir}/libbprb.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrad.so.%{major}.%{minor}
-%{_libdir}/libbrad.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrad_io.so.%{major}.%{minor}
-%{_libdir}/libbrad_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrad_pro.so.%{major}.%{minor}
-%{_libdir}/libbrad_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrdb.so.%{major}.%{minor}
-%{_libdir}/libbrdb.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrec.so.%{major}.%{minor}
-%{_libdir}/libbrec.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrec_pro.so.%{major}.%{minor}
-%{_libdir}/libbrec_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbreg3d.so.%{major}.%{minor}
-%{_libdir}/libbreg3d.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbreg3d_pro.so.%{major}.%{minor}
-%{_libdir}/libbreg3d_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbres.so.%{major}.%{minor}
-%{_libdir}/libbres.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrip.so.%{major}.%{minor}
-%{_libdir}/libbrip.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbrip_pro.so.%{major}.%{minor}
-%{_libdir}/libbrip_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsgm.so.%{major}.%{minor}
-%{_libdir}/libbsgm.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsgm_pro.so.%{major}.%{minor}
-%{_libdir}/libbsgm_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsl.so.%{major}.%{minor}
-%{_libdir}/libbsl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsol.so.%{major}.%{minor}
-%{_libdir}/libbsol.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsta.so.%{major}.%{minor}
-%{_libdir}/libbsta.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsta_algo.so.%{major}.%{minor}
-%{_libdir}/libbsta_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsta_io.so.%{major}.%{minor}
-%{_libdir}/libbsta_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsta_pro.so.%{major}.%{minor}
-%{_libdir}/libbsta_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsta_vis.so.%{major}.%{minor}
-%{_libdir}/libbsta_vis.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm.so.%{major}.%{minor}
-%{_libdir}/libbstm.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_basic.so.%{major}.%{minor}
-%{_libdir}/libbstm_basic.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_cpp_algo.so.%{major}.%{minor}
-%{_libdir}/libbstm_cpp_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_cpp_pro.so.%{major}.%{minor}
-%{_libdir}/libbstm_cpp_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_io.so.%{major}.%{minor}
-%{_libdir}/libbstm_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_multi.so.%{major}.%{minor}
-%{_libdir}/libbstm_multi.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_multi_basic.so.%{major}.%{minor}
-%{_libdir}/libbstm_multi_basic.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_multi_io.so.%{major}.%{minor}
-%{_libdir}/libbstm_multi_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_pro.so.%{major}.%{minor}
-%{_libdir}/libbstm_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbstm_util.so.%{major}.%{minor}
-%{_libdir}/libbstm_util.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsvg.so.%{major}.%{minor}
-%{_libdir}/libbsvg.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbsvg_pro.so.%{major}.%{minor}
-%{_libdir}/libbsvg_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbtol.so.%{major}.%{minor}
-%{_libdir}/libbtol.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbugl.so.%{major}.%{minor}
-%{_libdir}/libbugl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbundler.so.%{major}.%{minor}
-%{_libdir}/libbundler.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvgl.so.%{major}.%{minor}
-%{_libdir}/libbvgl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvgl_algo.so.%{major}.%{minor}
-%{_libdir}/libbvgl_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvgl_pro.so.%{major}.%{minor}
-%{_libdir}/libbvgl_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl.so.%{major}.%{minor}
-%{_libdir}/libbvpl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl_functors.so.%{major}.%{minor}
-%{_libdir}/libbvpl_functors.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl_kernels.so.%{major}.%{minor}
-%{_libdir}/libbvpl_kernels.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl_kernels_io.so.%{major}.%{minor}
-%{_libdir}/libbvpl_kernels_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl_kernels_pro.so.%{major}.%{minor}
-%{_libdir}/libbvpl_kernels_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl_pro.so.%{major}.%{minor}
-%{_libdir}/libbvpl_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl_util.so.%{major}.%{minor}
-%{_libdir}/libbvpl_util.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvpl_util_io.so.%{major}.%{minor}
-%{_libdir}/libbvpl_util_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvrml.so.%{major}.%{minor}
-%{_libdir}/libbvrml.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvrml_pro.so.%{major}.%{minor}
-%{_libdir}/libbvrml_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm.so.%{major}.%{minor}
-%{_libdir}/libbvxm.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm_algo.so.%{major}.%{minor}
-%{_libdir}/libbvxm_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm_algo_pro.so.%{major}.%{minor}
-%{_libdir}/libbvxm_algo_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm_grid.so.%{major}.%{minor}
-%{_libdir}/libbvxm_grid.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm_grid_io.so.%{major}.%{minor}
-%{_libdir}/libbvxm_grid_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm_grid_pro.so.%{major}.%{minor}
-%{_libdir}/libbvxm_grid_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm_io.so.%{major}.%{minor}
-%{_libdir}/libbvxm_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbvxm_pro.so.%{major}.%{minor}
-%{_libdir}/libbvxm_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbwm_video.so.%{major}.%{minor}
-%{_libdir}/libbwm_video.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libbxml.so.%{major}.%{minor}
-%{_libdir}/libbxml.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libclipper.so.%{major}.%{minor}
-%{_libdir}/libclipper.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libclsfy.so.%{major}.%{minor}
-%{_libdir}/libclsfy.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libdepth_map.so.%{major}.%{minor}
-%{_libdir}/libdepth_map.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libfhs.so.%{major}.%{minor}
-%{_libdir}/libfhs.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libgeml.so.%{major}.%{minor}
-%{_libdir}/libgeml.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libgevd.so.%{major}.%{minor}
-%{_libdir}/libgevd.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libgmvl.so.%{major}.%{minor}
-%{_libdir}/libgmvl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libgst.so.%{major}.%{minor}
-%{_libdir}/libgst.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libgtrl.so.%{major}.%{minor}
-%{_libdir}/libgtrl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libicam.so.%{major}.%{minor}
-%{_libdir}/libicam.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libicam_pro.so.%{major}.%{minor}
-%{_libdir}/libicam_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libihog.so.%{major}.%{minor}
-%{_libdir}/libihog.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libihog_pro.so.%{major}.%{minor}
-%{_libdir}/libihog_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libimesh.so.%{major}.%{minor}
-%{_libdir}/libimesh.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libimesh_algo.so.%{major}.%{minor}
-%{_libdir}/libimesh_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libipts.so.%{major}.%{minor}
-%{_libdir}/libipts.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libm23d.so.%{major}.%{minor}
-%{_libdir}/libm23d.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmbl.so.%{major}.%{minor}
-%{_libdir}/libmbl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmcal.so.%{major}.%{minor}
-%{_libdir}/libmcal.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmfpf.so.%{major}.%{minor}
-%{_libdir}/libmfpf.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmipa.so.%{major}.%{minor}
-%{_libdir}/libmipa.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmmn.so.%{major}.%{minor}
-%{_libdir}/libmmn.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmsdi.so.%{major}.%{minor}
-%{_libdir}/libmsdi.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmsm.so.%{major}.%{minor}
-%{_libdir}/libmsm.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmsm_utils.so.%{major}.%{minor}
-%{_libdir}/libmsm_utils.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmvl.so.%{major}.%{minor}
-%{_libdir}/libmvl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libmvl2.so.%{major}.%{minor}
-%{_libdir}/libmvl2.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libopenjpeg2.so.2.%{patch}.0
-%{_libdir}/libopenjpeg2.so.%{major}.%{minor}
-%{_libdir}/libosl.so.%{major}.%{minor}
-%{_libdir}/libosl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libouel.so.%{major}.%{minor}
-%{_libdir}/libouel.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libouml.so.%{major}.%{minor}
-%{_libdir}/libouml.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/liboxl_vrml.so.%{major}.%{minor}
-%{_libdir}/liboxl_vrml.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libpdf1d.so.%{major}.%{minor}
-%{_libdir}/libpdf1d.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/librgrl.so.%{major}.%{minor}
-%{_libdir}/librgrl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/librrel.so.%{major}.%{minor}
-%{_libdir}/librrel.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/librsdl.so.%{major}.%{minor}
-%{_libdir}/librsdl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libsdet.so.%{major}.%{minor}
-%{_libdir}/libsdet.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libsdet_algo.so.%{major}.%{minor}
-%{_libdir}/libsdet_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libsdet_pro.so.%{major}.%{minor}
-%{_libdir}/libsdet_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libtestlib.so.%{major}.%{minor}
-%{_libdir}/libtestlib.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libv3p_netlib.so.%{major}.%{minor}
-%{_libdir}/libv3p_netlib.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvbl.so.%{major}.%{minor}
-%{_libdir}/libvbl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvbl_io.so.%{major}.%{minor}
-%{_libdir}/libvbl_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvcl.so.%{major}.%{minor}
-%{_libdir}/libvcl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvcon_pro.so.%{major}.%{minor}
-%{_libdir}/libvcon_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvcsl.so.%{major}.%{minor}
-%{_libdir}/libvcsl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvdgl.so.%{major}.%{minor}
-%{_libdir}/libvdgl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvdtop.so.%{major}.%{minor}
-%{_libdir}/libvdtop.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvepl.so.%{major}.%{minor}
-%{_libdir}/libvepl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvgl.so.%{major}.%{minor}
-%{_libdir}/libvgl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvgl_algo.so.%{major}.%{minor}
-%{_libdir}/libvgl_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvgl_io.so.%{major}.%{minor}
-%{_libdir}/libvgl_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvgl_xio.so.%{major}.%{minor}
-%{_libdir}/libvgl_xio.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvidl.so.%{major}.%{minor}
-%{_libdir}/libvidl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvidl_pro.so.%{major}.%{minor}
-%{_libdir}/libvidl_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvifa.so.%{major}.%{minor}
-%{_libdir}/libvifa.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil.so.%{major}.%{minor}
-%{_libdir}/libvil.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil1.so.%{major}.%{minor}
-%{_libdir}/libvil1.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil3d.so.%{major}.%{minor}
-%{_libdir}/libvil3d.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil3d_algo.so.%{major}.%{minor}
-%{_libdir}/libvil3d_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil3d_io.so.%{major}.%{minor}
-%{_libdir}/libvil3d_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil_algo.so.%{major}.%{minor}
-%{_libdir}/libvil_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil_io.so.%{major}.%{minor}
-%{_libdir}/libvil_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvil_pro.so.%{major}.%{minor}
-%{_libdir}/libvil_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvimt.so.%{major}.%{minor}
-%{_libdir}/libvimt.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvimt3d.so.%{major}.%{minor}
-%{_libdir}/libvimt3d.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvimt_algo.so.%{major}.%{minor}
-%{_libdir}/libvimt_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvipl.so.%{major}.%{minor}
-%{_libdir}/libvipl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvmal.so.%{major}.%{minor}
-%{_libdir}/libvmal.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvmap.so.%{major}.%{minor}
-%{_libdir}/libvmap.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvnl.so.%{major}.%{minor}
-%{_libdir}/libvnl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvnl_algo.so.%{major}.%{minor}
-%{_libdir}/libvnl_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvnl_io.so.%{major}.%{minor}
-%{_libdir}/libvnl_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvnl_xio.so.%{major}.%{minor}
-%{_libdir}/libvnl_xio.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvolm.so.%{major}.%{minor}
-%{_libdir}/libvolm.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvolm_conf.so.%{major}.%{minor}
-%{_libdir}/libvolm_conf.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvolm_desc.so.%{major}.%{minor}
-%{_libdir}/libvolm_desc.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvolm_pro.so.%{major}.%{minor}
-%{_libdir}/libvolm_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpdfl.so.%{major}.%{minor}
-%{_libdir}/libvpdfl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpdl.so.%{major}.%{minor}
-%{_libdir}/libvpdl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpgl.so.%{major}.%{minor}
-%{_libdir}/libvpgl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpgl_algo.so.%{major}.%{minor}
-%{_libdir}/libvpgl_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpgl_file_formats.so.%{major}.%{minor}
-%{_libdir}/libvpgl_file_formats.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpgl_io.so.%{major}.%{minor}
-%{_libdir}/libvpgl_io.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpgl_pro.so.%{major}.%{minor}
-%{_libdir}/libvpgl_pro.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpgl_xio.so.%{major}.%{minor}
-%{_libdir}/libvpgl_xio.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpl.so.%{major}.%{minor}
-%{_libdir}/libvpl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvpyr.so.%{major}.%{minor}
-%{_libdir}/libvpyr.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvsl.so.%{major}.%{minor}
-%{_libdir}/libvsl.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvsol.so.%{major}.%{minor}
-%{_libdir}/libvsol.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvsph.so.%{major}.%{minor}
-%{_libdir}/libvsph.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvtol.so.%{major}.%{minor}
-%{_libdir}/libvtol.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvtol_algo.so.%{major}.%{minor}
-%{_libdir}/libvtol_algo.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvul.so.%{major}.%{minor}
-%{_libdir}/libvul.so.%{major}.%{minor}.%{patch}.0
-%{_libdir}/libvul_io.so.%{major}.%{minor}
-%{_libdir}/libvul_io.so.%{major}.%{minor}.%{patch}.0
-
-%files devel
-%{_datadir}/%{name}
-%{_includedir}/%{name}
-%{_libdir}/libbbas_pro.so
-%{_libdir}/libbapl_pro.so
-%{_libdir}/libbapl_io.so
-%{_libdir}/libacal.so
-%{_libdir}/libacal_io.so
-%{_libdir}/libbaio.so
-%{_libdir}/libbaml.so
-%{_libdir}/libbapl.so
-%{_libdir}/libbbgm.so
-%{_libdir}/libbbgm_pro.so
-%{_libdir}/libbcvr.so
-%{_libdir}/libbdgl.so
-%{_libdir}/libbdpg.so
-%{_libdir}/libbetr.so
-%{_libdir}/libbetr_pro.so
-%{_libdir}/libbgrl.so
-%{_libdir}/libbgrl2.so
-%{_libdir}/libbgrl2_algo.so
-%{_libdir}/libbil.so
-%{_libdir}/libbil_algo.so
-%{_libdir}/libbjson.so
-%{_libdir}/libbkml.so
-%{_libdir}/libbmdl.so
-%{_libdir}/libbmdl_pro.so
-%{_libdir}/libbmsh3d.so
-%{_libdir}/libbmsh3d_algo.so
-%{_libdir}/libbmsh3d_pro.so
-%{_libdir}/libbnabo.so
-%{_libdir}/libbnl.so
-%{_libdir}/libbnl_algo.so
-%{_libdir}/libboct.so
-%{_libdir}/libboxm2.so
-%{_libdir}/libboxm2_basic.so
-%{_libdir}/libboxm2_class.so
-%{_libdir}/libboxm2_cpp.so
-%{_libdir}/libboxm2_cpp_algo.so
-%{_libdir}/libboxm2_cpp_pro.so
-%{_libdir}/libboxm2_io.so
-%{_libdir}/libboxm2_pro.so
-%{_libdir}/libboxm2_util.so
-%{_libdir}/libboxm2_vecf.so
-%{_libdir}/libboxm2_volm.so
-%{_libdir}/libboxm2_volm_conf.so
-%{_libdir}/libboxm2_volm_desc.so
-%{_libdir}/libboxm2_volm_io.so
-%{_libdir}/libboxm2_volm_pro.so
-%{_libdir}/libbpgl.so
-%{_libdir}/libbpgl_algo.so
-%{_libdir}/libbprb.so
-%{_libdir}/libbrad.so
-%{_libdir}/libbrad_io.so
-%{_libdir}/libbrad_pro.so
-%{_libdir}/libbrdb.so
-%{_libdir}/libbrec.so
-%{_libdir}/libbrec_pro.so
-%{_libdir}/libbreg3d.so
-%{_libdir}/libbreg3d_pro.so
-%{_libdir}/libbres.so
-%{_libdir}/libbrip.so
-%{_libdir}/libbrip_pro.so
-%{_libdir}/libbsgm.so
-%{_libdir}/libbsgm_pro.so
-%{_libdir}/libbsl.so
-%{_libdir}/libbsol.so
-%{_libdir}/libbsta.so
-%{_libdir}/libbsta_algo.so
-%{_libdir}/libbsta_io.so
-%{_libdir}/libbsta_pro.so
-%{_libdir}/libbsta_vis.so
-%{_libdir}/libbstm.so
-%{_libdir}/libbstm_basic.so
-%{_libdir}/libbstm_cpp_algo.so
-%{_libdir}/libbstm_cpp_pro.so
-%{_libdir}/libbstm_io.so
-%{_libdir}/libbstm_multi.so
-%{_libdir}/libbstm_multi_basic.so
-%{_libdir}/libbstm_multi_io.so
-%{_libdir}/libbstm_pro.so
-%{_libdir}/libbstm_util.so
-%{_libdir}/libbsvg.so
-%{_libdir}/libbsvg_pro.so
-%{_libdir}/libbtol.so
-%{_libdir}/libbugl.so
-%{_libdir}/libbundler.so
-%{_libdir}/libbvgl.so
-%{_libdir}/libbvgl_algo.so
-%{_libdir}/libbvgl_pro.so
-%{_libdir}/libbvpl.so
-%{_libdir}/libbvpl_functors.so
-%{_libdir}/libbvpl_kernels.so
-%{_libdir}/libbvpl_kernels_io.so
-%{_libdir}/libbvpl_kernels_pro.so
-%{_libdir}/libbvpl_pro.so
-%{_libdir}/libbvpl_util.so
-%{_libdir}/libbvpl_util_io.so
-%{_libdir}/libbvrml.so
-%{_libdir}/libbvrml_pro.so
-%{_libdir}/libbvxm.so
-%{_libdir}/libbvxm_algo.so
-%{_libdir}/libbvxm_algo_pro.so
-%{_libdir}/libbvxm_grid.so
-%{_libdir}/libbvxm_grid_io.so
-%{_libdir}/libbvxm_grid_pro.so
-%{_libdir}/libbvxm_io.so
-%{_libdir}/libbvxm_pro.so
-%{_libdir}/libbwm_video.so
-%{_libdir}/libbxml.so
-%{_libdir}/libclipper.so
-%{_libdir}/libclsfy.so
-%{_libdir}/libdepth_map.so
-%{_libdir}/libfhs.so
-%{_libdir}/libgeml.so
-%{_libdir}/libgevd.so
-%{_libdir}/libgmvl.so
-%{_libdir}/libgst.so
-%{_libdir}/libgtrl.so
-%{_libdir}/libicam.so
-%{_libdir}/libicam_pro.so
-%{_libdir}/libihog.so
-%{_libdir}/libihog_pro.so
-%{_libdir}/libimesh.so
-%{_libdir}/libimesh_algo.so
-%{_libdir}/libipts.so
-%{_libdir}/libm23d.so
-%{_libdir}/libmbl.so
-%{_libdir}/libmcal.so
-%{_libdir}/libmfpf.so
-%{_libdir}/libmipa.so
-%{_libdir}/libmmn.so
-%{_libdir}/libmsdi.so
-%{_libdir}/libmsm.so
-%{_libdir}/libmsm_utils.so
-%{_libdir}/libmvl.so
-%{_libdir}/libmvl2.so
-%{_libdir}/libopenjpeg2.so
-%{_libdir}/libosl.so
-%{_libdir}/libouel.so
-%{_libdir}/libouml.so
-%{_libdir}/liboxl_vrml.so
-%{_libdir}/libpdf1d.so
-%{_libdir}/librgrl.so
-%{_libdir}/librrel.so
-%{_libdir}/librsdl.so
-%{_libdir}/libsdet.so
-%{_libdir}/libsdet_algo.so
-%{_libdir}/libsdet_pro.so
-%{_libdir}/libtestlib.so
-%{_libdir}/libv3p_netlib.so
-%{_libdir}/libvbl.so
-%{_libdir}/libvbl_io.so
-%{_libdir}/libvcl.so
-%{_libdir}/libvcon_pro.so
-%{_libdir}/libvcsl.so
-%{_libdir}/libvdgl.so
-%{_libdir}/libvdtop.so
-%{_libdir}/libvepl.so
-%{_libdir}/libvgl.so
-%{_libdir}/libvgl_algo.so
-%{_libdir}/libvgl_io.so
-%{_libdir}/libvgl_xio.so
-%{_libdir}/libvidl.so
-%{_libdir}/libvidl_pro.so
-%{_libdir}/libvifa.so
-%{_libdir}/libvil.so
-%{_libdir}/libvil1.so
-%{_libdir}/libvil3d.so
-%{_libdir}/libvil3d_algo.so
-%{_libdir}/libvil3d_io.so
-%{_libdir}/libvil_algo.so
-%{_libdir}/libvil_io.so
-%{_libdir}/libvil_pro.so
-%{_libdir}/libvimt.so
-%{_libdir}/libvimt3d.so
-%{_libdir}/libvimt_algo.so
-%{_libdir}/libvipl.so
-%{_libdir}/libvmal.so
-%{_libdir}/libvmap.so
-%{_libdir}/libvnl.so
-%{_libdir}/libvnl_algo.so
-%{_libdir}/libvnl_io.so
-%{_libdir}/libvnl_xio.so
-%{_libdir}/libvolm.so
-%{_libdir}/libvolm_conf.so
-%{_libdir}/libvolm_desc.so
-%{_libdir}/libvolm_pro.so
-%{_libdir}/libvpdfl.so
-%{_libdir}/libvpdl.so
-%{_libdir}/libvpgl.so
-%{_libdir}/libvpgl_algo.so
-%{_libdir}/libvpgl_file_formats.so
-%{_libdir}/libvpgl_io.so
-%{_libdir}/libvpgl_pro.so
-%{_libdir}/libvpgl_xio.so
-%{_libdir}/libvpl.so
-%{_libdir}/libvpyr.so
-%{_libdir}/libvsl.so
-%{_libdir}/libvsol.so
-%{_libdir}/libvsph.so
-%{_libdir}/libvtol.so
-%{_libdir}/libvtol_algo.so
-%{_libdir}/libvul.so
-%{_libdir}/libvul_io.so
-
-
-%files doc
-%doc core/vxl_copyright.h
-%doc %{_docdir}/*
-
-%changelog
-%autochangelog
				`@ -1 +0,0 @@`
				`SHA512 (vxl-3.5.0-clean.tar.gz) = cb5eaf88e689216b9de56f9a9e07e2a6a8ce4469d0b990f847e8f1060b0a0d6e621ef128c9878a26cef8816b0efd7e99bcca8bc65a43e091f3650158425ebde9`