diff options
| author | adam <adam> | 2010-12-03 20:34:32 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-12-03 20:34:32 +0000 |
| commit | 40cad076e7c278d5eecfb3038c05dc8d6fb06911 (patch) | |
| tree | 9b3b24055760bff964d0c0728036a878281f58ed /graphics/libgexiv2 | |
| parent | 875971422e3f5623eafa3d45d13b98027ebfdeee (diff) | |
| download | pkgsrc-40cad076e7c278d5eecfb3038c05dc8d6fb06911.tar.gz | |
Fix building with exiv2 0.21
Diffstat (limited to 'graphics/libgexiv2')
| -rw-r--r-- | graphics/libgexiv2/Makefile | 29 | ||||
| -rw-r--r-- | graphics/libgexiv2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libgexiv2/patches/patch-ac | 20 |
3 files changed, 34 insertions, 19 deletions
diff --git a/graphics/libgexiv2/Makefile b/graphics/libgexiv2/Makefile index f5994642fa6..296fabe87a7 100644 --- a/graphics/libgexiv2/Makefile +++ b/graphics/libgexiv2/Makefile @@ -1,33 +1,30 @@ -# $NetBSD: Makefile,v 1.3 2010/12/03 16:51:04 drochner Exp $ -# +# $NetBSD: Makefile,v 1.4 2010/12/03 20:34:32 adam Exp $ -DISTNAME= libgexiv2-0.2.1 -PKGREVISION= 1 -CATEGORIES= graphics devel -MASTER_SITES= http://yorba.org/download/gexiv2/0.2/ -EXTRACT_SUFX= .tar.bz2 +DISTNAME= libgexiv2-0.2.1 +PKGREVISION= 2 +CATEGORIES= graphics devel +MASTER_SITES= http://yorba.org/download/gexiv2/0.2/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://trac.yorba.org/wiki/gexiv2 -COMMENT= GObject-based wrapper around the Exiv2 library -LICENSE= gnu-gpl-v2 +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://trac.yorba.org/wiki/gexiv2 +COMMENT= GObject-based wrapper around the Exiv2 library +LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= vala-[0-9]*:../../lang/vala PKG_DESTDIR_SUPPORT= user-destdir -USE_LIBTOOL= yes -HAS_CONFIGURE= yes USE_LANGUAGES= c c++ +USE_LIBTOOL= yes USE_TOOLS+= gmake m4 pkg-config +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIG_SHELL= bash -CONFIGURE_ARGS+= --prefix=${PREFIX} PKGCONFIG_OVERRIDE= gexiv2.m4 .include "../../devel/glib2/buildlink3.mk" -# incompatible API changes in 0.21 -BUILDLINK_API_DEPENDS.exiv2+= exiv2<0.21 .include "../../graphics/exiv2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgexiv2/distinfo b/graphics/libgexiv2/distinfo index 37b6e9ccd81..cc1dce4da73 100644 --- a/graphics/libgexiv2/distinfo +++ b/graphics/libgexiv2/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.2 2010/12/03 16:51:04 drochner Exp $ +$NetBSD: distinfo,v 1.3 2010/12/03 20:34:32 adam Exp $ SHA1 (libgexiv2-0.2.1.tar.bz2) = b7ab9c35ed221dc18ab4493c51b7b9aac936867f RMD160 (libgexiv2-0.2.1.tar.bz2) = 4882c83a2646c3dc8f4ac0a885e76129f1ddc3b9 Size (libgexiv2-0.2.1.tar.bz2) = 24419 bytes SHA1 (patch-aa) = 4a58e9aea1bac3115dba86f787246e361433e954 SHA1 (patch-ab) = ca9410af7f72437c01700b36e55cf775ca2f5dfd -SHA1 (patch-ac) = 5f53e1ef1e50445bc100d4321078f4282f9cc05e +SHA1 (patch-ac) = 3726a716816b298068ef415cbb2faffd790d14af SHA1 (patch-ad) = 38ed4a1e65b044351035b29ed4181ebf00e0f74a SHA1 (patch-ae) = 35c6142e56e6f7adf3363e18aba8598f76aad521 SHA1 (patch-af) = 73fceb18939594054531fffd0fe1e7599fd5b308 diff --git a/graphics/libgexiv2/patches/patch-ac b/graphics/libgexiv2/patches/patch-ac index a71498b4253..99687737ca3 100644 --- a/graphics/libgexiv2/patches/patch-ac +++ b/graphics/libgexiv2/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2010/12/03 16:51:04 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2010/12/03 20:34:32 adam Exp $ --- gexiv2/gexiv2-metadata-exif.cpp.orig 2010-09-10 21:52:54.000000000 +0000 +++ gexiv2/gexiv2-metadata-exif.cpp @@ -94,3 +94,21 @@ $NetBSD: patch-ac,v 1.1 2010/12/03 16:51:04 drochner Exp $ Exiv2::Rational r = it->toRational(); *nom = r.first; *den = r.second; +@@ -238,7 +251,7 @@ const gchar* gexiv2_metadata_get_exif_ta + Exiv2::ExifKey key(tag); + + try { +- return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ()); ++ return key.tagLabel().c_str(); + } catch (Exiv2::Error& e) { + LOG_ERROR(e); + } +@@ -252,7 +265,7 @@ const gchar* gexiv2_metadata_get_exif_ta + Exiv2::ExifKey key(tag); + + try { +- return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ()); ++ return key.tagDesc().c_str(); + } catch (Exiv2::Error& e) { + LOG_ERROR(e); + } |