File fix-build-with-exiv-0.27.patch of Package strigi
diff -ur a/libstreamanalyzer/cmake/FindExiv2.cmake b/libstreamanalyzer/cmake/FindExiv2.cmake
--- a/libstreamanalyzer/cmake/FindExiv2.cmake 2013-02-05 22:34:52.000000000 +0100
+++ b/libstreamanalyzer/cmake/FindExiv2.cmake 2019-01-29 07:56:20.441068388 +0100
@@ -55,17 +55,24 @@
)
+set(EXIV2_VERSION ${PC_EXIV2_VERSION})
+
# Get the version number from exiv2/version.hpp and store it in the cache:
if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
- file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
- string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define EXIV2_MINOR_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_MINOR "${CMAKE_MATCH_1}")
-
- string(REGEX MATCH "#define EXIV2_PATCH_VERSION +\\( *([0-9]+) *\\)" _dummy "${EXIV2_VERSION_CONTENT}")
- set(EXIV2_VERSION_PATCH "${CMAKE_MATCH_1}")
+ # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
+ foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
+ if(EXISTS "${EXIV2_INCLUDE_DIR}/exiv2/${_exiv2_version_file}")
+ file(READ "${EXIV2_INCLUDE_DIR}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
+ string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
+ string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
+ if(EXIV2_MAJOR_VERSION_MATCH)
+ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_VERSION_MAJOR ${EXIV2_MAJOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_VERSION_MINOR ${EXIV2_MINOR_VERSION_MATCH})
+ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_VERSION_PATCH ${EXIV2_PATCH_VERSION_MATCH})
+ endif()
+ endif()
+ endforeach()
set(EXIV2_VERSION "${EXIV2_VERSION_MAJOR}.${EXIV2_VERSION_MINOR}.${EXIV2_VERSION_PATCH}" CACHE STRING "Version number of Exiv2" FORCE)
endif(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
diff -ur a/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp b/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp
--- a/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp 2013-02-05 22:34:52.000000000 +0100
+++ b/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp 2019-01-29 08:09:13.011200809 +0100
@@ -27,10 +27,8 @@
#include <strigi/fieldtypes.h>
#include <strigi/stringstream.h>
#include <strigi/textutils.h>
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/jpgimage.hpp>
-#include <exiv2/error.hpp>
+#include <exiv2/exiv2.hpp>
+#include <iostream>
#include <math.h>
#include <time.h>