<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/967e840e9c301f5d6801430b7fcb27bff6b4fa6e">https://github.com/macports/macports-ports/commit/967e840e9c301f5d6801430b7fcb27bff6b4fa6e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 967e840e9c301f5d6801430b7fcb27bff6b4fa6e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Dec 24 11:06:10 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> libextractor: Update to 1.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55289
</span>---
devel/libextractor/Portfile | 27 +++++----
devel/libextractor/files/patch-configure.diff | 11 ----
devel/libextractor/files/patch-ffmpeg-4.0.diff | 20 -------
.../patch-src-plugins-exiv2_extractor.cc.diff | 64 ----------------------
...-plugins-html_extractor.c.diff => tidy-5.patch} | 12 ++++
5 files changed, 27 insertions(+), 107 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/Portfile b/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07a986ca98c..b7554e50f5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,12 @@
</span> PortSystem 1.0
name libextractor
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 686d66f510caa295f3b7c3de68f307c026bf142e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 16f633ab8746a38547c4a1da3f4591192b0825ad83c4336f0575b85843d8bd8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8367637
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel
license GPL-3+
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,11 +23,6 @@ long_description \
</span>
homepage https://www.gnu.org/software/libextractor/
master_sites gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9e72434f395df4e18913bff257c7dba6567771d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 84128170a4a9aa3a19942dd53fdf30ed17b56d7fae79b5f6e7e17a0d65d1f66c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8045312
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,15 +46,11 @@ depends_lib port:bzip2 \
</span> port:libsmf \
port:libtool \
port:libvorbis \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mp4v2 \
</span> port:tidy \
port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-plugins-exiv2_extractor.cc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-plugins-html_extractor.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ffmpeg-4.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles tidy-5.patch
</span>
configure.args --enable-ffmpeg \
--enable-glib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +60,14 @@ configure.args --enable-ffmpeg \
</span> --with-libintl-prefix=${prefix} \
--with-ltdl=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The configure script looks for mp4v2 but the code that uses it never
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gets built because mp4v2 is missing a feature that the code requires.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://git.gnunet.org/libextractor.git/commit/?id=af0be8c6b6105ace644afebcb847df61411fbb52
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.google.com/archive/p/mp4v2/issues/138
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_header_mp4v2_mp4v2_h=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_lib_mp4v2_MP4ReadProvider=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url https://ftp.gnu.org/gnu/${name}/
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-configure.diff b/devel/libextractor/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 875cbf1f01b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-06-10 07:15:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-07-08 01:50:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20568,7 +20568,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$LIBS -ltidy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <tidy/tidy.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <tidy.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-ffmpeg-4.0.diff b/devel/libextractor/files/patch-ffmpeg-4.0.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f6cd6e62f4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-ffmpeg-4.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/thumbnailffmpeg_extractor.c.orig 2018-04-27 16:17:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/thumbnailffmpeg_extractor.c 2018-04-27 16:18:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Number of bytes to feed to libav in one go, with padding (padding is zeroed).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Global handle to MAGIC data.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -355,7 +355,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- encoder_codec_ctx->flags = CODEC_FLAG_QSCALE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ encoder_codec_ctx->flags = AV_CODEC_FLAG_QSCALE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst_frame->pts = 1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-src-plugins-exiv2_extractor.cc.diff b/devel/libextractor/files/patch-src-plugins-exiv2_extractor.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a1de47b1d6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-src-plugins-exiv2_extractor.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,64 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/exiv2_extractor.cc.orig 2017-06-10 05:22:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/exiv2_extractor.cc 2018-12-23 21:34:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,6 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exiv2/error.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exiv2/image.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exiv2/futils.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <exiv2/version.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Enable debugging to get error messages.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const unsigned char *r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (1 != ec->read (ec->cls, &data, 1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw Exiv2::BasicError<char> (42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::kerErrorMessage, 42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r = (const unsigned char *) data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return *r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -371,7 +372,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ExtractorIO::transfer (Exiv2::BasicIo& src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw Exiv2::BasicError<char> (42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::kerErrorMessage, 42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -416,7 +417,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Exiv2::byte *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ExtractorIO::mmap (bool isWritable)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw Exiv2::BasicError<char> (42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::kerErrorMessage, 42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -504,7 +505,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ExtractorIO::path () const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw Exiv2::BasicError<char> (42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::kerErrorMessage, 42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -517,7 +518,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::wstring
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ExtractorIO::wpath () const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw Exiv2::BasicError<char> (42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::kerErrorMessage, 42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -531,7 +532,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ExtractorIO::temporary () const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf (stderr, "throwing temporary error\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw Exiv2::BasicError<char> (42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Exiv2::Error(Exiv2::kerErrorMessage, 42 /* error code */);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff b/devel/libextractor/files/tidy-5.patch
</span>similarity index 55%
rename from devel/libextractor/files/patch-src-plugins-html_extractor.c.diff
rename to devel/libextractor/files/tidy-5.patch
<span style='display:block; white-space:pre;color:#808080;'>index 7e5588a0303..a7aff23f776 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/files/patch-src-plugins-html_extractor.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libextractor/files/tidy-5.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with tidy 5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-01-30 08:27:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-12-22 04:49:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20803,7 +20803,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS -ltidy"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <tidy/tidy.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <tidy.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span> --- src/plugins/html_extractor.c.orig 2017-06-10 07:09:20.000000000 -0500
+++ src/plugins/html_extractor.c 2017-07-08 02:58:23.000000000 -0500
@@ -26,8 +26,8 @@
</pre><pre style='margin:0'>
</pre>