Hello community, here is the log from the commit of package otb for openSUSE:Factory checked in at 2019-11-07 23:15:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/otb (Old) and /work/SRC/openSUSE:Factory/.otb.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "otb" Thu Nov 7 23:15:34 2019 rev:1 rq:725847 version:6.6.1 Changes: -------- New Changes file: --- /dev/null 2019-10-24 10:19:07.066239389 +0200 +++ /work/SRC/openSUSE:Factory/.otb.new.2990/otb.changes 2019-11-07 23:15:40.696479032 +0100 @@ -0,0 +1,531 @@ +------------------------------------------------------------------- +Mon Aug 12 20:56:16 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Use openCV <= 3.x, otb is not yet compatible with openCV 4 + https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues/1954 + +------------------------------------------------------------------- +Tue Jul 23 13:35:37 UTC 2019 - Dirk Stoecker <opens...@dstoecker.de> + +- enforce GDAL2 when using OTB + +------------------------------------------------------------------- +Mon Jul 8 17:20:54 UTC 2019 - Dirk Stoecker <opens...@dstoecker.de> + +- require GDAL < 3 for build + +------------------------------------------------------------------- +Sat Jul 6 10:41:33 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Avoid name repetition in summary. +- Remove redundancies from descriptions. +- Adjust RPM groups. +- Limit fdupes to only run on the /usr subvolume. + +------------------------------------------------------------------- +Tue Mar 26 19:05:41 UTC 2019 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Monteverdi needs otb-qt + +------------------------------------------------------------------- +Thu Dec 13 17:01:12 UTC 2018 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Add patch to fix installation path of VERSION file: + * otb-fix_VERSION_file_install.patch + +------------------------------------------------------------------- +Thu Dec 13 14:57:06 UTC 2018 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Update to 6.6.1: + * Bugs fixed: + - 314: Add lib openMP to packages + - 305: BUG: compat of QgisDescriptor with old params + - 304: BUG: Quick fix for Mellin test + - 303: BUG: missing ComplexImage params in QGis wrapper + - 302: TEST: use different test output names + - 301: ENH: initialize the number of openMP threads after any modification by command line + - 300: PKG: enable diapotb in SuperBuild with RemoteModules + - 297: COMP: fix compilation of examples with clang 7 + - 296: Integrate diapotb as official remote module + - 294: PKG: declare libomp as system lib in macOS package + - 293: COMP: fix OverlapSave filter on Windows + - 292: FFTW upgrade + - 287: Filtering warnings for clang7 + - 288: BUG: #1761: make sure OpenMP runtime is loaded by the main executable + - 285: SuperBuild: the Ossim issue 2354 now affects all platforms + - 284: COMP: fix ossim to build with clang7 + - 283: OpenMP fixes + - 282: DOC: suggested changes to the documentation + - 279: BUG: #1623: fix doxygen search bar + - 278: BUG #1757 fix installation of Siftfast + - 277: Resolve \ + - 280: Bump GRM version to integrate fix for #1750 + - 274: BUG: #1734: warn users when producing an ENVI dataset with positive Y spacing + - 272: BUG: #1753: adding options OTB_USE_MPI and OTB_USE_SPTW for superbuild + - 271: Monteverdi: fix band numbering in color setup widget + - 270: BUG: #1691: clarifications on binary packages + - 266: BUG: #1734: replace envi format with TIF + - 265: Resolve \ + - 263: BUG: update hdf5 url + - 262: Composite application bugfix + - 252: Resolve \ + - 250: BUG: fix ITK version number for packaging + - 248: Resolve \ + - 247: Resolve \ + - 239: ENH: Update superbuild to ITK 4.13.1 so that it builds with gcc 8 + - 238: Typo in cookbook + - 232: BUG: #1582: detect empty training data + - 225: WRG: fix warnings declaration shadows a previous local seen with gcc 8 + - 219: Warnings fixes (clang and OSSIM) + - 218: Resolve \ + - 217: DOC: dmci edits to cookbook and installation tex file + - 216: Resolve \ + - 206: Some warning fixes + - 205: Resolve \ + - 204: Resolve \ + - 203: Resolve \ + - 201: Resolve \ + - 196: Resolve \ + - 195: Resolve \ + - 186: PKG: install openCV libraries to lib + - 182: Resolve \ + - 181: Resolve \ + - 180: Resolve \ + - 178: Resolve \ + - 175: #1611 - Document ParameterType_Bool + - 170: WRG: add missing overrides + - 169: Resolve \ + - 168: Resolve \ + - 159: BUG: Improve Convert and DynamicConvert mask handling (fix #1647) + - 157: Resolve \ + - 155: BUG: Be compliant with new cmake policy CMP0072 with cmake \u003e 3.11 + - 145: Resolve \ + - 142: BUG: fix issue #1639 Update UserValue flag in QtWidgetParameterList + - 139: SuperBuild: Upgrade to OpenCV 3.4.1 + - 137: DOC: Set of proposed edits to the documentation + - 126: BUG: Remove workaround for QT bug 22829 + - 124: Document third party environment variables + + * Small patches made: + - 207: DOC: add missing packages needed to compile otb with superbuild on ubuntu 18.04 + - 140: DOC: Minor fixes in Software Guide + + * Other changes: + - 253: BUG: clear temporary validation filename when validation ratio is set to 0 + - 245: ENH: update phenotb remote module git tag + - 234: BUG: fix qt5 compilation on ubuntu 18.04 + - 228: Document output of training applications + - 208: More warning fixes for Shark + - 185: DOC: update list of contributors + - 177: Remove mantis 1427 workaround + - 156: BUG fix issue 1656 related to eratic behavior of cmake configuration + - 127: COMP: fix gcc 7 'defined' warnings + +------------------------------------------------------------------- +Thu Nov 29 17:03:59 UTC 2018 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Increase required RAM in _constraints to avoid OOM errors + +------------------------------------------------------------------- +Mon Aug 6 13:05:25 UTC 2018 - nroch...@gmail.com + +- Update License (CeCILL v2.0 => Apache v2.0) see https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/blob/develop/LICENSE + +------------------------------------------------------------------- +Fri Jul 20 10:13:56 UTC 2018 - guillaume.gar...@opensuse.org + +- Add patch to fix lib64 handling: + * otb-fix_lib64_handling.patch + +------------------------------------------------------------------- +Wed Jul 18 12:13:41 UTC 2018 - guillaume.gar...@opensuse.org + +- Enable openMP + +------------------------------------------------------------------- +Wed Jun 27 08:53:05 UTC 2018 - guillaume.gar...@opensuse.org + +- Upgrade to 6.6.0 version + * Features added: + - 4: Dimensionality reduction algorithms + - 5: Enhance otb sar sensor model adapter + - 7: Enhance cookbook extended filename section + - 8: App engine flags + - 12: Complex image integration + - 15: Parameter bool + - 22: Register Pipeline Services (ProcessObjects and DataObjects) + - 24: Handle extended filename for DataSource class + - 25: Data augmentation + - 26: Update Shark Random Forest implementation + - 29: ApplicationEngine new services + - 33: Multi writer + - 34: Stop button for graphic applications + - 53: Resolve "add Wrapper/QGIS to generate qgis descriptors for processing + plugin" + - 63: Background value for VectorDataToLabelImageFilter + - 71: New Itk modules + * Bugs fixed: + - 11: Resolve "Compilation error in Debug in ossimSarSensorModel" + - 13: Resolve "Inconsistent behaviour of geom file loading" + - 19: Splitting cxx file for InputImageParameter + - 27: Remove README (copy/paste error) from MPIConfig module + - 30: Fix clang missing override warnings + - 32: Bugfix RAM parameter not used + - 35: WIP: Bugfix writer box + - 38: Support GDAL Python binding for release 6.4 + - 39: Resolve "API change in HoughTransform2DLinesImageFilter (itk 4.13)" + - 40: Resolve "Python3 OTB application bindings available in the OTB + package don't work on Linux" + - 41: Resolve "OTB Python code in the CookBook is not compatible with + Python3" + - 43: Resolve "Remove deprecated instructions to compile Monteverdi" + - 44: Resolve "Fix some warnings with gcc 7.3 and clang 5.0" + - 45: Resolving ExtractROI default behavior bug + - 47: Resolve "skipcarto not working in Orthorectification?" + - 48: Resolve "SampleSelection strategy "byclass", csv parser not working" + - 52: Resolve "Mention CCLA and ICLA in Contribute.md" + - 58: Resolve "General log information appear several time in composite + applications" + - 65: Use OGRSpatialReference class to compare projref + - 67: Packaging install fonts + - 70: Resolve : Application can't be launch through monteverdi + - 73: Resolve "wrong default RGB composition for Pleiades image" + - 78: Fix installation of GDAL bindings in standalone packages + - 79: BUG: #1567: fix compilation with GDAL 2.3.0 + - 80: OpenGL problem in monteverdi + - 81: Solve drag and drop issue + - 82: Resolve "Error during OTB SuperBuild compilation on Ubuntu 16.04" ++++ 334 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.otb.new.2990/otb.changes New: ---- OTB-6.6.1.tar.xz _constraints fix_non_git_usage.patch otb-fix_VERSION_file_install.patch otb-fix_lib64_handling.patch otb.changes otb.spec temporalgapfilling-4fc4a71.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ otb.spec ++++++ # # spec file for package otb # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 Angelos Tzotsos <tzot...@opensuse.org>. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define tarname OTB %define filerelease 6.6 %define libversion 6 # Enable remote module by default %bcond_without enable_remote_module Name: otb Version: 6.6.1 Release: 0 Summary: A C++ library for remote sensing image processing License: Apache-2.0 Group: Productivity/Scientific/Other Url: http://www.orfeo-toolbox.org Source0: https://www.orfeo-toolbox.org/packages/archives/OTB/%{tarname}-%{version}.tar.xz # OTBTemporalGapFilling - http://tully.ups-tlse.fr/jordi/temporalgapfilling.git - git rev. selected by cmake file Source10: temporalgapfilling-4fc4a71.tar.xz # PATCH-FIX-UPSTREAM - otb-fix_lib64_handling.patch: fix lib64 path handling Patch0: otb-fix_lib64_handling.patch # PATCH-FIX-UPSTREAM - otb-fix_VERSION_file_install.patch: fix install path of VERSION Patch1: otb-fix_VERSION_file_install.patch # PATCH-FIX-OPENSUSE cmake file wants to clone the GIT repo. We are offline, so patch cmake file to be able to use our tarball instead of git clone Patch10: fix_non_git_usage.patch BuildRequires: boost-devel BuildRequires: cmake >= 3.1.0 BuildRequires: fdupes BuildRequires: xz %if 0%{?suse_version} < 1500 # With the default gcc 4.8, the compilation fails on Leap 42.x BuildRequires: gcc7 BuildRequires: gcc7-c++ %else BuildRequires: gcc BuildRequires: gcc-c++ %endif BuildRequires: geotiff-devel BuildRequires: insighttoolkit-devel BuildRequires: libOpenThreads-devel BuildRequires: libcurl-devel # does not work with GDAL3 yet (on next major update replace this and the requires for devel with gdal-devel again) BuildRequires: libgdal20-devel BuildRequires: libproj-devel BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-qtbase-devel BuildRequires: libsvm-devel %if %{with enable_remote_module} BuildRequires: git # GSL is needed by OTBTemporalGapFilling module BuildRequires: gsl-devel %endif BuildRequires: glew-devel BuildRequires: libglfw-devel BuildRequires: libsvm2 BuildRequires: libtool BuildRequires: muparser-devel BuildRequires: muparserx-devel BuildRequires: ossim-devel BuildRequires: python2-devel BuildRequires: qwt6-devel %if 0%{?suse_version} >= 1500 BuildRequires: python2-numpy-devel %else BuildRequires: python-numpy-devel %endif %if 0%{?suse_version} >= 1550 BuildRequires: opencv3-devel %else BuildRequires: opencv-devel < 4.0 %endif BuildRequires: python3-devel BuildRequires: python3-numpy-devel BuildRequires: swig BuildRequires: tinyxml-devel Obsoletes: OrfeoToolbox BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ORFEO Toolbox (OTB) is a library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing in general and for high spatial resolution images in particular. This package contains the command line tools illustrating OTB features. %package devel Summary: ORFEO Toolbox development files Group: Productivity/Scientific/Other Requires: boost-devel Requires: cmake Requires: gcc Requires: gcc-c++ Requires: glew-devel Requires: insighttoolkit-devel Requires: lib%{name}%{libversion} = %{version} Requires: libOpenThreads-devel Requires: libcurl-devel Requires: libgdal20-devel Requires: libgeotiff-devel Requires: libglfw-devel Requires: libqt5-linguist-devel Requires: libqt5-qtbase-devel Requires: libsvm-devel Requires: libsvm2 Requires: libtool Requires: muparser-devel Requires: muparserx-devel %if 0%{?suse_version} >= 1550 Requires: opencv3-devel %else Requires: opencv-devel < 4.0 %endif Requires: ossim-devel Requires: qwt6-devel Requires: tinyxml-devel Provides: lib%{name}-devel Obsoletes: OrfeoToolbox-devel < %{version} Provides: OrfeoToolbox-devel = %{version} %description devel ORFEO Toolbox (OTB) is a library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing in general and for high spatial resolution images in particular. This package contains the development files needed to build your own OTB applications. %package -n %{name}-bin Summary: ORFEO Toolbox command line applications Group: Productivity/Scientific/Other Requires: lib%{name}%{libversion} = %{version} Obsoletes: OrfeoToolbox < %{version} Provides: OrfeoToolbox = %{version} %description -n %{name}-bin ORFEO Toolbox (OTB) is a library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing in general and for high spatial resolution images in particular. This package contains the command line applications illustrating OTB features. %package -n monteverdi Summary: Application based on OrfeoToolbox (OTB) for remote sensing image processing Group: Development/Libraries Requires: lib%{name}%{libversion} = %{version} Requires: otb-qt Obsoletes: monteverdi < %{version} Provides: monteverdi = %{version} %description -n monteverdi Monteverdi is an image processing workshop based on the OTB library. It takes advantage of the streaming and multi-threading capabilities of the OTB pipeline. It also uses cool features as processing on demand and automagic file format I/O. %package -n lib%{name}%{libversion} Summary: ORFEO Toolbox shared library of image processing algorithms Group: System/Libraries Obsoletes: OrfeoToolbox %description -n lib%{name}%{libversion} ORFEO Toolbox (OTB) is a library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing in general and for high spatial resolution images in particular. This package contains the shared libraries required by Monteverdi, Monteverdi2 and the OTB applications. %package -n %{name}-qt Summary: ORFEO Toolbox graphical user interface applications Group: System/Libraries Requires: lib%{name}%{libversion} = %{version} Obsoletes: OrfeoToolbox %description -n %{name}-qt ORFEO Toolbox (OTB) is a library of image processing algorithms. OTB is based on the medical image processing library ITK and offers particular functionalities for remote sensing image processing in general and for high spatial resolution images in particular. This package contains the GUI tools illustrating OTB features (using plugins provided by otb package). %package -n python2-%{name} Summary: ORFEO Toolbox Python2 API for applications Group: Development/Languages/Python Requires: lib%{name}%{libversion} = %{version} Obsoletes: OrfeoToolbox %description -n python2-%{name} ORFEO Toolbox Python 2 API for applications. %package -n python3-%{name} Summary: ORFEO Toolbox Python2 API for applications Group: Development/Languages/Python Requires: lib%{name}%{libversion} = %{version} Obsoletes: OrfeoToolbox %description -n python3-%{name} ORFEO Toolbox Python 3 API for applications. %prep %if %{with enable_remote_module} %setup -q -n temporalgapfilling -b 10 %endif %setup -q -n %{tarname}-release-%{filerelease} %patch0 -p1 %patch1 -p1 %patch10 -p0 %if %{with enable_remote_module} mv ../temporalgapfilling/ Modules/Remote/OTBTemporalGapFilling %endif %build # Disable MPI for now since OTB apps do not start easily (we must add MPI libs to LD_LIBRARY_PATH to start apps) # # Find MPI # if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then # source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh # fi %cmake \ %if 0%{?suse_version} < 1500 -DCMAKE_C_COMPILER=gcc-7 \ -DCMAKE_CXX_COMPILER=g++-7 \ %endif -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_EXAMPLES:BOOL=OFF \ -DBUILD_TESTING:BOOL=OFF \ -DOTB_USE_6S:BOOL=ON \ -DOTB_USE_CURL:BOOL=ON \ -DOTB_USE_LIBKML:BOOL=OFF \ -DOTB_USE_LIBSVM:BOOL=ON \ -DOTB_USE_MAPNIK:BOOL=OFF \ -DOTB_USE_MPI:BOOL=OFF \ -DOTB_USE_SPTW:BOOL=ON \ -DOTB_USE_MUPARSER:BOOL=ON \ -DOTB_USE_MUPARSERX:BOOL=ON \ -DOTB_USE_OPENCV:BOOL=ON \ -DOTB_USE_OPENMP:BOOL=ON \ -DOTB_USE_GLEW:BOOL=ON \ -DOTB_USE_GLFW:BOOL=ON \ -DOTB_USE_OPENGL:BOOL=ON \ -DOTB_USE_QT:BOOL=ON \ -DOTB_USE_QWT:BOOL=ON \ -DQWT_INCLUDE_DIR=%{_includedir}/qt5/qwt6 \ -DOTB_USE_SIFTFAST:BOOL=ON \ -DOTB_WRAP_JAVA:BOOL=OFF \ -DOTB_WRAP_PYTHON:BOOL=ON \ -DOTB_WRAP_PYTHON3:BOOL=ON \ -DOTB_INSTALL_LIBRARY_DIR:STRING=%{_lib} \ -DOTB_INSTALL_PYTHON_DIR:STRING=%{_lib}/otb/python \ -DOTB_INSTALL_PYTHON3_DIR:STRING=%{_lib}/otb/python3 \ -DOTB_INSTALL_APP_DIR:STRING=%{_lib}/otb/applications \ %if %{with enable_remote_module} -DModule_OTBTemporalGapFilling:BOOL=ON \ %endif -DCMAKE_BUILD_TYPE:STRING=Release make VERBOSE=1 %{?_smp_mflags} %install %cmake_install # install -d %%{buildroot}%{_sysconfdir}/ld.so.conf.d # LDCONFIG_FILE=%%{buildroot}%{_sysconfdir}/ld.so.conf.d/otb.conf # %%if "%%{_lib}" == "lib64" # cat > "$LDCONFIG_FILE" <<EOF # # Orfeo Toolbox related search paths # /usr/lib64/otb # EOF # %%else # cat > "$LDCONFIG_FILE" <<EOF # # Orfeo Toolbox related search paths # /usr/lib/otb # EOF # %%endif # %%if "%%{_lib}" == "lib64" # mkdir -p %%{buildroot}/usr/lib64 # mv %%{buildroot}/usr/lib/* %%{buildroot}/usr/lib64/ # %%endif rm -rf %{buildroot}%{_datadir}/doc rm -rf %{buildroot}%{_libexecdir}/debug rm -rf %{buildroot}/usr/lib/*.a # Remove spurious executable bits chmod 0644 %{buildroot}/usr/share/applications/monteverdi.desktop chmod 0644 %{buildroot}/usr/share/pixmaps/monteverdi.xpm %fdupes %{buildroot}/%{_prefix} %post -n lib%{name}%{libversion} -p /sbin/ldconfig %postun -n lib%{name}%{libversion} -p /sbin/ldconfig %files -n %{name}-bin %defattr(755,root,root,755) %{_bindir}/otbcli_* %{_bindir}/otbcli %files -n %{name}-qt %defattr(755,root,root,755) %{_bindir}/otbgui_* %{_bindir}/otbgui %defattr(644,root,root,755) %dir %{_datadir}/otb %dir %{_datadir}/otb/i18n/ %{_datadir}/otb/i18n/* %files -n monteverdi %defattr(755,root,root,755) %{_bindir}/monteverdi %{_bindir}/mapla %{_datadir}/applications/monteverdi.desktop %{_datadir}/icons/* %{_datadir}/pixmaps/monteverdi* %files -n lib%{name}%{libversion} %defattr(644,root,root,755) # %config %{_sysconfdir}/ld.so.conf.d/otb.conf %dir %{_libdir}/otb/ %{_libdir}/*.so.* %dir %{_libdir}/otb/applications/ %{_libdir}/otb/applications/otbapp_*.so %defattr(755,root,root,755) %{_bindir}/otbTestDriver %{_bindir}/otbApplicationLauncherCommandLine %{_bindir}/otbApplicationLauncherQt %{_bindir}/otbQgisDescriptor %dir %{_datadir}/otb %dir %{_datadir}/otb/description %{_datadir}/otb/description/*.txt %{_datadir}/otb/VERSION %files -n python2-%{name} %defattr(644,root,root,755) %dir %{_libdir}/otb/python/ %{_libdir}/otb/python/* %files -n python3-%{name} %defattr(644,root,root,755) %dir %{_libdir}/otb/python3/ %{_libdir}/otb/python3/* %files devel %defattr(-,root,root,-) %{_includedir}/OTB-%{filerelease}/ %{_libdir}/lib*.so %{_libdir}/cmake/ %changelog ++++++ _constraints ++++++ <?xml version="1.0" encoding="UTF-8"?> <constraints> <hardware> <disk> <size unit="G">6</size> </disk> <memory> <size unit="G">7</size> </memory> </hardware> </constraints> ++++++ fix_non_git_usage.patch ++++++ --- CMake/OTBModuleRemote.cmake.orig 2017-11-21 11:56:52.159579062 +0100 +++ CMake/OTBModuleRemote.cmake 2017-11-21 12:20:37.262473283 +0100 @@ -24,18 +24,19 @@ function(_git_clone git_executable git_repository git_tag module_dir) set(retryCount 0) set(error_code 1) - while(error_code AND (retryCount LESS 3)) - execute_process( - COMMAND "${git_executable}" clone "${git_repository}" "${module_dir}" - RESULT_VARIABLE error_code - OUTPUT_QUIET - ERROR_QUIET - ) - math(EXPR retryCount "${retryCount}+1") - endwhile() - if(error_code) - message(FATAL_ERROR "Failed to clone repository: '${git_repository}'") - endif() +# while(error_code AND (retryCount LESS 3)) +# execute_process( +# COMMAND "${git_executable}" clone "${git_repository}" "${module_dir}" +# RESULT_VARIABLE error_code +# OUTPUT_QUIET +# ERROR_QUIET +# ) +# math(EXPR retryCount "${retryCount}+1") +# endwhile() +# if(error_code) +# message(FATAL_ERROR "Failed to clone repository: '${git_repository}'") +# endif() + message(STATUS "NOT cloning repository: '${git_repository}', but using provided tarball instead") execute_process( COMMAND "${git_executable}" checkout ${git_tag} @@ -91,14 +92,15 @@ function(_git_update git_executable git_ # Is the hash checkout out that we want? if(NOT ("${tag_hash}" STREQUAL "${head_hash}")) - execute_process( - COMMAND "${git_executable}" fetch "${git_repository}" - WORKING_DIRECTORY "${module_dir}" - RESULT_VARIABLE error_code - ) - if(error_code) - message(FATAL_ERROR "Failed to fetch repository '${git_repository}'") - endif() +# DO NOT FETCH, we are offline +# execute_process( +# COMMAND "${git_executable}" fetch "${git_repository}" +# WORKING_DIRECTORY "${module_dir}" +# RESULT_VARIABLE error_code +# ) +# if(error_code) +# message(FATAL_ERROR "Failed to fetch repository '${git_repository}'") +# endif() execute_process( COMMAND "${git_executable}" checkout ${git_tag} ++++++ otb-fix_VERSION_file_install.patch ++++++ --- OTB-release-6.6/CMakeLists.txt.orig 2018-12-13 17:58:34.548874890 +0100 +++ OTB-release-6.6/CMakeLists.txt 2018-12-13 17:59:07.853137501 +0100 @@ -433,7 +433,7 @@ install(FILES "LICENSE" DESTINATION ${OT # Configure and install VERSION file configure_file(VERSION VERSION @ONLY) -install(FILES ${OTB_BINARY_DIR}/VERSION DESTINATION ${OTB_BINARY_DIR}/${OTB_INSTALL_DATA_DIR} ) +install(FILES ${OTB_BINARY_DIR}/VERSION DESTINATION ${OTB_INSTALL_DATA_DIR} ) install(DIRECTORY ${OTB_BINARY_DIR}/${OTB_INSTALL_DATA_DIR} DESTINATION share) ++++++ otb-fix_lib64_handling.patch ++++++ --- OTB-release-6.6.orig/CMakeLists.txt 2018-07-16 20:53:42.680091190 +0200 +++ OTB-release-6.6/CMakeLists.txt 2018-07-20 10:43:45.231233188 +0200 @@ -268,10 +268,10 @@ if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OTB_BINARY_DIR}/bin) endif() if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OTB_BINARY_DIR}/lib) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OTB_BINARY_DIR}/lib${LIB_SUFFIX}) endif() if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OTB_BINARY_DIR}/lib) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OTB_BINARY_DIR}/lib${LIB_SUFFIX}) endif() set(OTB_MODULES_DIR "${OTB_BINARY_DIR}/${OTB_INSTALL_PACKAGE_DIR}/Modules") --- OTB-release-6.6.orig/Modules/Wrappers/QGIS/src/CMakeLists.txt 2018-07-16 20:53:44.348101904 +0200 +++ OTB-release-6.6/Modules/Wrappers/QGIS/src/CMakeLists.txt 2018-07-20 11:01:56.042829185 +0200 @@ -37,7 +37,7 @@ set(generate_descriptor_cmd "$<TARGET_FI #see gitlab #1593 #if( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux") if(CMAKE_SKIP_RPATH AND "${CMAKE_SYSTEM_NAME}" MATCHES "Linux") - set(generate_descriptor_cmd "env;LD_LIBRARY_PATH=${OTB_BINARY_DIR}/lib;$<TARGET_FILE:otbQgisDescriptor>") + set(generate_descriptor_cmd "env;LD_LIBRARY_PATH=${OTB_BINARY_DIR}/lib${LIB_SUFFIX};$<TARGET_FILE:otbQgisDescriptor>") endif() foreach(app_name ${app_names}) add_dependencies(otbQgisDescriptor otbapp_${app_name})
