From 284140b5d29981c47a2048fc721f6c2fa6e58546 Mon Sep 17 00:00:00 2001 From: Boris Samorodov Date: Wed, 11 Mar 2009 22:19:40 +0000 Subject: . update graphics/exiv2 to the new version; . bump ports which depends upon libexiv2.so (the library was bumpted from *.so.3 to *.so.7); . mark current graphics/py-exiv2 as broken since it doesn't compile with new libexiv2; this should change with graphics/py-exiv2-0.2. PR: ports/131376 Submitted by: bsam (me) Discussed with: kde@ Approved by: maintainer timeout (5 weeks) --- graphics/digikam/Makefile | 2 +- graphics/exiv2/Makefile | 3 +-- graphics/exiv2/distinfo | 6 +++--- graphics/exiv2/pkg-plist | 19 ++++++++++--------- graphics/geeqie/Makefile | 3 ++- graphics/gwenview-kde4/Makefile | 4 ++-- .../files/patch-src_imageutils_jpegcontent.cpp | 22 ++++++++++++++++++++++ graphics/gwenview/Makefile | 4 ++-- .../files/patch-src_imageutils_jpegcontent.cpp | 22 ++++++++++++++++++++++ graphics/hugin/Makefile | 1 + graphics/kdegraphics4/Makefile | 3 ++- graphics/kipi-plugins/Makefile | 2 +- graphics/kphotoalbum-kde4/Makefile | 4 ++-- graphics/kphotoalbum/Makefile | 4 ++-- graphics/libkexiv2-kde4/Makefile | 3 ++- graphics/libkexiv2/Makefile | 3 ++- graphics/luminance/Makefile | 2 +- graphics/py-exiv2/Makefile | 6 ++++-- graphics/qtpfsgui/Makefile | 2 +- graphics/ufraw/Makefile | 2 +- 20 files changed, 84 insertions(+), 33 deletions(-) create mode 100644 graphics/gwenview-kde4/files/patch-src_imageutils_jpegcontent.cpp create mode 100644 graphics/gwenview/files/patch-src_imageutils_jpegcontent.cpp (limited to 'graphics') diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 06425543f9d2..c10ad4ed08de 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -7,7 +7,7 @@ PORTNAME= digikam DISTVERSION= 0.9.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= SFE diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index 35917a3e445b..185e3481946a 100644 --- a/graphics/exiv2/Makefile +++ b/graphics/exiv2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= exiv2 -PORTVERSION= 0.16 -PORTREVISION= 1 +PORTVERSION= 0.18 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.exiv2.org/ diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo index ea7e40560999..e32524ec08e2 100644 --- a/graphics/exiv2/distinfo +++ b/graphics/exiv2/distinfo @@ -1,3 +1,3 @@ -MD5 (exiv2-0.16.tar.gz) = a6e72343885d990c593bd013c6c988f1 -SHA256 (exiv2-0.16.tar.gz) = d407bd0f9b06d68940ae1a73b226ca234cd9a19ea65eab108746b69ac7ce0afb -SIZE (exiv2-0.16.tar.gz) = 1591822 +MD5 (exiv2-0.18.tar.gz) = 03044792525ae0a1b109df5a53b858fb +SHA256 (exiv2-0.18.tar.gz) = e567918c747043588a58b8f6de49727443f275291119edd84b1c62cc685be4cd +SIZE (exiv2-0.18.tar.gz) = 2299215 diff --git a/graphics/exiv2/pkg-plist b/graphics/exiv2/pkg-plist index 2006ab6c6276..b5478c746f55 100644 --- a/graphics/exiv2/pkg-plist +++ b/graphics/exiv2/pkg-plist @@ -1,6 +1,8 @@ bin/exiv2 include/exiv2/basicio.hpp +include/exiv2/bmpimage.hpp include/exiv2/canonmn.hpp +include/exiv2/convert.hpp include/exiv2/cr2image.hpp include/exiv2/crwimage.hpp include/exiv2/datasets.hpp @@ -10,12 +12,11 @@ include/exiv2/exv_conf.h include/exiv2/exv_msvc.h include/exiv2/fujimn.hpp include/exiv2/futils.hpp -include/exiv2/ifd.hpp +include/exiv2/gifimage.hpp include/exiv2/image.hpp include/exiv2/iptc.hpp +include/exiv2/jp2image.hpp include/exiv2/jpgimage.hpp -include/exiv2/makernote.hpp -include/exiv2/makernote2.hpp include/exiv2/metadatum.hpp include/exiv2/minoltamn.hpp include/exiv2/mn.hpp @@ -25,27 +26,26 @@ include/exiv2/olympusmn.hpp include/exiv2/orfimage.hpp include/exiv2/panasonicmn.hpp include/exiv2/pentaxmn.hpp -include/exiv2/pngchunk.hpp include/exiv2/pngimage.hpp +include/exiv2/preview.hpp include/exiv2/properties.hpp +include/exiv2/psdimage.hpp include/exiv2/rafimage.hpp include/exiv2/rcsid.hpp include/exiv2/sigmamn.hpp include/exiv2/sonymn.hpp include/exiv2/tags.hpp -include/exiv2/tiffcomposite.hpp -include/exiv2/tifffwd.hpp +include/exiv2/tgaimage.hpp include/exiv2/tiffimage.hpp -include/exiv2/tiffparser.hpp -include/exiv2/tiffvisitor.hpp include/exiv2/types.hpp include/exiv2/value.hpp include/exiv2/version.hpp include/exiv2/xmp.hpp +include/exiv2/xmpsidecar.hpp lib/libexiv2.a lib/libexiv2.la lib/libexiv2.so -lib/libexiv2.so.3 +lib/libexiv2.so.7 libdata/pkgconfig/exiv2.pc share/locale/de/LC_MESSAGES/exiv2.mo share/locale/es/LC_MESSAGES/exiv2.mo @@ -53,4 +53,5 @@ share/locale/fi/LC_MESSAGES/exiv2.mo share/locale/fr/LC_MESSAGES/exiv2.mo share/locale/pl/LC_MESSAGES/exiv2.mo share/locale/ru/LC_MESSAGES/exiv2.mo +share/locale/sk/LC_MESSAGES/exiv2.mo @dirrm include/exiv2 diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index e5a06cd7f88d..5cf1cbd38081 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -7,6 +7,7 @@ PORTNAME= geeqie DISTVERSION= 1.0alpha3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -37,7 +38,7 @@ OPTIONS= EXIV2 "Enable EXIV2 for metadata editing" on \ .include .if defined(WITH_EXIV2) -LIB_DEPENDS+= exiv2.3:${PORTSDIR}/graphics/exiv2 +LIB_DEPENDS+= exiv2.7:${PORTSDIR}/graphics/exiv2 CONFIGURE_ARGS+=--enable-exiv2 .else CONFIGURE_ARGS+=--disable-exiv2 diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index 647143ed0e68..1d1d31f45c9a 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwenview PORTVERSION= 1.4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= markus@FreeBSD.org COMMENT= An image viewer and browser for the KDE environment LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ - exiv2.3:${PORTSDIR}/graphics/exiv2 + exiv2.7:${PORTSDIR}/graphics/exiv2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/gwenview-kde4/files/patch-src_imageutils_jpegcontent.cpp b/graphics/gwenview-kde4/files/patch-src_imageutils_jpegcontent.cpp new file mode 100644 index 000000000000..48943654ed68 --- /dev/null +++ b/graphics/gwenview-kde4/files/patch-src_imageutils_jpegcontent.cpp @@ -0,0 +1,22 @@ +--- src/imageutils/jpegcontent.cpp.orig 2007-09-15 19:46:17.000000000 +0600 ++++ src/imageutils/jpegcontent.cpp 2009-01-09 14:24:04.000000000 +0500 +@@ -589,7 +589,8 @@ + QImage JPEGContent::thumbnail() const { + QImage image; + if (!d->mExifData.empty()) { +- Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail(); ++ Exiv2::ExifThumbC thumb(d->mExifData); ++ Exiv2::DataBuf const thumbnail = thumb.copy(); + image.loadFromData(thumbnail.pData_, thumbnail.size_); + } + return image; +@@ -611,7 +612,8 @@ + return; + } + +- d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size()); ++ Exiv2::ExifThumb thumb(d->mExifData); ++ thumb.setJpegThumbnail((unsigned char*)array.data(), array.size()); + } + + diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 647143ed0e68..1d1d31f45c9a 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwenview PORTVERSION= 1.4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= markus@FreeBSD.org COMMENT= An image viewer and browser for the KDE environment LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ - exiv2.3:${PORTSDIR}/graphics/exiv2 + exiv2.7:${PORTSDIR}/graphics/exiv2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/gwenview/files/patch-src_imageutils_jpegcontent.cpp b/graphics/gwenview/files/patch-src_imageutils_jpegcontent.cpp new file mode 100644 index 000000000000..48943654ed68 --- /dev/null +++ b/graphics/gwenview/files/patch-src_imageutils_jpegcontent.cpp @@ -0,0 +1,22 @@ +--- src/imageutils/jpegcontent.cpp.orig 2007-09-15 19:46:17.000000000 +0600 ++++ src/imageutils/jpegcontent.cpp 2009-01-09 14:24:04.000000000 +0500 +@@ -589,7 +589,8 @@ + QImage JPEGContent::thumbnail() const { + QImage image; + if (!d->mExifData.empty()) { +- Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail(); ++ Exiv2::ExifThumbC thumb(d->mExifData); ++ Exiv2::DataBuf const thumbnail = thumb.copy(); + image.loadFromData(thumbnail.pData_, thumbnail.size_); + } + return image; +@@ -611,7 +612,8 @@ + return; + } + +- d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size()); ++ Exiv2::ExifThumb thumb(d->mExifData); ++ thumb.setJpegThumbnail((unsigned char*)array.data(), array.size()); + } + + diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index ca6adbfaf261..891ad51d75e7 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -7,6 +7,7 @@ PORTNAME= hugin PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 2a3f8abb19ba..bc53dc51d27d 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -6,6 +6,7 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -22,7 +23,7 @@ LIB_DEPENDS= art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl \ lcms:${PORTSDIR}/graphics/lcms \ paper:${PORTSDIR}/print/libpaper \ poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \ - exiv2.3:${PORTSDIR}/graphics/exiv2 \ + exiv2.7:${PORTSDIR}/graphics/exiv2 \ chm.0:${PORTSDIR}/misc/chmlib \ sane.1:${PORTSDIR}/graphics/sane-backends \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index efb0eaffdd59..4ab3e1f159a8 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -7,7 +7,7 @@ PORTNAME= kipi-plugins PORTVERSION= 0.1.7 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index cca282430fbf..19dcf675ab0b 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -6,7 +6,7 @@ PORTNAME= kphotoalbum PORTVERSION= 3.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= http://www.kphotoalbum.org/data/download/ @@ -14,7 +14,7 @@ MAINTAINER= markus@FreeBSD.org COMMENT= Image database for KDE LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ - exiv2.3:${PORTSDIR}/graphics/exiv2 \ + exiv2.7:${PORTSDIR}/graphics/exiv2 \ kdcraw.4:${PORTSDIR}/graphics/libkdcraw USE_KDELIBS_VER= 3 diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index cca282430fbf..19dcf675ab0b 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -6,7 +6,7 @@ PORTNAME= kphotoalbum PORTVERSION= 3.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= http://www.kphotoalbum.org/data/download/ @@ -14,7 +14,7 @@ MAINTAINER= markus@FreeBSD.org COMMENT= Image database for KDE LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ - exiv2.3:${PORTSDIR}/graphics/exiv2 \ + exiv2.7:${PORTSDIR}/graphics/exiv2 \ kdcraw.4:${PORTSDIR}/graphics/libkdcraw USE_KDELIBS_VER= 3 diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile index cab145981d2e..5bcc7d3211cb 100644 --- a/graphics/libkexiv2-kde4/Makefile +++ b/graphics/libkexiv2-kde4/Makefile @@ -6,6 +6,7 @@ PORTNAME= libkexiv2 PORTVERSION= 0.1.9 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kipi @@ -13,7 +14,7 @@ MASTER_SITE_SUBDIR= kipi MAINTAINER= ale@FreeBSD.org COMMENT= A wrapper library to manipulate pictures metadata -LIB_DEPENDS= exiv2.3:${PORTSDIR}/graphics/exiv2 +LIB_DEPENDS= exiv2.7:${PORTSDIR}/graphics/exiv2 USE_BZIP2= yes USE_KDELIBS_VER=3 diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index cab145981d2e..5bcc7d3211cb 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -6,6 +6,7 @@ PORTNAME= libkexiv2 PORTVERSION= 0.1.9 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kipi @@ -13,7 +14,7 @@ MASTER_SITE_SUBDIR= kipi MAINTAINER= ale@FreeBSD.org COMMENT= A wrapper library to manipulate pictures metadata -LIB_DEPENDS= exiv2.3:${PORTSDIR}/graphics/exiv2 +LIB_DEPENDS= exiv2.7:${PORTSDIR}/graphics/exiv2 USE_BZIP2= yes USE_KDELIBS_VER=3 diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile index e7dd67a75547..52b0d8493863 100644 --- a/graphics/luminance/Makefile +++ b/graphics/luminance/Makefile @@ -7,7 +7,7 @@ PORTNAME= qtpfsgui PORTVERSION= 1.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile index 9df183fc1863..5d57d0db96da 100644 --- a/graphics/py-exiv2/Makefile +++ b/graphics/py-exiv2/Makefile @@ -7,7 +7,7 @@ PORTNAME= exiv2 PORTVERSION= 0.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python MASTER_SITES= http://tilloy.net/dev/pyexiv2/releases/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,9 +16,11 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= dindin@dindin.ru COMMENT= Python bindings for exiv2 -LIB_DEPENDS= exiv2.3:${PORTSDIR}/graphics/exiv2\ +LIB_DEPENDS= exiv2.7:${PORTSDIR}/graphics/exiv2\ boost_python.4:${PORTSDIR}/devel/boost-python +BROKEN= does not compile with exiv2-0.18, should change at future version py-exiv2-0.2 + WRKSRC= ${WRKDIR}/py${PORTNAME} USE_PYTHON= yes USE_GMAKE= yes diff --git a/graphics/qtpfsgui/Makefile b/graphics/qtpfsgui/Makefile index e7dd67a75547..52b0d8493863 100644 --- a/graphics/qtpfsgui/Makefile +++ b/graphics/qtpfsgui/Makefile @@ -7,7 +7,7 @@ PORTNAME= qtpfsgui PORTVERSION= 1.9.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 5665b741dd83..7ea38989f935 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -7,7 +7,7 @@ PORTNAME= ufraw PORTVERSION= 0.15 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= SF -- cgit v1.2.3