head	1.3;
access;
symbols
	pkgsrc-2022Q2:1.2.0.24
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.22
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.20
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.18
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.16
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.14
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.12
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.10
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.8
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.4
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.6
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.2
	pkgsrc-2019Q3-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2022.08.26.07.41.22;	author adam;	state dead;
branches;
next	1.2;
commitid	000imJ9o6j0rqmRD;

1.2
date	2019.08.23.11.06.08;	author ng0;	state Exp;
branches;
next	1.1;
commitid	rSrFMmrD9LpqS8AB;

1.1
date	2019.08.23.11.02.30;	author ng0;	state Exp;
branches;
next	;
commitid	95X8wDq2mzgLR8AB;


desc
@@


1.3
log
@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.
@
text
@$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>
 
 Developers:
 Andreas Huggel <ahuggel@@gmx.net>
+Andreas Strumlechner <andreas.sturmlechner@@gmail.com>
 Blake Matheny <bmatheny@@mobocracy.net>
 Bruno Cabral <bcabral@@uw.edu>
 Bruno Haible <bruno@@clisp.org>

--- 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));
@


1.2
log
@devel/libextractor: Fix pkglint for patch file.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@devel/libextractor: Add patch to fix build with exiv2, revbump
@
text
@d1 2
@