cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update grahics/exiv2 to 0.26

Browse Source 
PR:		223625
Exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D12345
This commit is contained in:
Tobias C. Berner 2018-04-28 06:14:58 +00:00
parent 1c22f87f44
commit 05c7a17cbe
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=468519
48 changed files with 126 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
astro/gpscorrelate/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gpscorrelate
PORTVERSION= 1.6.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= astro geography
MAINTAINER= ports@FreeBSD.org

2
astro/merkaartor/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= merkaartor
PORTVERSION= 0.18.2
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= astro
MAINTAINER= dev2@heesakkers.info

2
deskutils/gnome-photos/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gnome-photos
PORTVERSION= 3.24.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

2
deskutils/libstreamanalyzer/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= libstreamanalyzer
PORTVERSION= ${STRIGI_VERSION}
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= deskutils
MASTER_SITES= ${STRIGI_MASTER_SITES}

2
deskutils/pinot/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= pinot
PORTVERSION= 1.09
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= deskutils
MAINTAINER= thierry@FreeBSD.org

1
devel/kf5-kfilemetadata/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= kfilemetadata
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org

1
devel/kio-extras/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= kio-extras
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde kde-applications # kde kde-applications-plasma
MAINTAINER= kde@FreeBSD.org

2
graphics/commons-utilities/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= commons-utilities
PORTVERSION= 1.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= http://devio.us/~dereckson/software/commons-utilities/

1
graphics/darktable/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= darktable
PORTVERSION= 2.4.3
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/

14
graphics/exiv2/Makefile
View File

@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= exiv2
PORTVERSION= 0.25
DISTVERSION= 0.26
DISTVERSIONSUFFIX= -trunk
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://www.exiv2.org/
MASTER_SITES= http://www.exiv2.org/builds/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Exif, IPTC, and XMP metadata manipulation library and tools
@ -18,12 +19,15 @@ LIB_DEPENDS= libexpat.so:textproc/expat2
USES= cmake:outsource cpe gettext iconv pathfix
USE_LDCONFIG= yes
CMAKE_ARGS= -DEXIV2_ENABLE_VIDEO:BOOL=TRUE \
-DEXIV2_ENABLE_BUILD_PO:BOOL=TRUE \
-DEXIV2_ENABLE_BUILD_SAMPLES:BOOL=FALSE
CMAKE_ON= EXIV2_ENABLE_VIDEO \
EXIV2_ENABLE_BUILD_PO
CMAKE_OFF= EXIV2_ENABLE_BUILD_SAMPLES \
EXIV2_ENABLE_LIBXMP
PATHFIX_CMAKELISTSTXT= CMakeChecks.txt
CFLAGS_powerpc64= -mminimal-toc
WRKSRC= ${WRKDIR}/${PORTNAME}-trunk
.include <bsd.port.mk>

6
graphics/exiv2/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1469188288
SHA256 (exiv2-0.25.tar.gz) = c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
SIZE (exiv2-0.25.tar.gz) = 5434325
TIMESTAMP = 1523892704
SHA256 (exiv2-0.26-trunk.tar.gz) = c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
SIZE (exiv2-0.26-trunk.tar.gz) = 5677925

24
graphics/exiv2/files/patch-src_CMakeLists.txt
View File

@ -5,18 +5,18 @@ which handles that properly on all systems.
[1] https://cmake.org/cmake/help/v3.6/variable/CMAKE_DL_LIBS.html
--- src/CMakeLists.txt.orig 2016-07-23 14:00:07 UTC
--- src/CMakeLists.txt.orig 2017-03-27 09:04:12 UTC
+++ src/CMakeLists.txt
@@ -247,9 +247,9 @@ if ( MSVC )
TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} )
@@ -265,9 +265,9 @@ if ( MSVC )
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
else()
if ( NOT MINGW )
- TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib dl ${CURL_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib dl ${SSH_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${CMAKE_DL_LIBS} ${EXPAT_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${CMAKE_DL_LIBS} ${CURL_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${CMAKE_DL_LIBS} ${SSH_LIBRARIES} )
if ( UNIX AND NOT FREEBSD )
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} )
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${EXPAT_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${CURL_LIBRARIES} )
+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${SSH_LIBRARIES} )
else()
TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} )
TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} )
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )
TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} )

16
graphics/exiv2/files/patch-src_actions.cpp Normal file
View File

@ -0,0 +1,16 @@
FreeBSD does not know either
* PTHREAD_RECURSIVE_MUTEX_INITIALIZER nor
* PTHREAD_RECUSRIVE_MUTEX_INITIALIZER_NP
--- src/actions.cpp.orig 2017-03-08 20:42:28 UTC
+++ src/actions.cpp
@@ -2048,6 +2048,8 @@ namespace {
#if defined(__APPLE__)
/* This is the critical section object (statically allocated). */
static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
+ #elif defined(__FreeBSD__)
+ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER;
#else
static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
#endif

8
graphics/exiv2/pkg-plist
View File

@ -13,11 +13,11 @@ include/exiv2/error.hpp
include/exiv2/exif.hpp
include/exiv2/exiv2.hpp
include/exiv2/exv_conf.h
include/exiv2/exv_msvc.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
@ -34,6 +34,7 @@ include/exiv2/quicktimevideo.hpp
include/exiv2/rafimage.hpp
include/exiv2/riffvideo.hpp
include/exiv2/rw2image.hpp
include/exiv2/rwlock.hpp
include/exiv2/svn_version.h
include/exiv2/tags.hpp
include/exiv2/tgaimage.hpp
@ -42,11 +43,12 @@ include/exiv2/types.hpp
include/exiv2/utilsvideo.hpp
include/exiv2/value.hpp
include/exiv2/version.hpp
include/exiv2/webpimage.hpp
include/exiv2/xmp.hpp
include/exiv2/xmpsidecar.hpp
lib/libexiv2.so
lib/libexiv2.so.14
lib/libexiv2.so.14.0.0
lib/libexiv2.so.26
lib/libexiv2.so.26.0.0
libdata/pkgconfig/exiv2.lsm
libdata/pkgconfig/exiv2.pc
man/man1/exiv2.1.gz

1
graphics/geeqie/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= geeqie
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.geeqie.org/

2
graphics/gegl/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gegl
PORTVERSION= 0.2.0
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= graphics
MASTER_SITES= GIMP

2
graphics/gegl3/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gegl
PORTVERSION= 0.3.20
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= GIMP
PKGNAMESUFFIX= 3

1
graphics/gexiv2/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= gexiv2
PORTVERSION= 0.10.6
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= GNOME/sources/gexiv2/${PORTVERSION:R}

2
graphics/gimp-lensfun-plugin/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= lensfun
DISTVERSION= 0.2.4-dev
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= graphics
PKGNAMEPREFIX= gimp-
PKGNAMESUFFIX= -plugin

2
graphics/gnome-color-manager/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gnome-color-manager
PORTVERSION= 3.18.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

2
graphics/gthumb/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= gthumb
PORTVERSION= 3.6.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

2
graphics/gwenview-kde4/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= gwenview
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org

1
graphics/gwenview/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= gwenview
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org

2
graphics/kphotoalbum-kde4/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= kphotoalbum
PORTVERSION= 4.4
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
DIST_SUBDIR= KDE

2
graphics/krita/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= krita
DISTVERSION= 3.3.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}

2
graphics/libkexiv2-kde4/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= libkexiv2
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org

1
graphics/libkexiv2/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= libkexiv2
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org

2
graphics/luminance-qt5/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= luminance-hdr
DISTVERSION= 2.4.0
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}
PKGNAMESUFFIX= -qt5

2
graphics/luminance/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= luminance-hdr
DISTVERSION= 2.3.1
PORTREVISION= 18
PORTREVISION= 19
CATEGORIES= graphics
MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION}

1
graphics/nomacs/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= nomacs
PORTVERSION= 3.6.1
PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= bsd@tuxproject.de

2
graphics/oyranos/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= oyranos
PORTVERSION= 0.9.6
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= graphics
MAINTAINER= bsam@FreeBSD.org

2
graphics/photivo/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= photivo
PORTVERSION= 0.0.2015.03.21
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/
DISTNAME= source-archive

1
graphics/phototonic/Makefile
View File

@ -4,6 +4,7 @@
PORTNAME= phototonic
DISTVERSIONPREFIX= v
DISTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org

2
graphics/py-exiv2/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= exiv2
PORTVERSION= 0.3.2
PORTREVISION= 12
PORTREVISION= 13
CATEGORIES= graphics python
MASTER_SITES= https://launchpadlibrarian.net/83595798/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

2
graphics/rawstudio/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= rawstudio
PORTVERSION= 2.0
PORTREVISION= 17
PORTREVISION= 18
CATEGORIES= graphics
MASTER_SITES= http://rawstudio.org/files/release/

1
graphics/shotwell/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= shotwell
PORTVERSION= 0.28.2
PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}

2
graphics/ufraw/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= ufraw
PORTVERSION= 0.22
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= graphics
MAINTAINER= rodrigo@FreeBSD.org

2
graphics/viewnior/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= viewnior
PORTVERSION= 1.6
DISTVERSIONPREFIX= ${PORTNAME}-
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
MAINTAINER= nemysis@FreeBSD.org

2
multimedia/mythtv-frontend/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Bernhard Froehlich <decke@bluelife.at>
# $FreeBSD$
PORTREVISION= 0
PORTREVISION= 1
PKGNAMESUFFIX= -${SLAVEPORT}
MAINTAINER= ports@FreeBSD.org

2
multimedia/mythtv/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= mythtv
DISTVERSIONPREFIX= v
DISTVERSION= 29.1
PORTREVISION?= 0
PORTREVISION?= 1
PORTEPOCH= 1
CATEGORIES= multimedia

2
sysutils/bulk_extractor/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= bulk_extractor
PORTVERSION= 1.5.5
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://digitalcorpora.org/downloads/bulk_extractor/

2
sysutils/kfilemetadata-kde4/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= kfilemetadata
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 16
PORTREVISION= 17
CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org

1
sysutils/krename/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= krename
PORTVERSION= 5.0.0
PORTREVISION= 1
CATEGORIES= sysutils kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src

2
sysutils/nepomuk-core-kde4/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= nepomuk-core
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 17
PORTREVISION= 18
CATEGORIES= sysutils kde kde-kde4
MAINTAINER= kde@FreeBSD.org

2
textproc/libextractor/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= libextractor
PORTVERSION= 1.3
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= textproc
MASTER_SITES= GNU

39
textproc/libextractor/files/patch-gentoo_git-00c65df Normal file
View File

@ -0,0 +1,39 @@
Obtained from:
https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch?id=00c65df99751d235e08fe2f54613dac2eeb2f80b
From 00c65df99751d235e08fe2f54613dac2eeb2f80b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sat, 17 Jun 2017 22:36:09 +0200
Subject: media-libs/libextractor: Fix build with media-gfx/exiv2-0.26
Gentoo-bug: 621242
Package-Manager: Portage-2.3.5, Repoman-2.3.1
--- src/plugins/exiv2_extractor.cc 2013-06-25 13:02:05.000000000 +0200
+++ src/plugins/exiv2_extractor.cc 2017-06-10 14:22:57.000000000 +0200
@@ -180,7 +180,11 @@
*
* @return -1 on error
*/
+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
+ virtual size_t size (void) const;
+#else
virtual long int size (void) const;
+#endif
/**
* Check if file is open.
@@ -445,7 +449,11 @@
*
* @return -1 on error
*/
-long int
+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
+size_t
+#else
+long int
+#endif
ExtractorIO::size (void) const
{
return (long) ec->get_size (ec->cls);

2
x11-fm/gnome-commander2/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= gnome-commander
PORTVERSION= 1.8.1
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME/sources/gnome-commander/${PORTVERSION:R}

2
x11/kde-runtime-kde4/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4