Hello community, here is the log from the commit of package pfstools for openSUSE:Factory checked in at 2017-10-24 22:24:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pfstools (Old) and /work/SRC/openSUSE:Factory/.pfstools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pfstools" Tue Oct 24 22:24:23 2017 rev:36 rq:536219 version:2.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/pfstools/pfstools.changes 2017-04-20 20:51:35.362540013 +0200 +++ /work/SRC/openSUSE:Factory/.pfstools.new/pfstools.changes 2017-10-24 22:24:24.945502947 +0200 @@ -1,0 +2,41 @@ +Wed Sep 6 08:42:24 UTC 2017 - [email protected] + +- Update to version 2.0.6 + * Fixed: --frame frame range spec can now handle negative frame + order, e.g. 30:-1:0 + * Added: Added photon-noise weighting in pfshdrcalibrate - very + small improvement for some images + * Fixed: pfsview does not change zoom settings when flipping + between next/previous images + * Fixed: Fixed bug in pfsin/outimgmagics - missing call to + InitializeMagick causing assertion fault + * Fixed: Fixed bug in pfsouthdrhtml - missing call to + InitializeMagick causing assertion fault + * Added: Matlab MEX files can now be compiled on Windows from + Cygwin using VisualStudio compiler + version 2.0.5: + * fixed: pfsinppm now can read multiple frames using --frames + but also from a ppm file + * fixed: a few typos in the documentation and code (thanks to + Andreas) + * fixed: fixed octave interface to work with Octave 3.8.1 (and + hopefully later versions) + * fixed: octave-config used to automatically determine were to + install Octave files + * fixed: compilation issues with c++-11 + * fixed: bug in the assert statement made some matlab mex + functions to crash (in debug mode) + * fixed: version number string is now correctly reported + * fixed: reverts mistakenly introduced fix from 2.0.0: pfsinpfm + and pfsoutpfm do not flip images (top-bottom) + * fixed: pfs handles now very long tags (by truncating them) + +- Refreshed pfstools-octinstall.patch + +- Dropped pfstools-maptype.patch (no longer necessary) + +- Added pfstools-Qt5.patch to build against Qt5 libs. + +- Spec cleanup + +------------------------------------------------------------------- Old: ---- pfstools-2.0.4.tgz pfstools-maptype.patch New: ---- pfstools-2.0.6.tgz pfstools-Qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pfstools.spec ++++++ --- /var/tmp/diff_new_pack.rIIBij/_old 2017-10-24 22:24:25.693467982 +0200 +++ /var/tmp/diff_new_pack.rIIBij/_new 2017-10-24 22:24:25.697467795 +0200 @@ -17,16 +17,15 @@ %define _libname libpfs2 - Name: pfstools -Version: 2.0.4 +Version: 2.0.6 Release: 0 Summary: High Dynamic Range Image and Video manipulation tools -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other -Source: http://sourceforge.net/projects/pfstools/files/pfstools/%{version}/%{name}-%{version}.tgz +Url: http://www.mpi-sb.mpg.de/resources/pfstools/ +Source: https://sourceforge.net/projects/pfstools/files/pfstools/%{version}/%{name}-%{version}.tgz Patch1: %{name}-gcc.patch -Patch2: pfstools-maptype.patch Patch3: pfstools-octinstall.patch Patch4: pfstools-stdlib.patch Patch5: pfstools-1.8.1-fix-return-in-nonvoid.patch @@ -34,28 +33,31 @@ # patch derived from https://github.com/pld-linux/pfstools/commit/67bd2304e516545f2b203f975ac5dd30d2b479b3 # I guess it could go upstream as is; sent email to mantiuk at gmail Patch7: pfstools-ImageMagick7.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://www.mpi-sb.mpg.de/resources/pfstools/ +# PATCH-FEATURE-UPSTREAM pfstools-Qt5.patch -- build against Qt5 +Patch8: pfstools-Qt5.patch BuildRequires: Mesa -BuildRequires: OpenEXR-devel BuildRequires: blas -BuildRequires: cmake +# previous versions of cmake don't support ImageMagick 7 +BuildRequires: cmake >= 3.9.0 BuildRequires: doxygen +BuildRequires: fdupes BuildRequires: fftw3-threads-devel -BuildRequires: freeglut-devel -BuildRequires: gsl-devel BuildRequires: hdf5-devel BuildRequires: lapack -BuildRequires: libMagick++-devel BuildRequires: libnetpbm-devel -BuildRequires: libqt4-devel -BuildRequires: libtiff-devel BuildRequires: libtool -BuildRequires: octave-devel BuildRequires: pkgconfig BuildRequires: readline-devel +BuildRequires: pkgconfig(Magick++) +BuildRequires: pkgconfig(OpenEXR) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(freeglut) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(octave) Requires: dcraw %description @@ -67,7 +69,7 @@ %package -n %{_libname} Summary: Library for HDR image and video manipulation -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/Libraries %description -n %{_libname} @@ -78,19 +80,18 @@ is similar to netpbm for low-dynamic range images. #Disable until opencv can be enabled. -#%package -n pfscalign +#%%package -n pfscalign #Summary: Align image stack #License: GPL-2.0+ and LGPL-2.1+ #Group: Productivity/Multimedia/Other - #%%description -n pfscalign #Align multiple exposures using homographic transformation. The command #uses a similar feature-point based method as most panorama stitching software. %package -n pfscalibration Summary: Photometric Calibration of HDR and LDR Cameras -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other Requires: dcraw Requires: jhead @@ -106,7 +107,7 @@ %package -n pfstmo Summary: Tone Mapping Operators for High Dynamic Range Images -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other %description -n pfstmo @@ -115,7 +116,7 @@ %package -n pfsview Summary: Qt-based viewer for HDR files -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other %description -n pfsview @@ -123,7 +124,7 @@ %package -n pfsglview Summary: GL-based viewer for HDR files -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other %description -n pfsglview @@ -131,7 +132,7 @@ %package exr Summary: EXR file import and export for PFS tools -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other %description exr @@ -140,7 +141,7 @@ %package imgmagick Summary: ImageMagick file import for PFS tools -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other %description imgmagick @@ -149,7 +150,7 @@ %package octave Summary: Octave interaction with PFS tools -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Productivity/Multimedia/Other Requires: octave @@ -158,10 +159,10 @@ or luminance channels in PFS streams using Octave. %package devel -Requires: %{_libname} = %{version} Summary: Development files for libpfs, a library for HDR image and video manipulation License: GPL-2.0+ Group: Development/Libraries/C and C++ +Requires: %{_libname} = %{version} %description devel The pfstools package is a set of command line (and one GUI) programs @@ -174,12 +175,13 @@ %prep %setup -q %patch1 -%patch2 -p1 %patch3 -p1 %patch4 %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 +chmod -x ChangeLog %build %cmake @@ -188,16 +190,15 @@ %install cd build %make_install -rm -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print grep -r include %{buildroot}%{_includedir} | awk -F: '{print $2}' +%fdupes -s %{buildroot}%{_mandir} %post -n %{_libname} -p /sbin/ldconfig - %postun -n %{_libname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README TODO doc/faq.txt +%doc AUTHORS ChangeLog COPYING README doc/faq.txt %dir %{_datadir}/%{name} %{_bindir}/pfsabsolute %{_bindir}/pfscat @@ -236,68 +237,63 @@ %{_datadir}/pfstools/hdrhtml_t_b3.csv %{_datadir}/pfstools/hdrhtml_t_b4.csv %{_datadir}/pfstools/hdrhtml_t_b5.csv -%{_mandir}/man1/pfsabsolute.1.gz -%{_mandir}/man1/pfscat.1.gz -%{_mandir}/man1/pfsclamp.1.gz -%{_mandir}/man1/pfscut.1.gz -%{_mandir}/man1/pfsdisplayfunction.1.gz -%{_mandir}/man1/pfsextractchannels.1.gz -%{_mandir}/man1/pfsflip.1.gz -%{_mandir}/man1/pfsgamma.1.gz -%{_mandir}/man1/pfsin.1.gz -%{_mandir}/man1/pfsindcraw.1.gz -%{_mandir}/man1/pfsinpfm.1.gz -%{_mandir}/man1/pfsinppm.1.gz -%{_mandir}/man1/pfsinrgbe.1.gz -%{_mandir}/man1/pfsintiff.1.gz -%{_mandir}/man1/pfsout.1.gz -%{_mandir}/man1/pfsouthdrhtml.1.gz -%{_mandir}/man1/pfsoutpfm.1.gz -%{_mandir}/man1/pfsoutppm.1.gz -%{_mandir}/man1/pfsoutrgbe.1.gz -%{_mandir}/man1/pfsouttiff.1.gz -%{_mandir}/man1/pfspad.1.gz -%{_mandir}/man1/pfspanoramic.1.gz -%{_mandir}/man1/pfsrotate.1.gz -%{_mandir}/man1/pfssize.1.gz -%{_mandir}/man1/pfstag.1.gz -%{_mandir}/man1/pfscolortransform.1.gz -%{_mandir}/man1/pfsretime.1.gz +%{_mandir}/man1/pfsabsolute.1%{ext_man} +%{_mandir}/man1/pfscat.1%{ext_man} +%{_mandir}/man1/pfsclamp.1%{ext_man} +%{_mandir}/man1/pfscut.1%{ext_man} +%{_mandir}/man1/pfsdisplayfunction.1%{ext_man} +%{_mandir}/man1/pfsextractchannels.1%{ext_man} +%{_mandir}/man1/pfsflip.1%{ext_man} +%{_mandir}/man1/pfsgamma.1%{ext_man} +%{_mandir}/man1/pfsin.1%{ext_man} +%{_mandir}/man1/pfsindcraw.1%{ext_man} +%{_mandir}/man1/pfsinpfm.1%{ext_man} +%{_mandir}/man1/pfsinppm.1%{ext_man} +%{_mandir}/man1/pfsinrgbe.1%{ext_man} +%{_mandir}/man1/pfsintiff.1%{ext_man} +%{_mandir}/man1/pfsout.1%{ext_man} +%{_mandir}/man1/pfsouthdrhtml.1%{ext_man} +%{_mandir}/man1/pfsoutpfm.1%{ext_man} +%{_mandir}/man1/pfsoutppm.1%{ext_man} +%{_mandir}/man1/pfsoutrgbe.1%{ext_man} +%{_mandir}/man1/pfsouttiff.1%{ext_man} +%{_mandir}/man1/pfspad.1%{ext_man} +%{_mandir}/man1/pfspanoramic.1%{ext_man} +%{_mandir}/man1/pfsrotate.1%{ext_man} +%{_mandir}/man1/pfssize.1%{ext_man} +%{_mandir}/man1/pfstag.1%{ext_man} +%{_mandir}/man1/pfscolortransform.1%{ext_man} +%{_mandir}/man1/pfsretime.1%{ext_man} %files -n %{_libname} -%defattr(-,root,root) %{_libdir}/libpfs.so.* %files devel -%defattr(-,root,root) %doc doc/faq.txt %{_includedir}/* %{_libdir}/pkgconfig/*.pc %{_libdir}/libpfs.so #Disabled until we can renable opencv -#$%files -n pfscalign -#%defattr(-,root,root) -#%{_bindir}/pfsalign -#%{_mandir}/man1/pfsalign.1.gz +#%%files -n pfscalign +#%%{_bindir}/pfsalign +#%%{_mandir}/man1/pfsalign%%{ext_man} %files -n pfscalibration -%defattr(-,root,root) %{_bindir}/dcraw2hdrgen %{_bindir}/jpeg2hdrgen %{_bindir}/pfshdrcalibrate %{_bindir}/pfsinhdrgen %{_bindir}/pfsinme %{_bindir}/pfsplotresponse -%{_mandir}/man1/dcraw2hdrgen.1.gz -%{_mandir}/man1/jpeg2hdrgen.1.gz -%{_mandir}/man1/pfshdrcalibrate.1.gz -%{_mandir}/man1/pfsinhdrgen.1.gz -%{_mandir}/man1/pfsinme.1.gz -%{_mandir}/man1/pfsplotresponse.1.gz +%{_mandir}/man1/dcraw2hdrgen.1%{ext_man} +%{_mandir}/man1/jpeg2hdrgen.1%{ext_man} +%{_mandir}/man1/pfshdrcalibrate.1%{ext_man} +%{_mandir}/man1/pfsinhdrgen.1%{ext_man} +%{_mandir}/man1/pfsinme.1%{ext_man} +%{_mandir}/man1/pfsplotresponse.1%{ext_man} %files -n pfstmo -%defattr(-,root,root) %{_bindir}/pfstmo_reinhard05 %{_bindir}/pfstmo_pattanaik00 %{_bindir}/pfstmo_mantiuk06 @@ -308,44 +304,39 @@ %{_bindir}/pfstmo_mantiuk08 %{_bindir}/pfstmo_ferradans11 %{_bindir}/pfstmo_mai11 -%{_mandir}/man1/pfstmo_reinhard05.1.gz -%{_mandir}/man1/pfstmo_pattanaik00.1.gz -%{_mandir}/man1/pfstmo_mantiuk06.1.gz -%{_mandir}/man1/pfstmo_fattal02.1.gz -%{_mandir}/man1/pfstmo_drago03.1.gz -%{_mandir}/man1/pfstmo_reinhard02.1.gz -%{_mandir}/man1/pfstmo_durand02.1.gz -%{_mandir}/man1/pfstmo_mantiuk08.1.gz -%{_mandir}/man1/pfstmo_ferradans11.1.gz -%{_mandir}/man1/pfstmo_mai11.1.gz +%{_mandir}/man1/pfstmo_reinhard05.1%{ext_man} +%{_mandir}/man1/pfstmo_pattanaik00.1%{ext_man} +%{_mandir}/man1/pfstmo_mantiuk06.1%{ext_man} +%{_mandir}/man1/pfstmo_fattal02.1%{ext_man} +%{_mandir}/man1/pfstmo_drago03.1%{ext_man} +%{_mandir}/man1/pfstmo_reinhard02.1%{ext_man} +%{_mandir}/man1/pfstmo_durand02.1%{ext_man} +%{_mandir}/man1/pfstmo_mantiuk08.1%{ext_man} +%{_mandir}/man1/pfstmo_ferradans11.1%{ext_man} +%{_mandir}/man1/pfstmo_mai11.1%{ext_man} %files -n pfsview -%defattr(-,root,root) %{_bindir}/pfsv %{_bindir}/pfsview -%{_mandir}/man1/pfsview.1.gz +%{_mandir}/man1/pfsview.1%{ext_man} %files -n pfsglview -%defattr(-,root,root) %{_bindir}/pfsglview -%{_mandir}/man1/pfsglview.1.gz +%{_mandir}/man1/pfsglview.1%{ext_man} %files exr -%defattr(-,root,root) %{_bindir}/pfsinexr %{_bindir}/pfsoutexr -%{_mandir}/man1/pfsinexr.1.gz -%{_mandir}/man1/pfsoutexr.1.gz +%{_mandir}/man1/pfsinexr.1%{ext_man} +%{_mandir}/man1/pfsoutexr.1%{ext_man} %files imgmagick -%defattr(-,root,root) %{_bindir}/pfsinimgmagick %{_bindir}/pfsoutimgmagick -%{_mandir}/man1/pfsinimgmagick.1.gz -%{_mandir}/man1/pfsoutimgmagick.1.gz +%{_mandir}/man1/pfsinimgmagick.1%{ext_man} +%{_mandir}/man1/pfsoutimgmagick.1%{ext_man} %files octave -%defattr(-,root,root) %{_bindir}/pfsoctavelum %{_bindir}/pfsoctavergb %{_bindir}/pfsstat @@ -354,8 +345,8 @@ %dir %{_libdir}/octave/*/site/oct/*/ %{_libdir}/octave/*/site/oct/*/pfstools/ %{_datadir}/octave/*/site/m/pfstools/ -%{_mandir}/man1/pfsoctavelum.1.gz -%{_mandir}/man1/pfsoctavergb.1.gz -%{_mandir}/man1/pfsstat.1.gz +%{_mandir}/man1/pfsoctavelum.1%{ext_man} +%{_mandir}/man1/pfsoctavergb.1%{ext_man} +%{_mandir}/man1/pfsstat.1%{ext_man} %changelog ++++++ pfstools-2.0.4.tgz -> pfstools-2.0.6.tgz ++++++ ++++ 1873 lines of diff (skipped) ++++++ pfstools-Qt5.patch ++++++ Index: pfstools-2.0.6/CMakeLists.txt =================================================================== --- pfstools-2.0.6.orig/CMakeLists.txt +++ pfstools-2.0.6/CMakeLists.txt @@ -174,17 +174,17 @@ OPTION(WITH_QT "Use QT library" ON) if( WITH_QT ) - find_package(Qt4) - if( NOT QT_FOUND ) - MESSAGE( STATUS "Qt4 library not found. The following commands + find_package(Qt5 COMPONENTS Core Widgets REQUIRED) + if( NOT Qt5_FOUND ) + MESSAGE( STATUS "Qt5 libraries not found. The following commands will not be compiled: pfsview. " ) - else( NOT QT_FOUND ) - MESSAGE( STATUS "Qt4 found" ) - endif( NOT QT_FOUND ) + else( NOT Qt5_FOUND ) + MESSAGE( STATUS "Qt5 found" ) + endif( NOT Qt5_FOUND ) else( WITH_QT ) - set( QT_FOUND OFF ) + set( Qt5_FOUND OFF ) endif( WITH_QT ) Index: pfstools-2.0.6/src/pfsview/CMakeLists.txt =================================================================== --- pfstools-2.0.6.orig/src/pfsview/CMakeLists.txt +++ pfstools-2.0.6/src/pfsview/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories ("${PROJECT_BINARY_DIR}/" "${PROJECT_SOURCE_DIR}/src/pfs" ${QT_INCLUDES}) +include_directories ("${PROJECT_BINARY_DIR}/" "${PROJECT_SOURCE_DIR}/src/pfs" "${Qt5Widgets_INCLUDE_DIRS}") if( NOT HAS_GETOPT ) include_directories ("${GETOPT_INCLUDE}") endif( NOT HAS_GETOPT ) @@ -14,9 +14,9 @@ if (OPENMP_FOUND) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") endif() -QT4_WRAP_CPP(pfsview_HEADERS_MOC ${pfsview_HEADERS}) +QT5_WRAP_CPP(pfsview_HEADERS_MOC ${pfsview_HEADERS}) -QT4_WRAP_CPP(pfsview_HEADERS_MOC ${pfsview_HEADERS}) +QT5_WRAP_CPP(pfsview_HEADERS_MOC ${pfsview_HEADERS}) # Replace the tag with the path to bash file(READ ${CMAKE_CURRENT_SOURCE_DIR}/pfsv.in file_content) @@ -30,7 +30,7 @@ install (FILES "${CMAKE_CURRENT_BINARY_D ADD_EXECUTABLE(pfsview ${pfsview_SOURCES} ${pfsview_HEADERS_MOC} "${GETOPT_OBJECT}") -TARGET_LINK_LIBRARIES(pfsview pfs ${QT_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) +TARGET_LINK_LIBRARIES(pfsview pfs Qt5::Widgets) install (TARGETS pfsview DESTINATION bin) install (FILES pfsview.1 DESTINATION ${MAN_DIR}) Index: pfstools-2.0.6/src/pfsview/main.cpp =================================================================== --- pfstools-2.0.6.orig/src/pfsview/main.cpp +++ pfstools-2.0.6/src/pfsview/main.cpp @@ -460,7 +460,7 @@ void PFSViewMainWin::updatePointerValue( } else { // Single channel const QString &name = channelSelection->itemText( channelSel ); - sprintf( pointerValueStr, "%s=%07.4g", (const char*)name.toAscii(), pv.value[0] ); + sprintf( pointerValueStr, "%s=%07.4g", (const char*)name.toLatin1(), pv.value[0] ); label += pointerValueStr; lumRange->showValuePointer( log10(pv.value[0]) ); } @@ -547,7 +547,7 @@ void PFSViewMainWin::setChannelSelection if( pfsView->hasColorChannels() && selectedChannel < scLabelsCount ) { pfsView->setVisibleChannel( NULL ); // Color } else { - pfsView->setVisibleChannel( (const char*)name.toAscii() ); + pfsView->setVisibleChannel( (const char*)name.toLatin1() ); } updateMenuEnable( ); Index: pfstools-2.0.6/src/CMakeLists.txt =================================================================== --- pfstools-2.0.6.orig/src/CMakeLists.txt +++ pfstools-2.0.6/src/CMakeLists.txt @@ -10,9 +10,9 @@ if( ImageMagick_FOUND ) add_subdirectory (hdrhtml) endif( ImageMagick_FOUND ) -if( QT_FOUND ) +if( Qt5_FOUND ) add_subdirectory (pfsview) -endif( QT_FOUND ) +endif( Qt5_FOUND ) if( MATLAB_FOUND ) add_subdirectory (matlab) ++++++ pfstools-octinstall.patch ++++++ --- /var/tmp/diff_new_pack.rIIBij/_old 2017-10-24 22:24:25.941456390 +0200 +++ /var/tmp/diff_new_pack.rIIBij/_new 2017-10-24 22:24:25.941456390 +0200 @@ -1,16 +1,17 @@ -diff -up pfstools-2.0.4/CMakeLists.txt.octinstall pfstools-2.0.4/CMakeLists.txt ---- pfstools-2.0.4/CMakeLists.txt.octinstall 2015-07-20 13:06:32.533996797 +0200 -+++ pfstools-2.0.4/CMakeLists.txt 2015-07-20 13:11:35.728808062 +0200 -@@ -277,8 +277,6 @@ OPTION(WITH_HDRVC "Compile HDRVC (intern - # ======== MKOCTFILE/OCTAVE =========== +Index: pfstools-2.0.6/CMakeLists.txt +=================================================================== +--- pfstools-2.0.6.orig/CMakeLists.txt ++++ pfstools-2.0.6/CMakeLists.txt +@@ -278,8 +278,6 @@ OPTION(WITH_HDRVC "Compile HDRVC (intern OPTION(WITH_Octave "Compile Octave files" ON) --SET (OCTAVE_DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/pfstools/octave" --CACHE PATH "Copy octave functions to this directory") - if( WITH_Octave ) - -@@ -289,7 +287,8 @@ if( WITH_Octave ) +-SET (OCTAVE_DEST_DIR "" CACHE PATH "Install octave .m and .oct files in this directory") +- + if( OCTAVE_DEST_DIR ) + set( OCTAVE_OCT_DIR ${OCTAVE_DEST_DIR} ) + set( OCTAVE_M_DIR ${OCTAVE_DEST_DIR} ) +@@ -299,7 +297,8 @@ if( WITH_Octave ) if(MKOCTFILE) message(STATUS "mkoctfile found.") endif() @@ -20,19 +21,20 @@ endif( WITH_Octave ) # ======== OpenCV =========== -diff -up pfstools-2.0.4/src/octave/CMakeLists.txt.octinstall pfstools-2.0.4/src/octave/CMakeLists.txt ---- pfstools-2.0.4/src/octave/CMakeLists.txt.octinstall 2015-07-20 13:03:30.448679088 +0200 -+++ pfstools-2.0.4/src/octave/CMakeLists.txt 2015-07-20 13:12:42.873544809 +0200 +Index: pfstools-2.0.6/src/octave/CMakeLists.txt +=================================================================== +--- pfstools-2.0.6.orig/src/octave/CMakeLists.txt ++++ pfstools-2.0.6/src/octave/CMakeLists.txt @@ -40,11 +40,11 @@ endforeach(SRC) foreach(SRC ${SRC_OCT}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SRC}.oct PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE WORLD_READ GROUP_READ OWNER_READ -- DESTINATION ${OCTAVE_DEST_DIR}) -+ DESTINATION "${OCTAVE_OCT_DIR}/pfstools") +- DESTINATION "${OCTAVE_OCT_DIR}") ++ DESTINATION "${OCTAVE_OCT_DIR}/pfstools") endforeach(SRC) foreach(SRC ${SRC_M}) -- install (FILES ${SRC} DESTINATION ${OCTAVE_DEST_DIR}) +- install (FILES ${SRC} DESTINATION "${OCTAVE_M_DIR}") + install (FILES ${SRC} DESTINATION "${OCTAVE_M_DIR}/pfstools") endforeach(SRC)
