Index: head/astro/gpscorrelate/files/patch-exif-gps.cpp =================================================================== --- head/astro/gpscorrelate/files/patch-exif-gps.cpp (nonexistent) +++ head/astro/gpscorrelate/files/patch-exif-gps.cpp (revision 506383) @@ -0,0 +1,13 @@ +--- exif-gps.cpp.orig 2019-07-07 08:26:16 UTC ++++ exif-gps.cpp +@@ -40,9 +40,7 @@ + #include + #include + +- +-#include "exiv2/image.hpp" +-#include "exiv2/exif.hpp" ++#include + + #include "gpsstructure.h" + #include "exif-gps.h" Property changes on: head/astro/gpscorrelate/files/patch-exif-gps.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/astro/merkaartor/files/patch-git_e6d015a9 =================================================================== --- head/astro/merkaartor/files/patch-git_e6d015a9 (revision 506382) +++ head/astro/merkaartor/files/patch-git_e6d015a9 (revision 506383) @@ -1,36 +1,39 @@ commit e6d015a953a163f174e09a9b50c9bb8bc19593e4 Author: Ladislav Láska Date: Mon Jul 27 14:22:37 2015 +0200 Fixed compilation issues with GEOIMAGE=1 and Qt5. --- src/Docks/GeoImageDock.cpp.orig 2015-07-19 14:50:09 UTC +++ src/Docks/GeoImageDock.cpp -@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis +@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames) Exiv2::Image::AutoPtr image; Exiv2::ExifData exifData; - bool positionValid = FALSE; + bool positionValid = false; Layer *theLayer; if (photoLayer == NULL) { -@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage( +@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString double lat = 0.0, lon = 0.0; Exiv2::Image::AutoPtr image; Exiv2::ExifData exifData; - bool positionValid = FALSE; + bool positionValid = false; if (!QFile::exists(file)) { return pos; --- src/Docks/GeoImageDock.h.orig 2015-07-19 14:50:09 UTC +++ src/Docks/GeoImageDock.h -@@ -9,6 +9,7 @@ +@@ -7,8 +7,8 @@ + #include + #include #include - #include - #include +-#include +-#include ++#include +#include class ImageView; Index: head/graphics/exiv2/files/patch-git_04c9b1 =================================================================== --- head/graphics/exiv2/files/patch-git_04c9b1 (revision 506382) +++ head/graphics/exiv2/files/patch-git_04c9b1 (nonexistent) @@ -1,88 +0,0 @@ -Slightly modified: - -From 04c9b181cc2c7741fcb134ccc43f2bafc1f86f19 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= -Date: Sat, 12 Jan 2019 12:15:27 +0000 -Subject: [PATCH] Fix #644. Export specializations of BasicError - -- Only export BasicError::setMsg which is the only implementation present in the .cpp -- Only export BasicError specialization on __APPLE__ - -It seems that gcc automatically adds the attribute when the visibility -settings are set to hidden. See this link for more information: -https://reviews.llvm.org/D35388 ---- - cmake/mainSetup.cmake | 6 ++++-- - include/exiv2/error.hpp | 3 ++- - src/error.cpp | 6 ++++-- - 3 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake -index 05c16004d..a4d983d4c 100644 ---- cmake/mainSetup.cmake -+++ cmake/mainSetup.cmake -@@ -13,8 +13,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - --set(CMAKE_CXX_VISIBILITY_PRESET hidden) --set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) -+if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") -+ set(CMAKE_CXX_VISIBILITY_PRESET hidden) -+ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) -+endif() - - set(CMAKE_CXX_STANDARD 98) - set(CMAKE_CXX_STANDARD_REQUIRED ON) -diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp -index 0f9714e5b..42a0959c4 100644 ---- include/exiv2/error.hpp -+++ include/exiv2/error.hpp -@@ -315,7 +315,7 @@ namespace Exiv2 { - std::basic_string arg3_; //!< Third argument - std::string msg_; //!< Complete error message - #ifdef EXV_UNICODE_PATH -- std::wstring wmsg_; //!< Complete error message as a wide string -+ std::wstring wmsg_; //!< Complete error message as a wide string - #endif - }; // class BasicError - -@@ -389,6 +389,7 @@ namespace Exiv2 { - return wmsg_.c_str(); - } - #endif -+ - #ifdef _MSC_VER - # pragma warning( default : 4275 ) - #endif -diff --git a/src/error.cpp b/src/error.cpp -index 6d3a24bd8..c8e2d9e0d 100644 ---- src/error.cpp -+++ src/error.cpp -@@ -224,7 +224,6 @@ namespace Exiv2 { - { - } - -- //! @cond IGNORE - template<> - void BasicError::setMsg() - { -@@ -257,7 +256,9 @@ namespace Exiv2 { - wmsg_ = s2ws(msg); - #endif - } -- //! @endcond -+#ifdef __FreeBSD__ -+ template class EXIV2API BasicError; -+#endif - - #ifdef EXV_UNICODE_PATH - template<> -@@ -291,6 +292,7 @@ namespace Exiv2 { - wmsg_ = wmsg; - msg_ = ws2s(wmsg); - } -+ template class EXIV2API BasicError; - #endif - - const char* errMsg(int code) Property changes on: head/graphics/exiv2/files/patch-git_04c9b1 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/exiv2/Makefile =================================================================== --- head/graphics/exiv2/Makefile (revision 506382) +++ head/graphics/exiv2/Makefile (revision 506383) @@ -1,39 +1,38 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= exiv2 -DISTVERSION= 0.27.0 -DISTVERSIONSUFFIX= a-Source -PORTREVISION= 1 +DISTVERSION= 0.27.1 +DISTVERSIONSUFFIX= -Source PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.exiv2.org/builds/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Exif, IPTC, and XMP metadata manipulation library and tools LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 USES= cmake compiler:c++11-lang cpe gettext iconv pathfix localbase:ldflags USE_LDCONFIG= yes LDFLAGS+= -lintl CMAKE_ON= EXIV2_ENABLE_VIDEO \ EXIV2_BUILD_PO CMAKE_OFF= EXIV2_ENABLE_LIBXMP OPTIONS_DEFINE= SAMPLE OPTIONS_SUB= yes SAMPLE_DESC= Include sample applications SAMPLE_CMAKE_BOOL= EXIV2_BUILD_SAMPLES PATHFIX_CMAKELISTSTXT= CMakeChecks.txt WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source .include Index: head/graphics/exiv2/distinfo =================================================================== --- head/graphics/exiv2/distinfo (revision 506382) +++ head/graphics/exiv2/distinfo (revision 506383) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550640374 -SHA256 (exiv2-0.27.0a-Source.tar.gz) = a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f -SIZE (exiv2-0.27.0a-Source.tar.gz) = 27168207 +TIMESTAMP = 1557685573 +SHA256 (exiv2-0.27.1-Source.tar.gz) = f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081 +SIZE (exiv2-0.27.1-Source.tar.gz) = 27210365 Index: head/graphics/exiv2/pkg-plist =================================================================== --- head/graphics/exiv2/pkg-plist (revision 506382) +++ head/graphics/exiv2/pkg-plist (revision 506383) @@ -1,109 +1,110 @@ %%SAMPLE%%bin/addmoddel %%SAMPLE%%bin/convert-test %%SAMPLE%%bin/easyaccess-test %%SAMPLE%%bin/exifcomment %%SAMPLE%%bin/exifdata %%SAMPLE%%bin/exifdata-test %%SAMPLE%%bin/exifprint %%SAMPLE%%bin/exifvalue bin/exiv2 %%SAMPLE%%bin/exiv2json %%SAMPLE%%bin/geotag %%SAMPLE%%bin/ini-test %%SAMPLE%%bin/iotest %%SAMPLE%%bin/iptceasy %%SAMPLE%%bin/iptcprint %%SAMPLE%%bin/iptctest %%SAMPLE%%bin/key-test %%SAMPLE%%bin/largeiptc-test %%SAMPLE%%bin/metacopy %%SAMPLE%%bin/mmap-test %%SAMPLE%%bin/mrwthumb %%SAMPLE%%bin/path-test %%SAMPLE%%bin/prevtest %%SAMPLE%%bin/stringto-test %%SAMPLE%%bin/taglist %%SAMPLE%%bin/tiff-test %%SAMPLE%%bin/werror-test %%SAMPLE%%bin/write-test %%SAMPLE%%bin/write2-test %%SAMPLE%%bin/xmpdump %%SAMPLE%%bin/xmpparse %%SAMPLE%%bin/xmpparser-test %%SAMPLE%%bin/xmpprint %%SAMPLE%%bin/xmpsample include/exiv2/asfvideo.hpp include/exiv2/basicio.hpp include/exiv2/bigtiffimage.hpp include/exiv2/bmpimage.hpp include/exiv2/config.h include/exiv2/convert.hpp include/exiv2/cr2image.hpp include/exiv2/crwimage.hpp include/exiv2/datasets.hpp include/exiv2/easyaccess.hpp include/exiv2/epsimage.hpp include/exiv2/error.hpp include/exiv2/exif.hpp include/exiv2/exiv2.hpp include/exiv2/exiv2lib_export.h include/exiv2/exv_conf.h include/exiv2/futils.hpp include/exiv2/gifimage.hpp include/exiv2/http.hpp include/exiv2/image.hpp include/exiv2/ini.hpp include/exiv2/iptc.hpp include/exiv2/jp2image.hpp include/exiv2/jpgimage.hpp include/exiv2/matroskavideo.hpp include/exiv2/metadatum.hpp include/exiv2/mrwimage.hpp include/exiv2/orfimage.hpp include/exiv2/pgfimage.hpp include/exiv2/pngimage.hpp include/exiv2/preview.hpp include/exiv2/properties.hpp include/exiv2/psdimage.hpp include/exiv2/quicktimevideo.hpp include/exiv2/rafimage.hpp include/exiv2/riffvideo.hpp include/exiv2/rw2image.hpp include/exiv2/rwlock.hpp include/exiv2/slice.hpp include/exiv2/ssh.hpp include/exiv2/tags.hpp include/exiv2/tgaimage.hpp include/exiv2/tiffimage.hpp include/exiv2/types.hpp include/exiv2/utilsvideo.hpp include/exiv2/value.hpp include/exiv2/version.hpp include/exiv2/webpimage.hpp include/exiv2/xmp_exiv2.hpp include/exiv2/xmpsidecar.hpp +lib/exiv2/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake +lib/exiv2/cmake/exiv2Config.cmake +lib/exiv2/cmake/exiv2ConfigVersion.cmake lib/libexiv2.so -lib/libexiv2.so.0.27.0 +lib/libexiv2.so.0.27.1 lib/libexiv2.so.27 -lib/libxmp.a +lib/libexiv2-xmp.a libdata/pkgconfig/exiv2.pc man/man1/exiv2.1.gz %%SAMPLE%%man/man1/exiv2samples.1.gz -%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake -%%DATADIR%%/cmake/exiv2Config.cmake share/locale/bs/LC_MESSAGES/exiv2.mo share/locale/ca/LC_MESSAGES/exiv2.mo share/locale/de/LC_MESSAGES/exiv2.mo share/locale/es/LC_MESSAGES/exiv2.mo share/locale/fi/LC_MESSAGES/exiv2.mo share/locale/fr/LC_MESSAGES/exiv2.mo share/locale/gl/LC_MESSAGES/exiv2.mo share/locale/ms/LC_MESSAGES/exiv2.mo share/locale/pl/LC_MESSAGES/exiv2.mo share/locale/pt/LC_MESSAGES/exiv2.mo share/locale/ru/LC_MESSAGES/exiv2.mo share/locale/sk/LC_MESSAGES/exiv2.mo share/locale/sv/LC_MESSAGES/exiv2.mo share/locale/ug/LC_MESSAGES/exiv2.mo share/locale/uk/LC_MESSAGES/exiv2.mo share/locale/vi/LC_MESSAGES/exiv2.mo Index: head/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp =================================================================== --- head/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp (nonexistent) +++ head/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp (revision 506383) @@ -0,0 +1,12 @@ +--- src/gimplensfun.cpp.orig 2019-07-07 08:42:51 UTC ++++ src/gimplensfun.cpp +@@ -37,8 +37,7 @@ CHANGES: + #include + #include + +-#include +-#include ++#include + + #define VERSIONSTR "0.2.4-dev" + Property changes on: head/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp =================================================================== --- head/graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp (nonexistent) +++ head/graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp (revision 506383) @@ -0,0 +1,14 @@ +--- src/hugin1/hugin/RawImport.cpp.orig 2019-07-07 08:40:09 UTC ++++ src/hugin1/hugin/RawImport.cpp +@@ -35,10 +35,7 @@ + // workaround for a conflict between exiv2 and wxWidgets/CMake built + #define HAVE_PID_T 1 + #endif +-#include +-#include +-#include +-#include ++#include + #ifdef __WXMSW__ + #include + #endif Property changes on: head/graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp =================================================================== --- head/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp (nonexistent) +++ head/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp (revision 506383) @@ -0,0 +1,13 @@ +--- src/hugin_base/panodata/SrcPanoImage.cpp.orig 2019-07-07 08:31:01 UTC ++++ src/hugin_base/panodata/SrcPanoImage.cpp +@@ -40,9 +40,7 @@ + #include + #include + #include +-#include +-#include +-#include ++#include + #include + #include "Exiv2Helper.h" + Property changes on: head/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp =================================================================== --- head/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp (nonexistent) +++ head/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp (revision 506383) @@ -0,0 +1,11 @@ +--- src/Exif/ExifOperations.cpp.orig 2019-07-07 08:28:28 UTC ++++ src/Exif/ExifOperations.cpp +@@ -34,7 +34,7 @@ + + #include + +-#include ++#include + #include + + #include "ExifOperations.h" Property changes on: head/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp =================================================================== --- head/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp (revision 506382) +++ head/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp (revision 506383) @@ -1,11 +1,19 @@ ---- src/DkCore/DkMetaData.cpp.orig 2019-03-08 21:53:21 UTC +--- src/DkCore/DkMetaData.cpp.orig 2019-07-07 07:58:56 UTC +++ src/DkCore/DkMetaData.cpp -@@ -1262,7 +1262,7 @@ void DkMetaDataT::printMetaData() const { +@@ -40,6 +40,7 @@ + #include + #include + #pragma warning(pop) // no warnings from includes - end ++#include + + namespace nmc { + +@@ -1262,7 +1263,7 @@ void DkMetaDataT::printMetaData() const { std::string xmpPacket; if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) { - throw Exiv2::Error(1, "Failed to serialize XMP data"); + throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "Failed to serialize XMP data"); } std::cout << xmpPacket << "\n"; } Index: head/graphics/photivo/Makefile =================================================================== --- head/graphics/photivo/Makefile (revision 506382) +++ head/graphics/photivo/Makefile (revision 506383) @@ -1,49 +1,49 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= photivo PORTVERSION= 0.0.2015.03.21 PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/ DISTNAME= source-archive DIST_SUBDIR= ${PORTNAME} MAINTAINER= danfe@FreeBSD.org COMMENT= Free and open source photo processor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libexiv2.so:graphics/exiv2 \ liblqr-1.so:graphics/liblqr-1 \ liblensfun.so:graphics/lensfun \ libGraphicsMagick.so:graphics/GraphicsMagick \ libfftw3.so:math/fftw3 USES= cmake compiler:c++11-lib desktop-file-utils dos2unix \ gettext-runtime gnome jpeg pkgconfig qt:5 zip USE_GNOME= glib20 USE_QT= qmake_build buildtools_build core gui network widgets DOS2UNIX_FILES= Sources/ptImage.cpp Sources/ptCheck.cpp Sources/filemgmt/ptFileMgrWindow.h \ - Sources/ptImageHelper.h Sources/ptMainWindow.h + Sources/ptImageHelper.h Sources/ptMainWindow.h Sources/ptImageHelper.cpp WRKSRC= ${WRKDIR}/${PORTNAME} post-patch: @${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \ ${WRKSRC}/Sources/ptCimg.cpp \ ${WRKSRC}/Sources/ptImage_Pyramid.cpp @${REINPLACE_CMD} -e '/#include "\.\.\/ptImage\.h"/ \ { x ; s/.*/#include / ; H ; x ; }' \ ${WRKSRC}/Sources/filters/ptFilter_EAWavelets.cpp \ ${WRKSRC}/Sources/filters/ptFilter_FilmGrain.cpp \ ${WRKSRC}/Sources/filters/ptFilter_HighpassSharpen.cpp \ ${WRKSRC}/Sources/filters/ptFilter_PyramidDenoise.cpp \ ${WRKSRC}/Sources/filters/ptFilter_StdCurve.cpp \ ${WRKSRC}/Sources/filters/ptFilter_WaveletDenoise.cpp @${REINPLACE_CMD} -e '/static const char src/s,char,int8_t,' \ ${WRKSRC}/Sources/ptDcRaw.cpp .include Index: head/graphics/photivo/files/patch-Sources_ptImageHelper.cpp =================================================================== --- head/graphics/photivo/files/patch-Sources_ptImageHelper.cpp (nonexistent) +++ head/graphics/photivo/files/patch-Sources_ptImageHelper.cpp (revision 506383) @@ -0,0 +1,10 @@ +--- Sources/ptImageHelper.cpp.orig 2019-07-07 08:34:52 UTC ++++ Sources/ptImageHelper.cpp +@@ -34,6 +34,7 @@ + #pragma GCC diagnostic pop + #include + ++#include + #include + #include + Property changes on: head/graphics/photivo/files/patch-Sources_ptImageHelper.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h =================================================================== --- head/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h (nonexistent) +++ head/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h (revision 506383) @@ -0,0 +1,12 @@ +--- cplusplus/scripts/getanddostuff/manipulation.h.orig 2019-07-07 08:24:57 UTC ++++ cplusplus/scripts/getanddostuff/manipulation.h +@@ -37,8 +37,7 @@ + #include "../../logger.h" + + #ifdef EXIV2 +-#include +-#include ++#include + #endif + + class GetAndDoStuffManipulation : public QObject { Property changes on: head/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h =================================================================== --- head/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h (nonexistent) +++ head/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h (revision 506383) @@ -0,0 +1,12 @@ +--- cplusplus/scripts/getmetadata.h.orig 2019-07-07 08:22:25 UTC ++++ cplusplus/scripts/getmetadata.h +@@ -34,8 +34,7 @@ + #include "../logger.h" + + #ifdef EXIV2 +-#include +-#include ++#include + #endif + + class GetMetaData : public QObject { Property changes on: head/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/ufraw/files/patch-gentoo_b5b414 =================================================================== --- head/graphics/ufraw/files/patch-gentoo_b5b414 (revision 506382) +++ head/graphics/ufraw/files/patch-gentoo_b5b414 (revision 506383) @@ -1,28 +1,28 @@ https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch ---- ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200 -+++ ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100 -@@ -15,9 +15,7 @@ +--- ufraw_exiv2.cc.orig 2016-11-13 04:00:05 UTC ++++ ufraw_exiv2.cc +@@ -15,9 +15,8 @@ #include "ufraw.h" #ifdef HAVE_EXIV2 -#include -#include -#include ++#include +#include #include #include -@@ -67,7 +65,11 @@ +@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf) if (exifData.empty()) { std::string error(uf->filename); error += ": No Exif data found in the file"; +#if EXIV2_TEST_VERSION(0,27,0) + throw Exiv2::Error(Exiv2::kerErrorMessage, error); +#else throw Exiv2::Error(1, error); +#endif } /* List of tag names taken from exiv2's printSummary() in actions.cpp */ - Index: head/multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp =================================================================== --- head/multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp (nonexistent) +++ head/multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp (revision 506383) @@ -0,0 +1,18 @@ +--- libs/libmythmetadata/imagemetadata.cpp.orig 2019-07-07 08:48:08 UTC ++++ libs/libmythmetadata/imagemetadata.cpp +@@ -7,14 +7,7 @@ + #include "exitcodes.h" // for ffprobe + + // libexiv2 for Exif metadata +-//#include +-// Note: Older versions of Exiv2 don't have the exiv2.hpp include +-// file. Using image.hpp instead seems to work. +-#ifdef _MSC_VER +-#include +-#else +-#include +-#endif ++#include + + // To read FFMPEG Metadata + extern "C" { Property changes on: head/multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp =================================================================== --- head/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp (revision 506382) +++ head/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp (revision 506383) @@ -1,12 +1,20 @@ ---- src/image/exiv2.cpp.orig 2009-01-30 22:18:25.000000000 +0100 -+++ src/image/exiv2.cpp 2011-07-15 15:48:34.000000000 +0200 -@@ -47,7 +47,8 @@ +--- src/image/exiv2.cpp.orig 2009-01-30 21:18:25 UTC ++++ src/image/exiv2.cpp +@@ -1,6 +1,5 @@ + #include +-#include +-#include ++#include + + PyObject *parse(PyObject *self, PyObject *args) + { +@@ -47,7 +46,8 @@ PyObject *parse(PyObject *self, PyObject *args) Py_DECREF(entry); } - Exiv2::DataBuf databuf = exifData.copyThumbnail(); + Exiv2::ExifThumbC ExifThumb(exifData); + Exiv2::DataBuf databuf = ExifThumb.copy(); if (databuf.pData_) { entry = PyBuffer_New(databuf.size_); PyObject_AsWriteBuffer(entry, (void **)&data, &len);