<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/864ea40759befbc9b307da144cf74073ce4ae9b5">https://github.com/macports/macports-ports/commit/864ea40759befbc9b307da144cf74073ce4ae9b5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 864ea40 moc: patch for and rebuild with ffmpeg-4.0
</span>864ea40 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 864ea40759befbc9b307da144cf74073ce4ae9b5
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Apr 25 15:03:57 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> moc: patch for and rebuild with ffmpeg-4.0
</span>---
multimedia/moc/Portfile | 5 +++--
multimedia/moc/files/patch-ffmpeg-3.0.diff | 8 ++++----
multimedia/moc/files/patch-ffmpeg-4.0.diff | 31 ++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/moc/Portfile b/multimedia/moc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 143bafe..4035c47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/moc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/moc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name moc
version 2.6-alpha1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> license GPL-2
categories multimedia
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,8 @@ depends_lib port:libiconv \
</span> port:jack \
port:curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ffmpeg-3.0.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ffmpeg-4.0.diff
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/moc/files/patch-ffmpeg-3.0.diff b/multimedia/moc/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f62461..2ba6702 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/moc/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/moc/files/patch-ffmpeg-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ Index: configure.in
</span> ===================================================================
--- configure.in (revision 2781)
+++ configure.in (revision 2785)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -457,19 +457,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -483,19 +483,3 @@
</span> echo " you will not hear any sound!"
echo
fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ Index: decoder_plugins/ffmpeg/ffmpeg.c
</span> ===================================================================
--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2781)
+++ decoder_plugins/ffmpeg/ffmpeg.c (revision 2785)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,7 +41,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,11 @@
</span> GCC_DIAG_ON(deprecated-declarations)
#include <libavutil/mathematics.h>
#ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ Index: decoder_plugins/ffmpeg/ffmpeg.c
</span> #endif
/* FFmpeg also likes common names, without that, our common.h and log.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -769,32 +773,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -781,32 +785,11 @@
</span> return;
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,7 @@ Index: decoder_plugins/ffmpeg/ffmpeg.c
</span> }
static void *ffmpeg_open (const char *file)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1064,7 +1047,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1076,7 +1059,12 @@
</span> {
assert (pkt);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/moc/files/patch-ffmpeg-4.0.diff b/multimedia/moc/files/patch-ffmpeg-4.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f5588b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/moc/files/patch-ffmpeg-4.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- decoder_plugins/ffmpeg/ffmpeg.c.orig 2018-04-24 22:21:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ decoder_plugins/ffmpeg/ffmpeg.c 2018-04-24 22:21:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -895,7 +895,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * FFmpeg/LibAV in use. For some versions this will be caught in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * *_find_stream_info() above and misreported as an unfound codec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * parameters error. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ decoder_error (&data->error, ERROR_FATAL, 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "The codec is experimental and may damage MOC: %s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->codec->name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -903,8 +903,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_downmixing (data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- data->enc->flags |= CODEC_FLAG_TRUNCATED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_AVCODEC_OPEN2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -930,7 +930,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->sample_width = sfmt_Bps (data->fmt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (data->codec->capabilities & CODEC_CAP_DELAY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->delay = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->seek_broken = is_seek_broken (data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data->timing_broken = is_timing_broken (data->ic);
</span></pre><pre style='margin:0'>
</pre>