<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[148141] trunk/dports/devel/libextractor</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/148141">148141</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-04-27 15:02:37 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>libextractor: patch for ffmpeg-3.0 compatibility, increment revision.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibextractorPortfile">trunk/dports/devel/libextractor/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibextractorfilespatchffmpeg30diff">trunk/dports/devel/libextractor/files/patch-ffmpeg-3.0.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibextractorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libextractor/Portfile (148140 => 148141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libextractor/Portfile        2016-04-27 21:52:14 UTC (rev 148140)
+++ trunk/dports/devel/libextractor/Portfile        2016-04-27 22:02:37 UTC (rev 148141)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name libextractor
</span><span class="cx"> version 1.3
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories devel
</span><span class="cx"> license GPL-3+
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -53,7 +53,8 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure.diff \
</span><span class="cx"> patch-src-plugins-html_extractor.c.diff \
</span><del>- patch-src-plugins-jpeg_extractor.c.diff
</del><ins>+ patch-src-plugins-jpeg_extractor.c.diff \
+ patch-ffmpeg-3.0.diff
</ins><span class="cx">
</span><span class="cx"> configure.args --enable-ffmpeg \
</span><span class="cx"> --enable-glib \
</span></span></pre></div>
<a id="trunkdportsdevellibextractorfilespatchffmpeg30diff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libextractor/files/patch-ffmpeg-3.0.diff (0 => 148141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libextractor/files/patch-ffmpeg-3.0.diff         (rev 0)
+++ trunk/dports/devel/libextractor/files/patch-ffmpeg-3.0.diff        2016-04-27 22:02:37 UTC (rev 148141)
</span><span class="lines">@@ -0,0 +1,167 @@
</span><ins>+diff -ur src/plugins.orig/previewopus_extractor.c src/plugins/previewopus_extractor.c
+--- src/plugins.orig/previewopus_extractor.c        2016-04-21 14:25:09.000000000 -0700
++++ src/plugins/previewopus_extractor.c        2016-04-21 14:26:39.000000000 -0700
+@@ -296,7 +296,7 @@
+ /** Initialize one audio frame for reading from the input file */
+ static int init_input_frame(AVFrame **frame)
+ {
+- if (!(*frame = avcodec_alloc_frame())) {
++ if (!(*frame = av_frame_alloc())) {
+ #if DEBUG
+ fprintf(stderr, "Could not allocate input frame\n");
+ #endif
+@@ -655,7 +655,7 @@
+ av_freep(&converted_input_samples[0]);
+ free(converted_input_samples);
+ }
+- avcodec_free_frame(&input_frame);
++ av_frame_free(&input_frame);
+
+ return ret;
+ }
+@@ -671,7 +671,7 @@
+ int error;
+
+ /** Create a new frame to store the audio samples. */
+- if (!(*frame = avcodec_alloc_frame())) {
++ if (!(*frame = av_frame_alloc())) {
+ #if DEBUG
+                 fprintf(stderr, "Could not allocate output frame\n");
+                 #endif
+@@ -702,7 +702,7 @@
+ #if DEBUG
+                 fprintf(stderr, "Could allocate output frame samples (error '%s')\n", get_error_text(error));
+                 #endif
+- avcodec_free_frame(frame);
++ av_frame_free(frame);
+ return error;
+ }
+
+@@ -783,17 +783,17 @@
+ #if DEBUG
+                 fprintf(stderr, "Could not read data from FIFO\n");
+                 #endif
+- avcodec_free_frame(&output_frame);
++ av_frame_free(&output_frame);
+ return AVERROR_EXIT;
+ }
+
+ /** Encode one frame worth of audio samples. */
+ if (encode_audio_frame(output_frame, output_format_context,
+ output_codec_context, &data_written)) {
+- avcodec_free_frame(&output_frame);
++ av_frame_free(&output_frame);
+ return AVERROR_EXIT;
+ }
+- avcodec_free_frame(&output_frame);
++ av_frame_free(&output_frame);
+ return 0;
+ }
+ /** Write the trailer of the output file container. */
+@@ -907,7 +907,7 @@
+ return;
+ }
+
+- if (NULL == (frame = avcodec_alloc_frame ()))
++ if (NULL == (frame = av_frame_alloc ()))
+ {
+ #if DEBUG
+ fprintf (stderr,
+diff -ur src/plugins.orig/thumbnailffmpeg_extractor.c src/plugins/thumbnailffmpeg_extractor.c
+--- src/plugins.orig/thumbnailffmpeg_extractor.c        2016-04-21 14:25:09.000000000 -0700
++++ src/plugins/thumbnailffmpeg_extractor.c        2016-04-21 14:25:19.000000000 -0700
+@@ -153,7 +153,7 @@
+ static size_t
+ create_thumbnail (int src_width, int src_height,
+                  int src_stride[],
+-                 enum PixelFormat src_pixfmt,
++                 enum AVPixelFormat src_pixfmt,
+                  const uint8_t * const src_data[],
+                  int dst_width, int dst_height,
+                  uint8_t **output_data,
+@@ -189,7 +189,7 @@
+ if (NULL ==
+ (scaler_ctx =
+ sws_getContext (src_width, src_height, src_pixfmt,
+-                 dst_width, dst_height, PIX_FMT_RGB24,
++                 dst_width, dst_height, AV_PIX_FMT_RGB24,
+                  SWS_BILINEAR, NULL, NULL, NULL)))
+ {
+ #if DEBUG
+@@ -199,7 +199,7 @@
+ return 0;
+ }
+
+- if (NULL == (dst_frame = avcodec_alloc_frame ()))
++ if (NULL == (dst_frame = av_frame_alloc ()))
+ {
+ #if DEBUG
+ fprintf (stderr,
+@@ -209,7 +209,7 @@
+ return 0;
+ }
+ if (NULL == (dst_buffer =
+-         av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
++         av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
+ {
+ #if DEBUG
+ fprintf (stderr,
+@@ -220,7 +220,7 @@
+ return 0;
+ }
+ avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
+- PIX_FMT_RGB24, dst_width, dst_height);
++ AV_PIX_FMT_RGB24, dst_width, dst_height);
+ sws_scale (scaler_ctx,
+ src_data,
+ src_stride,
+@@ -255,7 +255,7 @@
+ }
+ encoder_codec_ctx->width = dst_width;
+ encoder_codec_ctx->height = dst_height;
+- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
++ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
+ opts = NULL;
+ if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
+ {
+@@ -283,7 +283,7 @@
+ err = pkt.size;
+ memcpy(encoder_output_buffer,pkt.data, pkt.size);
+
+- av_free_packet(&pkt);
++ av_packet_unref(&pkt);
+                                                         
+                                                         
+ #else
+@@ -410,7 +410,7 @@
+ return;
+ }
+ av_dict_free (&opts);
+- if (NULL == (frame = avcodec_alloc_frame ()))
++ if (NULL == (frame = av_frame_alloc ()))
+ {
+ #if DEBUG
+ fprintf (stderr,
+@@ -563,7 +563,7 @@
+ return;
+ }
+
+- if (NULL == (frame = avcodec_alloc_frame ()))
++ if (NULL == (frame = av_frame_alloc ()))
+ {
+ #if DEBUG
+ fprintf (stderr,
+@@ -603,11 +603,11 @@
+                                  &packet);
+ if (frame_finished && frame->key_frame)
+ {
+- av_free_packet (&packet);
++ av_packet_unref (&packet);
+ break;
+ }
+ }
+- av_free_packet (&packet);
++ av_packet_unref (&packet);
+ }
+
+ if (! frame_finished)
</ins></span></pre>
</div>
</div>
</body>
</html>