1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-19 08:13:21 +00:00

- chase exiv2 library bump

- while here remove some MD5
- fix some forgottern desktop-file-utils dependencies
This commit is contained in:
Baptiste Daroussin 2011-04-12 08:24:29 +00:00
parent 0c24508c5d
commit e29d5654e9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=272596
9 changed files with 61 additions and 10 deletions

View File

@ -6,14 +6,14 @@
PORTNAME= gpscorrelate
PORTVERSION= 1.5.6
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= astro geography
MASTER_SITES= http://freefoote.dview.net/linux/
MAINTAINER= Iam@LukasMaly.NET
COMMENT= A gps file gpx correlate exif tag in photos
LIB_DEPENDS= exiv2:${PORTSDIR}/graphics/exiv2 \
LIB_DEPENDS= exiv2.10:${PORTSDIR}/graphics/exiv2 \
gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
MAN1= gpscorrelate.1 gpscorrelate-gui.1

View File

@ -7,6 +7,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.17.2
PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= http://www.merkaartor.be/attachments/download/253/
@ -38,7 +39,7 @@ OPTIONS= GEOIMAGE "Enable geotagged images (needs exiv2)" on\
.if !defined(WITHOUT_GEOIMAGE)
QMAKEFLAGS+= GEOIMAGE=1
LIB_DEPENDS+= exiv2:${PORTSDIR}/graphics/exiv2
LIB_DEPENDS+= exiv2.10:${PORTSDIR}/graphics/exiv2
.endif
.if defined(WITH_GDAL)

View File

@ -7,6 +7,7 @@
PORTNAME= darktable
PORTVERSION= 0.7.1
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.7
@ -15,7 +16,7 @@ COMMENT= A virtual lighttable and darkroom for photographers
LICENSE= GPLv3
LIB_DEPENDS= exiv2.9:${PORTSDIR}/graphics/exiv2 \
LIB_DEPENDS= exiv2.10:${PORTSDIR}/graphics/exiv2 \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
lensfun.2:${PORTSDIR}/graphics/lensfun \

View File

@ -0,0 +1,15 @@
--- ./src/common/exif.cc.orig 2010-12-07 12:49:56.000000000 +0100
+++ ./src/common/exif.cc 2011-04-11 14:54:09.176904295 +0200
@@ -29,11 +29,8 @@
#include "common/imageio.h"
}
// #include <libexif/exif-data.h>
-#include <exiv2/xmp.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
#include <exiv2/canonmn.hpp>
+#include <exiv2/exiv2.hpp>
#include <sqlite3.h>
#include <iostream>
#include <fstream>

View File

@ -7,7 +7,7 @@
PORTNAME= geeqie
PORTVERSION= 1.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@ -16,7 +16,7 @@ COMMENT= Lightweight image viewer forked from GQview
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
USE_GNOME= gtk20
USE_GNOME= gtk20 desktopfileutils
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --docdir="${DOCSDIR}" \
@ -40,7 +40,7 @@ OPTIONS= EXIV2 "Metadata editing" on \
.include <bsd.port.pre.mk>
.if defined(WITH_EXIV2)
LIB_DEPENDS+= exiv2.9:${PORTSDIR}/graphics/exiv2
LIB_DEPENDS+= exiv2.10:${PORTSDIR}/graphics/exiv2
CONFIGURE_ARGS+=--enable-exiv2
.else
CONFIGURE_ARGS+=--disable-exiv2

View File

@ -1,3 +1,2 @@
MD5 (geeqie-1.0.tar.gz) = 1d67ef990390224c5052697d93bb49c0
SHA256 (geeqie-1.0.tar.gz) = d1ad64666446c1d490437a9441267e8d7c1b9dc6ab640716b213e386d9211fdd
SIZE (geeqie-1.0.tar.gz) = 1934236

View File

@ -7,6 +7,7 @@
PORTNAME= gexiv2
PORTVERSION= 0.2.1
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://yorba.org/download/gexiv2/${PORTVERSION:R}/
DISTNAME= libgexiv2-${PORTVERSION}
@ -17,7 +18,7 @@ COMMENT= GObject-based wrapper around the Exiv2 library
BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool \
gm4:${PORTSDIR}/devel/m4 \
pkg-config:${PORTSDIR}/devel/pkg-config
LIB_DEPENDS= exiv2:${PORTSDIR}/graphics/exiv2
LIB_DEPENDS= exiv2.10:${PORTSDIR}/graphics/exiv2
USE_BZIP2= yes
USE_GNOME= glib20

View File

@ -1,3 +1,2 @@
MD5 (libgexiv2-0.2.1.tar.bz2) = eda379b9a7b482988f55d5d79962d16b
SHA256 (libgexiv2-0.2.1.tar.bz2) = 6279becd711de669606a95d6a2198000ef3909611b19fdfd9478a0cf265243da
SIZE (libgexiv2-0.2.1.tar.bz2) = 24419

View File

@ -0,0 +1,35 @@
diff -ur gexiv2/gexiv2-metadata-exif.cpp.orig gexiv2/gexiv2-metadata-exif.cpp
--- gexiv2/gexiv2-metadata-exif.cpp.orig 2010-09-10 17:52:54.000000000 -0400
+++ gexiv2/gexiv2-metadata-exif.cpp 2010-12-19 19:44:49.883274002 -0500
@@ -235,10 +235,13 @@
const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) {
g_return_val_if_fail(tag != NULL, NULL);
- Exiv2::ExifKey key(tag);
-
try {
+ Exiv2::ExifKey key(tag);
+#if EXIV2_TEST_VERSION(0, 21, 0)
+ return g_intern_string(key.tagLabel().c_str());
+#else
return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ());
+#endif
} catch (Exiv2::Error& e) {
LOG_ERROR(e);
}
@@ -249,10 +252,13 @@
const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) {
g_return_val_if_fail(tag != NULL, NULL);
- Exiv2::ExifKey key(tag);
-
try {
+ Exiv2::ExifKey key(tag);
+#if EXIV2_TEST_VERSION(0, 21, 0)
+ return g_intern_string(key.tagDesc().c_str());
+#else
return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ());
+#endif
} catch (Exiv2::Error& e) {
LOG_ERROR(e);
}