[pkgsrc/trunk]: pkgsrc/devel/libextractor libextractor: updated to 1.11

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0871a4fbb852
branches:  trunk
changeset: 384030:0871a4fbb852
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Aug 26 07:41:21 2022 +0000

description:
libextractor: updated to 1.11

libextractor 1.11
Fix 6709: mask SIGPIPE to avoid test case failure
with latest librpm.  Remove plibc.h logic.

Fix 6613: test failure with latest exiv2 library
(harmless). Add hard timeout for zzuf test suite
on systems where timeout command exists.

libextractor 1.10
Fixed some code that called deprecated libav routines.
Improved configure reporting.

diffstat:

 devel/libextractor/Makefile                |   16 +--
 devel/libextractor/PLIST                   |    7 +-
 devel/libextractor/distinfo                |    9 +-
 devel/libextractor/patches/patch-exiv2-fix |  129 -----------------------------
 4 files changed, 16 insertions(+), 145 deletions(-)

diffs (248 lines):

diff -r 6fb3add72ea3 -r 0871a4fbb852 devel/libextractor/Makefile
--- a/devel/libextractor/Makefile       Fri Aug 26 06:44:04 2022 +0000
+++ b/devel/libextractor/Makefile       Fri Aug 26 07:41:21 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2022/08/11 05:08:11 gutteridge Exp $
+# $NetBSD: Makefile,v 1.95 2022/08/26 07:41:21 adam Exp $
 
-DISTNAME=      libextractor-1.9
-PKGREVISION=   15
+DISTNAME=      libextractor-1.11
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=libextractor/}
 
@@ -10,13 +9,10 @@
 COMMENT=       Metadata extractor for various file data types
 LICENSE=       gnu-gpl-v3
 
-MAKE_JOBS_SAFE=                no
-
 USE_LIBTOOL=           yes
 USE_LANGUAGES=         c c++03
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake pkg-config
-USE_TOOLS+=            msgfmt msgmerge xgettext
+USE_TOOLS+=            gmake msgfmt msgmerge pkg-config xgettext
 GNU_CONFIGURE=         yes
 INFO_FILES=            yes
 PTHREAD_OPTS+=         require
@@ -26,8 +22,6 @@
 # This package requires dlopen, so save on space by skipping non-PIC libs
 SHLIBTOOL_OVERRIDE=    # empty
 
-DEPENDS+=      ImageMagick-[0-9]*:../../graphics/ImageMagick
-
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libsmf/buildlink3.mk"
@@ -37,14 +31,16 @@
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/libmpeg2/buildlink3.mk"
 .include "../../multimedia/mp4v2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../www/tidy/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 6fb3add72ea3 -r 0871a4fbb852 devel/libextractor/PLIST
--- a/devel/libextractor/PLIST  Fri Aug 26 06:44:04 2022 +0000
+++ b/devel/libextractor/PLIST  Fri Aug 26 07:41:21 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2019/02/19 00:03:45 gdt Exp $
+@comment $NetBSD: PLIST,v 1.16 2022/08/26 07:41:21 adam Exp $
 bin/extract
 include/extractor.h
 info/libextractor.info
@@ -8,6 +8,7 @@
 lib/libextractor/libextractor_dvi.la
 lib/libextractor/libextractor_exiv2.la
 lib/libextractor/libextractor_flac.la
+lib/libextractor/libextractor_gif.la
 lib/libextractor/libextractor_html.la
 lib/libextractor/libextractor_it.la
 lib/libextractor/libextractor_jpeg.la
@@ -22,10 +23,12 @@
 lib/libextractor/libextractor_ole2.la
 lib/libextractor/libextractor_pdf.la
 lib/libextractor/libextractor_png.la
+lib/libextractor/libextractor_previewopus.la
 lib/libextractor/libextractor_ps.la
 lib/libextractor/libextractor_riff.la
 lib/libextractor/libextractor_s3m.la
 lib/libextractor/libextractor_sid.la
+lib/libextractor/libextractor_thumbnailffmpeg.la
 lib/libextractor/libextractor_thumbnailgtk.la
 lib/libextractor/libextractor_tiff.la
 lib/libextractor/libextractor_wav.la
@@ -35,6 +38,7 @@
 lib/pkgconfig/libextractor.pc
 man/man1/extract.1
 man/man3/libextractor.3
+share/locale/da/LC_MESSAGES/libextractor.mo
 share/locale/de/LC_MESSAGES/libextractor.mo
 share/locale/es/LC_MESSAGES/libextractor.mo
 share/locale/fr/LC_MESSAGES/libextractor.mo
@@ -42,6 +46,7 @@
 share/locale/it/LC_MESSAGES/libextractor.mo
 share/locale/nl/LC_MESSAGES/libextractor.mo
 share/locale/pl/LC_MESSAGES/libextractor.mo
+share/locale/pt_BR/LC_MESSAGES/libextractor.mo
 share/locale/ro/LC_MESSAGES/libextractor.mo
 share/locale/rw/LC_MESSAGES/libextractor.mo
 share/locale/sr/LC_MESSAGES/libextractor.mo
diff -r 6fb3add72ea3 -r 0871a4fbb852 devel/libextractor/distinfo
--- a/devel/libextractor/distinfo       Fri Aug 26 06:44:04 2022 +0000
+++ b/devel/libextractor/distinfo       Fri Aug 26 07:41:21 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 10:15:19 nia Exp $
+$NetBSD: distinfo,v 1.31 2022/08/26 07:41:21 adam Exp $
 
-BLAKE2s (libextractor-1.9.tar.gz) = d5d45fb6a0ddb1315bfa5e04a6750359c74c8cb3244764cc10f239a7e2fdd652
-SHA512 (libextractor-1.9.tar.gz) = c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149
-Size (libextractor-1.9.tar.gz) = 8323852 bytes
-SHA1 (patch-exiv2-fix) = d209c3fca76781eddea0b783cdfa2d8de4234cb2
+BLAKE2s (libextractor-1.11.tar.gz) = 7e8353de830a60b6d4cfc04bc3c6d5b98bdc569dd353b27123d0dfd7193ae520
+SHA512 (libextractor-1.11.tar.gz) = 7023d8cb377fda854523242ac9fd14a97eed86d2cd829b126bb4d5a26d5f3650642f3871cf74ae3b0788447cc0a2dce942684ef0d45f17c9ba9248b5aed623d3
+Size (libextractor-1.11.tar.gz) = 8367637 bytes
diff -r 6fb3add72ea3 -r 0871a4fbb852 devel/libextractor/patches/patch-exiv2-fix
--- a/devel/libextractor/patches/patch-exiv2-fix        Fri Aug 26 06:44:04 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-$NetBSD: patch-exiv2-fix,v 1.2 2019/08/23 11:06:08 ng0 Exp $
-
-Partial pick from upstream commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c:
-importing patch from Gentoo/AS to address exiv2 build issue (#5820)
-
---- AUTHORS~
-+++ AUTHORS
-@@ -4,6 +4,7 @@ LRN <lrn1986%gmail.com@localhost>
- 
- Developers:
- Andreas Huggel <ahuggel%gmx.net@localhost>
-+Andreas Strumlechner <andreas.sturmlechner%gmail.com@localhost>
- Blake Matheny <bmatheny%mobocracy.net@localhost>
- Bruno Cabral <bcabral%uw.edu@localhost>
- Bruno Haible <bruno%clisp.org@localhost>
-
---- src/plugins/exiv2_extractor.cc~
-+++ src/plugins/exiv2_extractor.cc
-@@ -27,10 +27,7 @@
- #include <cassert>
- #include <cstring>
- #include <math.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/error.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/futils.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- /**
-  * Enable debugging to get error messages.
-@@ -180,7 +177,7 @@ public:
-    *
-    * @return -1 on error
-    */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
-   virtual size_t size (void) const;
- #else
-   virtual long int size (void) const;
-@@ -316,7 +313,11 @@ ExtractorIO::getb ()
-   const unsigned char *r;
- 
-   if (1 != ec->read (ec->cls, &data, 1))
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-     throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
-   r = (const unsigned char *) data;
-   return *r;
- }
-@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data)
- void
- ExtractorIO::transfer (Exiv2::BasicIo& src)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset,
- Exiv2::byte *
- ExtractorIO::mmap (bool isWritable)
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const
-  *
-  * @return -1 on error
-  */
--#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+#if EXIV2_TEST_VERSION(0,26,0)
- size_t
- #else
- long int
-@@ -504,7 +513,11 @@ ExtractorIO::eof () const
- std::string
- ExtractorIO::path () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -517,7 +530,11 @@ ExtractorIO::path () const
- std::wstring
- ExtractorIO::wpath () const
- {
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- #endif
- 
-@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr
- ExtractorIO::temporary () const
- {
-   fprintf (stderr, "throwing temporary error\n");
-+#if EXIV2_TEST_VERSION(0,27,0)
-+    throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
-   throw Exiv2::BasicError<char> (42 /* error code */);
-+#endif
- }
- 
- 
-@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec)
- {
-   try
-     {
--#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION
-+#if !EXIV2_TEST_VERSION(0,24,0)
-       Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute);
- #endif
-       std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec));