1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Update graphics/exiv2 to 0.25.

As there is an shlib version bump, bump them portrevision of dependent ports.

While doing so, also switch to the cmake build system, as it requires less
patching and is easier to handle.

PR:             211329
Reviewed by:    mat, rakuco, kwm
Approved by:    rakuco (mentor)
Differential Revision:  https://reviews.freebsd.org/D7283
This commit is contained in:
Tobias C. Berner 2016-07-27 10:22:26 +00:00
parent f125e77708
commit c1ff5bbef3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419170
36 changed files with 79 additions and 69 deletions

View File

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

View File

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

View File

@ -3,7 +3,7 @@
PORTNAME= pinot
PORTVERSION= 1.06
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= deskutils
MASTER_SITES= GOOGLE_CODE
#MASTER_SITES= http://colinf.chez.com/pinot/

View File

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

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= exiv2
PORTVERSION= 0.24
PORTREVISION= 2
PORTVERSION= 0.25
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://www.exiv2.org/
@ -16,29 +15,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:textproc/expat2
GNU_CONFIGURE= yes
USES= cpe gettext gmake iconv libtool
USES= cmake:outsource cpe gettext iconv pathfix
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CMAKE_ARGS= -DEXIV2_ENABLE_VIDEO:BOOL=TRUE \
-DEXIV2_ENABLE_BUILD_PO:BOOL=TRUE \
-DEXIV2_ENABLE_BUILD_SAMPLES:BOOL=FALSE
.include <bsd.port.options.mk>
PATHFIX_CMAKELISTSTXT= CMakeChecks.txt
.if ${ARCH} == powerpc64
CFLAGS+= -mminimal-toc
.endif
post-patch:
@${REINPLACE_CMD} -e 's,LDFLAGS -no-undefined -lpsapi",& ;; \
dragonfly* | freebsd*),' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
's,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,' \
${WRKSRC}/src/Makefile
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/exiv2 \
${STAGEDIR}${PREFIX}/lib/libexiv2.so.13
CFLAGS_powerpc64= -mminimal-toc
.include <bsd.port.mk>

View File

@ -1,2 +1,3 @@
SHA256 (exiv2-0.24.tar.gz) = f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e
SIZE (exiv2-0.24.tar.gz) = 4635028
TIMESTAMP = 1469188288
SHA256 (exiv2-0.25.tar.gz) = c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
SIZE (exiv2-0.25.tar.gz) = 5434325

View File

@ -1,20 +0,0 @@
--- src/Makefile.orig 2013-12-01 12:13:42 UTC
+++ src/Makefile
@@ -215,7 +215,7 @@ ifdef DEP_TRACKING
endif
# Be sure to rewrite exv_conf.h before compiling anything
-$(SRC): exv_conf.h
+$(SRC) $(EXIV2SRC): exv_conf.h
exv_conf.h: $(top_srcdir)/config/config.h
LC_ALL=C sed 's/#define \([A-Z]\)/#define EXV_\1/; s/#undef \([A-Z]\)/#undef EXV_\1/' < $< > $@
@@ -231,7 +231,7 @@ lib: $(OBJ)
$(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
-mkdir ../bin >/dev/null 2>&1
- @$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
+ @$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir) $(LIBS)
install-header:
$(INSTALL_DIRS) $(DESTDIR)$(incdir)

View File

@ -0,0 +1,22 @@
FreeBSD does hat have -ldl.
Instead of unconditionally passing 'dl' to the linker, use cmakes 'CMAKE_DL_LIBS' [1]
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
@@ -247,9 +247,9 @@ if ( MSVC )
TARGET_LINK_LIBRARIES( exiv2lib ${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} )
else()
TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} )
TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} )

View File

@ -2,6 +2,7 @@ bin/exiv2
include/exiv2/asfvideo.hpp
include/exiv2/basicio.hpp
include/exiv2/bmpimage.hpp
include/exiv2/config.h
include/exiv2/convert.hpp
include/exiv2/cr2image.hpp
include/exiv2/crwimage.hpp
@ -12,8 +13,10 @@ 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/iptc.hpp
include/exiv2/jp2image.hpp
@ -31,24 +34,34 @@ include/exiv2/quicktimevideo.hpp
include/exiv2/rafimage.hpp
include/exiv2/riffvideo.hpp
include/exiv2/rw2image.hpp
include/exiv2/svn_version.h
include/exiv2/tags.hpp
include/exiv2/tgaimage.hpp
include/exiv2/tiffimage.hpp
include/exiv2/types.hpp
include/exiv2/utilsvideo.hpp
include/exiv2/value.hpp
include/exiv2/version.hpp
include/exiv2/xmp.hpp
include/exiv2/xmpsidecar.hpp
lib/libexiv2.a
lib/libexiv2.so
lib/libexiv2.so.13
lib/libexiv2.so.13.0.0
lib/libexiv2.so.14
lib/libexiv2.so.14.0.0
libdata/pkgconfig/exiv2.lsm
libdata/pkgconfig/exiv2.pc
man/man1/exiv2.1.gz
share/locale/bs/LC_MESSAGES/exiv2.mo
share/locale/de/LC_MESSAGES/exiv2.mo
share/locale/es/LC_MESSAGES/exiv2.mo
share/locale/fi/LC_MESSAGES/exiv2.mo
share/locale/fr/LC_MESSAGES/exiv2.mo
share/locale/gl/LC_MESSAGES/exiv2.mo
share/locale/ms/LC_MESSAGES/exiv2.mo
share/locale/pl/LC_MESSAGES/exiv2.mo
share/locale/pt/LC_MESSAGES/exiv2.mo
share/locale/ru/LC_MESSAGES/exiv2.mo
share/locale/sk/LC_MESSAGES/exiv2.mo
share/locale/sv/LC_MESSAGES/exiv2.mo
share/locale/ug/LC_MESSAGES/exiv2.mo
share/locale/uk/LC_MESSAGES/exiv2.mo
share/locale/vi/LC_MESSAGES/exiv2.mo

View File

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

View File

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

View File

@ -3,7 +3,7 @@
PORTNAME= gexiv2
PORTVERSION= 0.6.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/libgexiv2/libgexiv2_0.6.1.tar.xz/5bd2ba92b765a2b3721874ebd2647734/
DISTNAME= lib${PORTNAME}_${PORTVERSION}

View File

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

View File

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

View File

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

View File

@ -2,6 +2,7 @@
PORTNAME= gwenview
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= hugin
PORTVERSION= 2016.0.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

View File

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

View File

@ -2,7 +2,7 @@
PORTNAME= libkexiv2
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}

View File

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

View File

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

View File

@ -2,7 +2,7 @@
PORTNAME= nomacs
PORTVERSION= 2.2.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/nomacs/nomacs-${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source

View File

@ -2,7 +2,7 @@
PORTNAME= oyranos
PORTVERSION= 0.9.5
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|}

View File

@ -4,6 +4,7 @@
PORTNAME= phototonic
PORTVERSION= 1.7.20
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= olivierd@FreeBSD.org

View File

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

View File

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

View File

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

View File

@ -3,7 +3,7 @@
PORTNAME= ufraw
PORTVERSION= 0.22
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

View File

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

View File

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

View File

@ -2,7 +2,7 @@
PORTNAME= kfilemetadata
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}

View File

@ -2,7 +2,7 @@
PORTNAME= krename
PORTVERSION= 4.0.9
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= sysutils kde
MASTER_SITES= SF/${PORTNAME}/KDE4%20${PORTNAME}-stable/${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= nepomuk-core
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}

View File

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

View File

@ -3,6 +3,7 @@
PORTNAME= gnome-commander
PORTVERSION= 1.4.8
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME/sources/gnome-commander/1.4

View File

@ -2,7 +2,7 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}