Page MenuHomeFreeBSD
Files F164103843

D12345.id33008.diff
No OneTemporary
Actions

D12345.id33008.diff
View Options

Index: graphics/exiv2/Makefile
===================================================================
--- graphics/exiv2/Makefile
+++ graphics/exiv2/Makefile
@@ -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
@@ -25,5 +26,7 @@
PATHFIX_CMAKELISTSTXT= CMakeChecks.txt
CFLAGS_powerpc64= -mminimal-toc
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-trunk
.include <bsd.port.mk>
Index: graphics/exiv2/distinfo
===================================================================
--- graphics/exiv2/distinfo
+++ graphics/exiv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469188288
-SHA256 (exiv2-0.25.tar.gz) = c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4
-SIZE (exiv2-0.25.tar.gz) = 5434325
+TIMESTAMP = 1505246232
+SHA256 (exiv2-0.26-trunk.tar.gz) = c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
+SIZE (exiv2-0.26-trunk.tar.gz) = 5677925
Index: graphics/exiv2/files/patch-src_CMakeLists.txt
===================================================================
--- graphics/exiv2/files/patch-src_CMakeLists.txt
+++ graphics/exiv2/files/patch-src_CMakeLists.txt
@@ -5,18 +5,18 @@
[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} )
Index: graphics/exiv2/files/patch-src_actions.cpp
===================================================================
--- /dev/null
+++ graphics/exiv2/files/patch-src_actions.cpp
@@ -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
Index: graphics/exiv2/pkg-plist
===================================================================
--- graphics/exiv2/pkg-plist
+++ graphics/exiv2/pkg-plist
@@ -13,11 +13,11 @@
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/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,13 @@
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
+lib/libxmp.a
libdata/pkgconfig/exiv2.lsm
libdata/pkgconfig/exiv2.pc
man/man1/exiv2.1.gz

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 29, 6:16 PM (5 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35710828
Default Alt Text
D12345.id33008.diff (4 KB)

Event Timeline