View | Details | Raw Unified | Return to bug 277146
Collapse All | Expand All

(-)b/graphics/exiv2/Makefile (-19 / +7 lines)
Lines 1-20 Link Here
1
PORTNAME=	exiv2
1
PORTNAME=	exiv2
2
DISTVERSION=	0.28.0
2
DISTVERSIONPREFIX=	v
3
DISTVERSIONSUFFIX=	-Source
3
DISTVERSION=	0.28.2
4
PORTREVISION=	1
5
PORTEPOCH=	1
4
PORTEPOCH=	1
6
CATEGORIES=	graphics
5
CATEGORIES=	graphics
7
MASTER_SITES=	https://github.com/Exiv2/exiv2/releases/download/v${DISTVERSION}/
8
9
# https://git.alpinelinux.org/aports/log/community/exiv2
10
# https://github.com/Exiv2/exiv2/compare/v0.28.0...0.28.x
11
PATCH_SITES=	https://github.com/Exiv2/exiv2/commit/
12
PATCHFILES=	16c1cd7da0cd159ee2d53c39088564edaf046c77.patch:-p1 \
13
		2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch:-p1 \
14
		3664f5b826f5688b82470235d1dceef0c9c4c47d.patch:-p1 \
15
		b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch:-p1 \
16
		c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch:-p1 \
17
		f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch:-p1
18
6
19
MAINTAINER=	multimedia@FreeBSD.org
7
MAINTAINER=	multimedia@FreeBSD.org
20
COMMENT=	Exif, IPTC, and XMP metadata manipulation library and tools
8
COMMENT=	Exif, IPTC, and XMP metadata manipulation library and tools
Lines 31-40 LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ Link Here
31
USES=		cmake compiler:c++17-lang cpe dos2unix gettext-tools iconv \
19
USES=		cmake compiler:c++17-lang cpe dos2unix gettext-tools iconv \
32
		localbase:ldflags pathfix shebangfix
20
		localbase:ldflags pathfix shebangfix
33
DOS2UNIX_FILES=	cmake/compilerFlags.cmake
21
DOS2UNIX_FILES=	cmake/compilerFlags.cmake
34
USE_LDCONFIG=	yes
35
SHEBANG_FILES=	fuzz/mkdictionary.py tests/runner.py
22
SHEBANG_FILES=	fuzz/mkdictionary.py tests/runner.py
23
USE_LDCONFIG=	yes
36
24
37
CMAKE_ARGS=	-DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
25
USE_GITHUB=	yes
26
GH_ACCOUNT=	Exiv2
38
27
39
CMAKE_ON=	EXIV2_ENABLE_VIDEO
28
CMAKE_ON=	EXIV2_ENABLE_VIDEO
40
CMAKE_OFF=	EXIV2_ENABLE_EXTERNAL_XMP
29
CMAKE_OFF=	EXIV2_ENABLE_EXTERNAL_XMP
Lines 42-49 CMAKE_OFF= EXIV2_ENABLE_EXTERNAL_XMP Link Here
42
LDFLAGS_mips=	-lintl
31
LDFLAGS_mips=	-lintl
43
LDFLAGS_mips64=	-lintl
32
LDFLAGS_mips64=	-lintl
44
33
45
WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-Source
46
47
OPTIONS_DEFINE=	DOCS DOXYGEN NLS SAMPLE TEST
34
OPTIONS_DEFINE=	DOCS DOXYGEN NLS SAMPLE TEST
48
OPTIONS_SUB=	yes
35
OPTIONS_SUB=	yes
49
36
Lines 60-70 NLS_CMAKE_BOOL= EXIV2_ENABLE_NLS Link Here
60
47
61
SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES
48
SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES
62
49
63
TEST_IMPLIES=		SAMPLE
64
TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
50
TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
65
TEST_TEST_DEPENDS=	bash:shells/bash
51
TEST_TEST_DEPENDS=	bash:shells/bash
66
TEST_USES=		python:build,test
52
TEST_USES=		python:build,test
67
TEST_CMAKE_BOOL=	EXIV2_BUILD_UNIT_TESTS
53
TEST_CMAKE_BOOL=	EXIV2_BUILD_UNIT_TESTS
54
TEST_CMAKE_ON=		-DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
68
TEST_TEST_TARGET=	test
55
TEST_TEST_TARGET=	test
56
TEST_IMPLIES=		SAMPLE
69
57
70
.include <bsd.port.mk>
58
.include <bsd.port.mk>
(-)b/graphics/exiv2/distinfo (-15 / +3 lines)
Lines 1-15 Link Here
1
TIMESTAMP = 1688940824
1
TIMESTAMP = 1707967147
2
SHA256 (exiv2-0.28.0-Source.tar.gz) = 89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d
2
SHA256 (Exiv2-exiv2-v0.28.2_GH0.tar.gz) = 543bead934135f20f438e0b6d8858c55c5fcb7ff80f5d1d55489965f1aad58b9
3
SIZE (exiv2-0.28.0-Source.tar.gz) = 44893310
3
SIZE (Exiv2-exiv2-v0.28.2_GH0.tar.gz) = 45224206
4
SHA256 (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = a82d468d34ed0d656a19d1be529ed29efe19ced5e2c1d0a321b6d10b4ccbe3f7
5
SIZE (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = 4995
6
SHA256 (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 43f6fd90aca09e6a8aa9400f1aad3b805766661ecf2b428dbe5b427ffaedde5d
7
SIZE (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 2265
8
SHA256 (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = d301da6b22ea163497a17beb773d47c2fd254ed98032bd26c875b997c7bbe05b
9
SIZE (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = 12991
10
SHA256 (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = e3b0dce84cdacbdbb24c6c39772f6cdbba7e3e3101be540d7695d3d981c810e5
11
SIZE (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = 755
12
SHA256 (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = df98e6aee22365742d5550f1b32b21a486145b7c798f1fea805ad3d690898ae1
13
SIZE (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = 776
14
SHA256 (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = c2e1f84d0a86cf899fddd50b2741add3902c25a79925b32964a7c5187f4deabd
15
SIZE (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = 1125
(-)a/graphics/exiv2/files/patch-_MSVC_LANG-warning-Wundef (-84 lines)
Removed Link Here
1
From aaa876159ada768ba0fb2d44b4eaaf23b3b2ed98 Mon Sep 17 00:00:00 2001
2
From: Matthias Andree <matthias.andree@gmx.de>
3
Date: Mon, 3 Jul 2023 11:16:44 +0200
4
Subject: [PATCH] Fix preprocessor warnings about undefined _MSVC_LANG
5
6
Stricter compiler/settings, such as found during a build
7
on FreeBSD with clang 14, issue warnings of the kind below.
8
9
/usr/local/include/exiv2/value.hpp:1272:31: warning: '_MSVC_LANG' is not defined, evaluates to 0 [-Wundef]
10
fixed-width font helps here-- ^
11
12
Fix: Guard use of _MSVC_LANG by a check.
13
14
Personally, I found that MSVC has several feature-specific
15
checks in predefined macros which might allow for one
16
standards-based check that matches GCC/clang/MSVC rather than the
17
split check for C++ standard and MSVC language version settings.
18
19
See https://en.cppreference.com/w/cpp/feature_test
20
21
I am not building Exiv2 on MSVC, so I cannot test/suggest
22
anything here.
23
--- include/exiv2/slice.hpp.orig	2023-05-08 16:01:13 UTC
24
+++ include/exiv2/slice.hpp
25
@@ -255,7 +255,7 @@ struct ContainerStorage {
26
   using iterator = typename container::iterator;
27
   using const_iterator = typename container::const_iterator;
28
 
29
-#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
30
+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L))
31
   using value_type = std::remove_cv_t<typename container::value_type>;
32
 #else
33
   using value_type = typename std::remove_cv<typename container::value_type>::type;
34
@@ -320,7 +320,7 @@ struct ContainerStorage {
35
  */
36
 template <typename storage_type>
37
 struct PtrSliceStorage {
38
-#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
39
+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L))
40
   using value_type = std::remove_cv_t<std::remove_pointer_t<storage_type>>;
41
 #else
42
   using value_type = typename std::remove_cv<typename std::remove_pointer<storage_type>::type>::type;
43
@@ -423,7 +423,7 @@ struct Slice : public Internal::MutableSliceBase<Inter
44
   using iterator = typename container::iterator;
45
   using const_iterator = typename container::const_iterator;
46
 
47
-#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
48
+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L))
49
   using value_type = std::remove_cv_t<typename container::value_type>;
50
 #else
51
   using value_type = typename std::remove_cv<typename container::value_type>::type;
52
@@ -460,7 +460,7 @@ struct Slice<const container> : public Internal::Const
53
   using iterator = typename container::iterator;
54
   using const_iterator = typename container::const_iterator;
55
 
56
-#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
57
+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L))
58
   using value_type = std::remove_cv_t<typename container::value_type>;
59
 #else
60
   using value_type = typename std::remove_cv<typename container::value_type>::type;
61
 include/exiv2/slice.hpp | 8 ++++----
62
 include/exiv2/value.hpp | 4 ++--
63
 2 files changed, 6 insertions(+), 6 deletions(-)
64
65
--- include/exiv2/value.hpp.orig	2023-05-08 16:01:13 UTC
66
+++ include/exiv2/value.hpp
67
@@ -1254,7 +1254,7 @@ class ValueType : public Value {
68
     } else if (std::is_signed<I>::value) {
69
 #endif
70
       // conversion is from unsigned to signed
71
-#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
72
+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L))
73
       const auto imax = static_cast<std::make_unsigned_t<I>>(std::numeric_limits<I>::max());
74
 #else
75
       const auto imax = static_cast<typename std::make_unsigned<I>::type>(std::numeric_limits<I>::max());
76
@@ -1269,7 +1269,7 @@ class ValueType : public Value {
77
         return 0;
78
       }
79
       // Inputs are not negative so convert them to unsigned.
80
-#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
81
+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L))
82
       const auto a_u = static_cast<std::make_unsigned_t<decltype(a)>>(a);
83
       const auto b_u = static_cast<std::make_unsigned_t<decltype(b)>>(b);
84
 #else
(-)a/graphics/exiv2/files/patch-src_version.cpp (-16 lines)
Removed Link Here
1
This patch fixes a crash when the procstat_getfiles()
2
return list contains non-vnodes that don't have an fs_path.
3
4
filed as https://github.com/Exiv2/exiv2/pull/2672
5
6
--- src/version.cpp.orig	2023-05-08 16:01:13 UTC
7
+++ src/version.cpp
8
@@ -148,7 +148,7 @@ static std::vector<std::string> getLoadedLibraries() {
9
     struct filestat_list* files = procs ? procstat_getfiles(procstat, procs, true) : nullptr;
10
     if (files) {
11
       filestat* entry;
12
-      STAILQ_FOREACH(entry, files, next) {
13
+      STAILQ_FOREACH(entry, files, next) if (entry && PS_FST_TYPE_VNODE == entry->fs_type && entry->fs_path) {
14
         std::string path(entry->fs_path);
15
         pushPath(path, libs, paths);
16
       }
(-)b/graphics/exiv2/pkg-plist (-2 / +3 lines)
Lines 62-72 include/exiv2/version.hpp Link Here
62
include/exiv2/webpimage.hpp
62
include/exiv2/webpimage.hpp
63
include/exiv2/xmp_exiv2.hpp
63
include/exiv2/xmp_exiv2.hpp
64
include/exiv2/xmpsidecar.hpp
64
include/exiv2/xmpsidecar.hpp
65
lib/cmake/exiv2/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
66
lib/cmake/exiv2/exiv2Config.cmake
65
lib/cmake/exiv2/exiv2Config.cmake
67
lib/cmake/exiv2/exiv2ConfigVersion.cmake
66
lib/cmake/exiv2/exiv2ConfigVersion.cmake
67
lib/cmake/exiv2/exiv2Export-%%CMAKE_BUILD_TYPE%%.cmake
68
lib/cmake/exiv2/exiv2Export.cmake
68
lib/libexiv2.so
69
lib/libexiv2.so
69
lib/libexiv2.so.0.28.0
70
lib/libexiv2.so.0.28.2
70
lib/libexiv2.so.28
71
lib/libexiv2.so.28
71
libdata/pkgconfig/exiv2.pc
72
libdata/pkgconfig/exiv2.pc
72
share/man/man1/exiv2.1.gz
73
share/man/man1/exiv2.1.gz

Return to bug 277146