diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index 42ea976b7ac1..89c2901944db 100644 --- a/graphics/exiv2/Makefile +++ b/graphics/exiv2/Makefile @@ -1,70 +1,58 @@ PORTNAME= exiv2 -DISTVERSION= 0.28.0 -DISTVERSIONSUFFIX= -Source -PORTREVISION= 1 +DISTVERSIONPREFIX= v +DISTVERSION= 0.28.2 PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= https://github.com/Exiv2/exiv2/releases/download/v${DISTVERSION}/ - -# https://git.alpinelinux.org/aports/log/community/exiv2 -# https://github.com/Exiv2/exiv2/compare/v0.28.0...0.28.x -PATCH_SITES= https://github.com/Exiv2/exiv2/commit/ -PATCHFILES= 16c1cd7da0cd159ee2d53c39088564edaf046c77.patch:-p1 \ - 2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch:-p1 \ - 3664f5b826f5688b82470235d1dceef0c9c4c47d.patch:-p1 \ - b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch:-p1 \ - c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch:-p1 \ - f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch:-p1 MAINTAINER= multimedia@FreeBSD.org COMMENT= Exif, IPTC, and XMP metadata manipulation library and tools WWW= https://www.exiv2.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ libexpat.so:textproc/expat2 \ libinih.so:devel/inih \ libpng.so:graphics/png USES= cmake compiler:c++17-lang cpe dos2unix gettext-tools iconv \ localbase:ldflags pathfix shebangfix DOS2UNIX_FILES= cmake/compilerFlags.cmake -USE_LDCONFIG= yes SHEBANG_FILES= fuzz/mkdictionary.py tests/runner.py +USE_LDCONFIG= yes -CMAKE_ARGS= -DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}" +USE_GITHUB= yes +GH_ACCOUNT= Exiv2 CMAKE_ON= EXIV2_ENABLE_VIDEO CMAKE_OFF= EXIV2_ENABLE_EXTERNAL_XMP LDFLAGS_mips= -lintl LDFLAGS_mips64= -lintl -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-Source - OPTIONS_DEFINE= DOCS DOXYGEN NLS SAMPLE TEST OPTIONS_SUB= yes SAMPLE_DESC= Include sample applications DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \ doxygen:devel/doxygen DOXYGEN_CMAKE_BOOL= EXIV2_BUILD_DOC DOXYGEN_ALL_TARGET= all doc DOXYGEN_PORTDOCS= * NLS_USES= gettext-runtime NLS_CMAKE_BOOL= EXIV2_ENABLE_NLS SAMPLE_CMAKE_BOOL= EXIV2_BUILD_SAMPLES -TEST_IMPLIES= SAMPLE TEST_LIB_DEPENDS= libgtest.so:devel/googletest TEST_TEST_DEPENDS= bash:shells/bash TEST_USES= python:build,test TEST_CMAKE_BOOL= EXIV2_BUILD_UNIT_TESTS +TEST_CMAKE_ON= -DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}" TEST_TEST_TARGET= test +TEST_IMPLIES= SAMPLE .include diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo index 637ac00e4707..f4891eb36e86 100644 --- a/graphics/exiv2/distinfo +++ b/graphics/exiv2/distinfo @@ -1,15 +1,3 @@ -TIMESTAMP = 1688940824 -SHA256 (exiv2-0.28.0-Source.tar.gz) = 89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d -SIZE (exiv2-0.28.0-Source.tar.gz) = 44893310 -SHA256 (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = a82d468d34ed0d656a19d1be529ed29efe19ced5e2c1d0a321b6d10b4ccbe3f7 -SIZE (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = 4995 -SHA256 (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 43f6fd90aca09e6a8aa9400f1aad3b805766661ecf2b428dbe5b427ffaedde5d -SIZE (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 2265 -SHA256 (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = d301da6b22ea163497a17beb773d47c2fd254ed98032bd26c875b997c7bbe05b -SIZE (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = 12991 -SHA256 (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = e3b0dce84cdacbdbb24c6c39772f6cdbba7e3e3101be540d7695d3d981c810e5 -SIZE (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = 755 -SHA256 (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = df98e6aee22365742d5550f1b32b21a486145b7c798f1fea805ad3d690898ae1 -SIZE (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = 776 -SHA256 (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = c2e1f84d0a86cf899fddd50b2741add3902c25a79925b32964a7c5187f4deabd -SIZE (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = 1125 +TIMESTAMP = 1707967147 +SHA256 (Exiv2-exiv2-v0.28.2_GH0.tar.gz) = 543bead934135f20f438e0b6d8858c55c5fcb7ff80f5d1d55489965f1aad58b9 +SIZE (Exiv2-exiv2-v0.28.2_GH0.tar.gz) = 45224206 diff --git a/graphics/exiv2/files/patch-_MSVC_LANG-warning-Wundef b/graphics/exiv2/files/patch-_MSVC_LANG-warning-Wundef deleted file mode 100644 index a2286868df66..000000000000 --- a/graphics/exiv2/files/patch-_MSVC_LANG-warning-Wundef +++ /dev/null @@ -1,84 +0,0 @@ -From aaa876159ada768ba0fb2d44b4eaaf23b3b2ed98 Mon Sep 17 00:00:00 2001 -From: Matthias Andree -Date: Mon, 3 Jul 2023 11:16:44 +0200 -Subject: [PATCH] Fix preprocessor warnings about undefined _MSVC_LANG - -Stricter compiler/settings, such as found during a build -on FreeBSD with clang 14, issue warnings of the kind below. - -/usr/local/include/exiv2/value.hpp:1272:31: warning: '_MSVC_LANG' is not defined, evaluates to 0 [-Wundef] -fixed-width font helps here-- ^ - -Fix: Guard use of _MSVC_LANG by a check. - -Personally, I found that MSVC has several feature-specific -checks in predefined macros which might allow for one -standards-based check that matches GCC/clang/MSVC rather than the -split check for C++ standard and MSVC language version settings. - -See https://en.cppreference.com/w/cpp/feature_test - -I am not building Exiv2 on MSVC, so I cannot test/suggest -anything here. ---- include/exiv2/slice.hpp.orig 2023-05-08 16:01:13 UTC -+++ include/exiv2/slice.hpp -@@ -255,7 +255,7 @@ struct ContainerStorage { - using iterator = typename container::iterator; - using const_iterator = typename container::const_iterator; - --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t; - #else - using value_type = typename std::remove_cv::type; -@@ -320,7 +320,7 @@ struct ContainerStorage { - */ - template - struct PtrSliceStorage { --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t>; - #else - using value_type = typename std::remove_cv::type>::type; -@@ -423,7 +423,7 @@ struct Slice : public Internal::MutableSliceBase= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t; - #else - using value_type = typename std::remove_cv::type; -@@ -460,7 +460,7 @@ struct Slice : public Internal::Const - using iterator = typename container::iterator; - using const_iterator = typename container::const_iterator; - --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t; - #else - using value_type = typename std::remove_cv::type; - include/exiv2/slice.hpp | 8 ++++---- - include/exiv2/value.hpp | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- include/exiv2/value.hpp.orig 2023-05-08 16:01:13 UTC -+++ include/exiv2/value.hpp -@@ -1254,7 +1254,7 @@ class ValueType : public Value { - } else if (std::is_signed::value) { - #endif - // conversion is from unsigned to signed --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - const auto imax = static_cast>(std::numeric_limits::max()); - #else - const auto imax = static_cast::type>(std::numeric_limits::max()); -@@ -1269,7 +1269,7 @@ class ValueType : public Value { - return 0; - } - // Inputs are not negative so convert them to unsigned. --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - const auto a_u = static_cast>(a); - const auto b_u = static_cast>(b); - #else diff --git a/graphics/exiv2/files/patch-src_version.cpp b/graphics/exiv2/files/patch-src_version.cpp deleted file mode 100644 index 0175b6a0c1b6..000000000000 --- a/graphics/exiv2/files/patch-src_version.cpp +++ /dev/null @@ -1,16 +0,0 @@ -This patch fixes a crash when the procstat_getfiles() -return list contains non-vnodes that don't have an fs_path. - -filed as https://github.com/Exiv2/exiv2/pull/2672 - ---- src/version.cpp.orig 2023-05-08 16:01:13 UTC -+++ src/version.cpp -@@ -148,7 +148,7 @@ static std::vector getLoadedLibraries() { - struct filestat_list* files = procs ? procstat_getfiles(procstat, procs, true) : nullptr; - if (files) { - filestat* entry; -- STAILQ_FOREACH(entry, files, next) { -+ STAILQ_FOREACH(entry, files, next) if (entry && PS_FST_TYPE_VNODE == entry->fs_type && entry->fs_path) { - std::string path(entry->fs_path); - pushPath(path, libs, paths); - } diff --git a/graphics/exiv2/pkg-plist b/graphics/exiv2/pkg-plist index 0ce169f2b461..1a78dbc27653 100644 --- a/graphics/exiv2/pkg-plist +++ b/graphics/exiv2/pkg-plist @@ -1,89 +1,90 @@ %%SAMPLE%%bin/addmoddel %%SAMPLE%%bin/exifcomment %%SAMPLE%%bin/exifdata %%SAMPLE%%bin/exifprint %%SAMPLE%%bin/exifvalue bin/exiv2 %%SAMPLE%%bin/geotag %%SAMPLE%%bin/iptceasy %%SAMPLE%%bin/iptcprint %%SAMPLE%%bin/metacopy %%SAMPLE%%bin/mrwthumb %%SAMPLE%%bin/taglist %%SAMPLE%%bin/xmpdump %%SAMPLE%%bin/xmpparse %%SAMPLE%%bin/xmpprint %%SAMPLE%%bin/xmpsample include/exiv2/asfvideo.hpp include/exiv2/basicio.hpp include/exiv2/bmffimage.hpp include/exiv2/bmpimage.hpp include/exiv2/config.h include/exiv2/convert.hpp include/exiv2/cr2image.hpp include/exiv2/crwimage.hpp include/exiv2/datasets.hpp include/exiv2/easyaccess.hpp include/exiv2/epsimage.hpp include/exiv2/error.hpp include/exiv2/exif.hpp include/exiv2/exiv2.hpp include/exiv2/exiv2lib_export.h include/exiv2/exv_conf.h include/exiv2/futils.hpp include/exiv2/gifimage.hpp include/exiv2/http.hpp include/exiv2/image.hpp include/exiv2/image_types.hpp include/exiv2/iptc.hpp include/exiv2/jp2image.hpp include/exiv2/jpgimage.hpp include/exiv2/matroskavideo.hpp include/exiv2/metadatum.hpp include/exiv2/mrwimage.hpp include/exiv2/orfimage.hpp include/exiv2/pgfimage.hpp include/exiv2/photoshop.hpp include/exiv2/pngimage.hpp include/exiv2/preview.hpp include/exiv2/properties.hpp include/exiv2/psdimage.hpp include/exiv2/quicktimevideo.hpp include/exiv2/rafimage.hpp include/exiv2/riffvideo.hpp include/exiv2/rw2image.hpp include/exiv2/slice.hpp include/exiv2/tags.hpp include/exiv2/tgaimage.hpp include/exiv2/tiffimage.hpp include/exiv2/types.hpp include/exiv2/value.hpp include/exiv2/version.hpp include/exiv2/webpimage.hpp include/exiv2/xmp_exiv2.hpp include/exiv2/xmpsidecar.hpp -lib/cmake/exiv2/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/exiv2/exiv2Config.cmake lib/cmake/exiv2/exiv2ConfigVersion.cmake +lib/cmake/exiv2/exiv2Export-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/exiv2/exiv2Export.cmake lib/libexiv2.so -lib/libexiv2.so.0.28.0 +lib/libexiv2.so.0.28.2 lib/libexiv2.so.28 libdata/pkgconfig/exiv2.pc share/man/man1/exiv2.1.gz %%NLS%%share/locale/bs/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/ca/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/de/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/es/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/fi/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/fr/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/gl/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/ms/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/nl/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/pl/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/pt/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/ru/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/sk/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/sv/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/ug/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/uk/LC_MESSAGES/exiv2.mo %%NLS%%share/locale/vi/LC_MESSAGES/exiv2.mo