diff --git a/.gitignore b/.gitignore index 9859608..f97538c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ /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 diff --git a/0001-Added-include-path-for-geotiff.patch b/0001-Added-include-path-for-geotiff.patch new file mode 100644 index 0000000..20ea0f4 --- /dev/null +++ b/0001-Added-include-path-for-geotiff.patch @@ -0,0 +1,26 @@ +From ac852c19102585381f1762251716e62ebc86c0f7 Mon Sep 17 00:00:00 2001 +From: Mario Ceresa +Date: Wed, 10 Oct 2012 17:09:48 +0200 +Subject: [PATCH 01/23] Added include path for geotiff + +Signed-off-by: Mario Ceresa +--- + config/cmake/Modules/NewCMake/FindGEOTIFF.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake b/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake +index 9e5013f..624e331 100644 +--- a/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake ++++ b/config/cmake/Modules/NewCMake/FindGEOTIFF.cmake +@@ -8,6 +8,8 @@ + # GEOTIFF_LIBRARY, where to find the GEOTIFF library. + + FIND_PATH(GEOTIFF_INCLUDE_DIR geotiff.h ++ /usr/local/include/libgeotiff ++ /usr/include/libgeotiff + /usr/local/include + /usr/include + ) +-- +1.7.11.7 + diff --git a/0001-v3.5.0-unbundle-rply.patch b/0001-v3.5.0-unbundle-rply.patch deleted file mode 100644 index de56a11..0000000 --- a/0001-v3.5.0-unbundle-rply.patch +++ /dev/null @@ -1,3612 +0,0 @@ -From b7944a8898b3a1aef606cf6f4047dcf11aca11a6 Mon Sep 17 00:00:00 2001 -From: "Ankur Sinha (Ankur Sinha Gmail)" -Date: Thu, 15 Nov 2018 14:15:02 +0000 -Subject: [PATCH 01/18] v3.5.0: unbundle rply - ---- - contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt | 5 +- - contrib/brl/bseg/boxm2/cpp/CMakeLists.txt | 6 +- - .../brl/bseg/boxm2/cpp/algo/CMakeLists.txt | 6 +- - v3p/CMakeLists.txt | 1 - - v3p/rply/CMakeLists.txt | 9 - - v3p/rply/LICENSE | 20 - - v3p/rply/etc/convert.c | 136 -- - v3p/rply/etc/dump.c | 44 - - v3p/rply/etc/input.ply | 16 - - v3p/rply/etc/sconvert.c | 66 - - v3p/rply/manual/manual.html | 993 ----------- - v3p/rply/manual/reference.css | 54 - - v3p/rply/manual/rply.png | Bin 6232 -> 0 bytes - v3p/rply/readme.txt | 24 - - v3p/rply/rply.c | 1570 ----------------- - v3p/rply/rply.h | 367 ---- - 16 files changed, 11 insertions(+), 3306 deletions(-) - delete mode 100644 v3p/rply/CMakeLists.txt - delete mode 100644 v3p/rply/LICENSE - delete mode 100644 v3p/rply/etc/convert.c - delete mode 100644 v3p/rply/etc/dump.c - delete mode 100644 v3p/rply/etc/input.ply - delete mode 100644 v3p/rply/etc/sconvert.c - delete mode 100644 v3p/rply/manual/manual.html - delete mode 100644 v3p/rply/manual/reference.css - delete mode 100644 v3p/rply/manual/rply.png - delete mode 100644 v3p/rply/readme.txt - delete mode 100644 v3p/rply/rply.c - delete mode 100644 v3p/rply/rply.h - -diff --git a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt -index 5cf355e3fe..662ec284e9 100644 ---- a/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt -+++ b/contrib/brl/bbas/bmsh3d/algo/CMakeLists.txt -@@ -1,8 +1,9 @@ - # This is bbas/bmsh3d/algo/CMakeLists.txt - # Brown 3D Mesh Algorithm Library -+FIND_PACKAGE(rply REQUIRED) - - include_directories( ${BRL_INCLUDE_DIR} ) --include_directories( ${VTHREEP_INCLUDE_DIR}/rply ) -+include_directories( ${RPLY_INCLUDE_DIR} ) - - set( bmsh3d_algo_sources - bmsh3d_fileio.cxx bmsh3d_fileio.h -@@ -13,7 +14,7 @@ set( bmsh3d_algo_sources - ) - - vxl_add_library(LIBRARY_NAME bmsh3d_algo LIBRARY_SOURCES ${bmsh3d_algo_sources}) --target_link_libraries( bmsh3d_algo bmsh3d rply ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul) -+target_link_libraries( bmsh3d_algo bmsh3d ${RPLY_LIBRARY} ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul) - - if( BUILD_TESTING ) - add_subdirectory(tests) -diff --git a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt -index 92b959f740..fff9ae2d84 100644 ---- a/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt -+++ b/contrib/brl/bseg/boxm2/cpp/CMakeLists.txt -@@ -1,12 +1,14 @@ -+FIND_PACKAGE(rply REQUIRED) -+ - include_directories( ${BRL_INCLUDE_DIR}/bseg ) --include_directories( ${VTHREEP_INCLUDE_DIR}/rply ) -+include_directories( ${RPLY_INCLUDE_DIR} ) - set(boxm2_cpp_sources - - ) - aux_source_directory(Templates boxm2_cpp_sources) - vxl_add_library(LIBRARY_NAME boxm2_cpp LIBRARY_SOURCES ${boxm2_cpp_sources}) - --target_link_libraries(boxm2_cpp boxm2 boxm2_basic boxm2_io boct brdb ${VXL_LIB_PREFIX}vbl_io expatpp ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl rply) -+target_link_libraries(boxm2_cpp boxm2 boxm2_basic boxm2_io boct brdb ${VXL_LIB_PREFIX}vbl_io expatpp ${VXL_LIB_PREFIX}vpgl ${VXL_LIB_PREFIX}vil_io ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl ${RPLY_LIBRARY} ) - - # cpp process APIs. - add_subdirectory(pro) -diff --git a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt -index 1407ed9d31..c3ed4ed27d 100644 ---- a/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt -+++ b/contrib/brl/bseg/boxm2/cpp/algo/CMakeLists.txt -@@ -1,6 +1,8 @@ -+FIND_PACKAGE(rply REQUIRED) -+ - include_directories( ${BRL_INCLUDE_DIR}/bseg ) - include_directories( ${MUL_INCLUDE_DIR} ) --include_directories( ${VTHREEP_INCLUDE_DIR}/rply) -+include_directories( ${RPLY_INCLUDE_DIR} ) - - set(boxm2_cpp_algo_sources - boxm2_cast_ray_function.h -@@ -57,7 +59,7 @@ set(boxm2_cpp_algo_sources - aux_source_directory(Templates boxm2_cpp_algo_sources) - - vxl_add_library(LIBRARY_NAME boxm2_cpp_algo LIBRARY_SOURCES ${boxm2_cpp_algo_sources}) --target_link_libraries(boxm2_cpp_algo boxm2_cpp brad boct brdb expatpp ${VXL_LIB_PREFIX}vpgl bvgl imesh imesh_algo bsta_algo bsta ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl bvpl rply) -+target_link_libraries(boxm2_cpp_algo boxm2_cpp brad boct brdb expatpp ${VXL_LIB_PREFIX}vpgl bvgl imesh imesh_algo bsta_algo bsta ${VXL_LIB_PREFIX}vil_algo ${VXL_LIB_PREFIX}vil ${VXL_LIB_PREFIX}vgl_xio ${VXL_LIB_PREFIX}vgl ${VXL_LIB_PREFIX}vnl_algo ${VXL_LIB_PREFIX}vnl ${VXL_LIB_PREFIX}vul ${VXL_LIB_PREFIX}vbl_io ${VXL_LIB_PREFIX}vbl ${VXL_LIB_PREFIX}vsl ${VXL_LIB_PREFIX}vcl bvpl ${RPLY_LIBRARY} ) - - if(BUILD_TESTING) - add_subdirectory(tests) -diff --git a/v3p/CMakeLists.txt b/v3p/CMakeLists.txt -index 251ef9a979..ae9baedaa4 100644 ---- a/v3p/CMakeLists.txt -+++ b/v3p/CMakeLists.txt -@@ -60,5 +60,4 @@ if(VXL_BUILD_CORE_IMAGING) - add_subdirectory(png) - add_subdirectory(dcmtk) - add_subdirectory(openjpeg2) -- add_subdirectory(rply) - endif() -diff --git a/v3p/rply/CMakeLists.txt b/v3p/rply/CMakeLists.txt -deleted file mode 100644 -index 9085a628a1..0000000000 ---- a/v3p/rply/CMakeLists.txt -+++ /dev/null -@@ -1,9 +0,0 @@ --# This is /v3p/rply/CMakeLists.txt --# library for reading and writing .PLY file -- --set(rply_sources -- rply.h -- rply.c -- ) -- --vxl_add_library(LIBRARY_NAME rply LIBRARY_SOURCES ${rply_sources}) -diff --git a/v3p/rply/LICENSE b/v3p/rply/LICENSE -deleted file mode 100644 -index 02e7c5f385..0000000000 ---- a/v3p/rply/LICENSE -+++ /dev/null -@@ -1,20 +0,0 @@ --RPly 1.01 license --Copyright © 2003-2005 Diego Nehab. -- --Permission is hereby granted, free of charge, to any person obtaining a --copy of this software and associated documentation files (the "Software"), --to deal in the Software without restriction, including without limitation --the rights to use, copy, modify, merge, publish, distribute, sublicense, --and/or sell copies of the Software, and to permit persons to whom the --Software is furnished to do so, subject to the following conditions: -- --The above copyright notice and this permission notice shall be included in --all copies or substantial portions of the Software. -- --THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING --FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER --DEALINGS IN THE SOFTWARE. -diff --git a/v3p/rply/etc/convert.c b/v3p/rply/etc/convert.c -deleted file mode 100644 -index e90d4cd576..0000000000 ---- a/v3p/rply/etc/convert.c -+++ /dev/null -@@ -1,136 +0,0 @@ --#include --#include --#include --#include --#include "rply.h" -- --/* internal function prototypes */ --static void error(const char *fmt, ...); --static void help(void); --static void parse_arguments(int argc, char **argv, -- e_ply_storage_mode *storage_mode, -- const char **iname, const char **oname); --static void setup_callbacks(p_ply iply, p_ply oply); -- --/* given a format mode, an input file name and an output file name, -- * convert input file to output in given format mode */ --int main(int argc, char **argv) --{ -- const char *value = NULL; -- e_ply_storage_mode storage_mode = PLY_LITTLE_ENDIAN; -- const char *iname = NULL, *oname = NULL; -- p_ply iply = NULL, oply = NULL; -- /* parse command line arguments */ -- parse_arguments(argc, argv, &storage_mode, &iname, &oname); -- /* open input file and make sure we parsed its header */ -- iply = ply_open(iname, NULL); -- if (!iply) error("Unable to open file '%s'", iname); -- if (!ply_read_header(iply)) error("Failed reading '%s' header", iname); -- /* create output file */ -- oply = ply_create(oname, storage_mode, NULL); -- if (!oply) error("Unable to create file '%s'", oname); -- /* create elements and properties in output file and -- * setup callbacks for them in input file */ -- setup_callbacks(iply, oply); -- /* pass comments and obj_infos from input to output */ -- value = NULL; -- while ((value = ply_get_next_comment(iply, value))) -- if (!ply_add_comment(oply, value)) -- error("Failed adding comments"); -- value = NULL; -- while ((value = ply_get_next_obj_info(iply, value))) -- if (!ply_add_obj_info(oply, value)) -- error("Failed adding comments"); -- /* write output header */ -- if (!ply_write_header(oply)) error("Failed writing '%s' header", oname); -- /* read input file generating callbacks that pass data to output file */ -- if (!ply_read(iply)) error("Conversion failed"); -- /* close up, we are done */ -- if (!ply_close(iply)) error("Error closing file '%s'", iname); -- if (!ply_close(oply)) error("Error closing file '%s'", oname); -- return 0; --} -- --/* prints an error message and exits */ --static void error(const char *fmt, ...) --{ -- va_list ap; -- va_start(ap, fmt); -- vfprintf(stderr, fmt, ap); -- va_end(ap); -- fprintf(stderr, "\n"); -- exit(1); --} -- --/* prints the help message and exits */ --static void help(void) --{ -- error("Usage:\n" -- " convert