svn commit: r506383 - in head: astro/gpscorrelate/files astro/merkaartor/files graphics/exiv2 graphics/exiv2/files graphics/gimp-lensfun-plugin/files graphics/hugin/files graphics/luminance-qt5/fil...
Tobias C. Berner
tcberner at FreeBSD.org
Wed Jul 10 19:31:00 UTC 2019
Author: tcberner
Date: Wed Jul 10 19:30:55 2019
New Revision: 506383
URL: https://svnweb.freebsd.org/changeset/ports/506383
Log:
graphics/exiv2: update to 0.27.1
Exp-run by: antoine
PR: 239028
Added:
head/astro/gpscorrelate/files/patch-exif-gps.cpp (contents, props changed)
head/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp (contents, props changed)
head/graphics/hugin/files/
head/graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp (contents, props changed)
head/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp (contents, props changed)
head/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp (contents, props changed)
head/graphics/photivo/files/patch-Sources_ptImageHelper.cpp (contents, props changed)
head/graphics/photoqt/files/
head/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h (contents, props changed)
head/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h (contents, props changed)
head/multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp (contents, props changed)
Deleted:
head/graphics/exiv2/files/
Modified:
head/astro/merkaartor/files/patch-git_e6d015a9
head/graphics/exiv2/Makefile
head/graphics/exiv2/distinfo
head/graphics/exiv2/pkg-plist
head/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
head/graphics/photivo/Makefile
head/graphics/ufraw/files/patch-gentoo_b5b414
head/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp
Added: head/astro/gpscorrelate/files/patch-exif-gps.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/gpscorrelate/files/patch-exif-gps.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -0,0 +1,13 @@
+--- exif-gps.cpp.orig 2019-07-07 08:26:16 UTC
++++ exif-gps.cpp
+@@ -40,9 +40,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-
+-#include "exiv2/image.hpp"
+-#include "exiv2/exif.hpp"
++#include <exiv2/exiv2.hpp>
+
+ #include "gpsstructure.h"
+ #include "exif-gps.h"
Modified: head/astro/merkaartor/files/patch-git_e6d015a9
==============================================================================
--- head/astro/merkaartor/files/patch-git_e6d015a9 Wed Jul 10 19:02:33 2019 (r506382)
+++ head/astro/merkaartor/files/patch-git_e6d015a9 Wed Jul 10 19:30:55 2019 (r506383)
@@ -6,7 +6,7 @@ Date: Mon Jul 27 14:22:37 2015 +0200
--- 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;
@@ -15,7 +15,7 @@ Date: Mon Jul 27 14:22:37 2015 +0200
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;
@@ -26,10 +26,13 @@ Date: Mon Jul 27 14:22:37 2015 +0200
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 <QtWidgets/QDockWidget>
+ #include <QtGui/QMouseEvent>
#include <QtWidgets/QShortcut>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+#include <QDrag>
class ImageView;
Modified: head/graphics/exiv2/Makefile
==============================================================================
--- head/graphics/exiv2/Makefile Wed Jul 10 19:02:33 2019 (r506382)
+++ head/graphics/exiv2/Makefile Wed Jul 10 19:30:55 2019 (r506383)
@@ -2,9 +2,8 @@
# $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/
Modified: head/graphics/exiv2/distinfo
==============================================================================
--- head/graphics/exiv2/distinfo Wed Jul 10 19:02:33 2019 (r506382)
+++ head/graphics/exiv2/distinfo Wed Jul 10 19:30:55 2019 (r506383)
@@ -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
Modified: head/graphics/exiv2/pkg-plist
==============================================================================
--- head/graphics/exiv2/pkg-plist Wed Jul 10 19:02:33 2019 (r506382)
+++ head/graphics/exiv2/pkg-plist Wed Jul 10 19:30:55 2019 (r506383)
@@ -82,15 +82,16 @@ 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
Added: head/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -0,0 +1,12 @@
+--- src/gimplensfun.cpp.orig 2019-07-07 08:42:51 UTC
++++ src/gimplensfun.cpp
+@@ -37,8 +37,7 @@ CHANGES:
+ #include <libgimp/gimp.h>
+ #include <libgimp/gimpui.h>
+
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+
+ #define VERSIONSTR "0.2.4-dev"
+
Added: head/graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -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 <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ #ifdef __WXMSW__
+ #include <wx/msw/registry.h>
+ #endif
Added: head/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -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 <vigra/diff2d.hxx>
+ #include <vigra/imageinfo.hxx>
+ #include <hugin_utils/utils.h>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <lensdb/LensDB.h>
+ #include "Exiv2Helper.h"
+
Added: head/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -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 <boost/assign/list_of.hpp>
+
+-#include <exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <image.hpp>
+
+ #include "ExifOperations.h"
Modified: head/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
==============================================================================
--- head/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp Wed Jul 10 19:02:33 2019 (r506382)
+++ head/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -1,6 +1,14 @@
---- 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 <QVector2D>
+ #include <QApplication>
+ #pragma warning(pop) // no warnings from includes - end
++#include <iostream>
+
+ namespace nmc {
+
+@@ -1262,7 +1263,7 @@ void DkMetaDataT::printMetaData() const {
std::string xmpPacket;
if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {
Modified: head/graphics/photivo/Makefile
==============================================================================
--- head/graphics/photivo/Makefile Wed Jul 10 19:02:33 2019 (r506382)
+++ head/graphics/photivo/Makefile Wed Jul 10 19:30:55 2019 (r506383)
@@ -27,7 +27,7 @@ USES= cmake compiler:c++11-lib desktop-file-utils dos
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}
Added: head/graphics/photivo/files/patch-Sources_ptImageHelper.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/photivo/files/patch-Sources_ptImageHelper.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -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 <wand/magick_wand.h>
+
++#include <iostream>
+ #include <vector>
+ #include <QStringList>
+
Added: head/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h Wed Jul 10 19:30:55 2019 (r506383)
@@ -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 <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #endif
+
+ class GetAndDoStuffManipulation : public QObject {
Added: head/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h Wed Jul 10 19:30:55 2019 (r506383)
@@ -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 <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+ #endif
+
+ class GetMetaData : public QObject {
Modified: head/graphics/ufraw/files/patch-gentoo_b5b414
==============================================================================
--- head/graphics/ufraw/files/patch-gentoo_b5b414 Wed Jul 10 19:02:33 2019 (r506382)
+++ head/graphics/ufraw/files/patch-gentoo_b5b414 Wed Jul 10 19:30:55 2019 (r506383)
@@ -1,19 +1,20 @@
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 <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
-#include <exiv2/exif.hpp>
++#include <iostream>
+#include <exiv2/exiv2.hpp>
#include <sstream>
#include <cassert>
-@@ -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";
@@ -25,4 +26,3 @@ https://gitweb.gentoo.org/repo/gentoo.git/tree/media-g
}
/* List of tag names taken from exiv2's printSummary() in actions.cpp */
-
Added: head/multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -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 <exiv2/exiv2.hpp>
+-// Note: Older versions of Exiv2 don't have the exiv2.hpp include
+-// file. Using image.hpp instead seems to work.
+-#ifdef _MSC_VER
+-#include <exiv2/src/image.hpp>
+-#else
+-#include <exiv2/image.hpp>
+-#endif
++#include <exiv2/exiv2.hpp>
+
+ // To read FFMPEG Metadata
+ extern "C" {
Modified: head/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp
==============================================================================
--- head/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp Wed Jul 10 19:02:33 2019 (r506382)
+++ head/multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp Wed Jul 10 19:30:55 2019 (r506383)
@@ -1,6 +1,14 @@
---- 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 <Python.h>
+-#include <exiv2/image.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
+
+ PyObject *parse(PyObject *self, PyObject *args)
+ {
+@@ -47,7 +46,8 @@ PyObject *parse(PyObject *self, PyObject *args)
Py_DECREF(entry);
}
More information about the svn-ports-all
mailing list