<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/c6dfbbc31f6700754ec2e827fbf31bbb5f9de8c0">https://github.com/macports/macports-ports/commit/c6dfbbc31f6700754ec2e827fbf31bbb5f9de8c0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c6dfbbc31f6700754ec2e827fbf31bbb5f9de8c0
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Nov 7 08:34:23 2018 -0800

<span style='display:block; white-space:pre;color:#404040;'>    ffmpeg-devel: update to git master as of 20181106
</span>---
 multimedia/ffmpeg-devel/Portfile                   | 14 +++----
 ...r-df3d962d2e736c0748b91a3c8c701d7cb96154a8.diff | 47 ----------------------
 2 files changed, 6 insertions(+), 55 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 50c142f..2b9065d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,10 @@ PortGroup           compiler_blacklist_versions 1.0
</span> PortGroup           active_variants 1.1
 PortGroup           github 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        FFmpeg FFmpeg 50df4c958b641e3ee3114e1eb659a151d34d2ac1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        FFmpeg FFmpeg d96ae9d5ea1f47a437fc0663b0cc26ff5d4d5d31
</span> name                ffmpeg-devel
 conflicts           ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             20180523
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             20181106
</span> license             LGPL-2.1+
 categories          multimedia
 maintainers         {devans @dbevans} {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,9 +49,9 @@ long_description    FFmpeg is a complete solution to record, convert and \
</span> platforms           darwin
 homepage            http://www.ffmpeg.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  34a48e5b8219929ab506139ffc31db834bfbbe20 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  34a960286e979d0e8ea7ab54e5b34992c396cced22fb28941fef48be27ed57f0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    12554797
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  149b5050df799a516f6d44b4afd96f12d4c9e7fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  b2535d8772f33aa6166da7284887401822834e8cbc5da416b6c8be740fc34a9f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    12753206
</span> 
 depends_build       port:pkgconfig \
                     port:gmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,8 +82,7 @@ depends_lib         port:lame \
</span>                     port:xz \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-libavcodec-audiotoolboxenc.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-libavformat-mxfenc.c-parens-around-initializer-df3d962d2e736c0748b91a3c8c701d7cb96154a8.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-libavcodec-audiotoolboxenc.c.diff
</span> 
 #
 # enable auto configure of asm optimizations
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/files/patch-libavformat-mxfenc.c-parens-around-initializer-df3d962d2e736c0748b91a3c8c701d7cb96154a8.diff b/multimedia/ffmpeg-devel/files/patch-libavformat-mxfenc.c-parens-around-initializer-df3d962d2e736c0748b91a3c8c701d7cb96154a8.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc3252a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/files/patch-libavformat-mxfenc.c-parens-around-initializer-df3d962d2e736c0748b91a3c8c701d7cb96154a8.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Michael Niedermayer <michael@niedermayer.cc>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 22 May 2018 18:57:13 +0000 (+0200)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: libavformat/mxfenc: Add some () to attempt to workaround build issue on osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/df3d962d2e736c0748b91a3c8c701d7cb96154a8?hp=1386a199f9fe3d1ab3a6bb8a4e2fe5a9961024e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libavformat/mxfenc: Add some () to attempt to workaround build issue on osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fixes ticket7209
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tested-by: Jim DeLaHunt <from.ffmpeg-dev@jdlh.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
</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;'>-diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 44425bf..77f60f5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libavformat/mxfenc.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libavformat/mxfenc.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1149,23 +1149,23 @@ static int get_trc(UID ul, enum AVColorTransferCharacteristic trc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     switch (trc){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_GAMMA28   :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_GAMMA22   :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        memcpy(ul, (UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x01,0x00,0x00}, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        memcpy(ul, ((UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x01,0x00,0x00}), 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_BT709     :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_SMPTE170M :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        memcpy(ul, (UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x02,0x00,0x00}, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        memcpy(ul, ((UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x02,0x00,0x00}), 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_SMPTE240M :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        memcpy(ul, (UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x03,0x00,0x00}, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        memcpy(ul, ((UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x01,0x01,0x01,0x03,0x00,0x00}), 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_BT1361_ECG:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        memcpy(ul, (UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x06,0x04,0x01,0x01,0x01,0x01,0x05,0x00,0x00}, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        memcpy(ul, ((UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x06,0x04,0x01,0x01,0x01,0x01,0x05,0x00,0x00}), 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_LINEAR    :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        memcpy(ul, (UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x06,0x04,0x01,0x01,0x01,0x01,0x06,0x00,0x00}, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        memcpy(ul, ((UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x06,0x04,0x01,0x01,0x01,0x01,0x06,0x00,0x00}), 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     case AVCOL_TRC_SMPTE428  :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        memcpy(ul, (UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x08,0x04,0x01,0x01,0x01,0x01,0x07,0x00,0x00}, 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        memcpy(ul, ((UID){0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x08,0x04,0x01,0x01,0x01,0x01,0x07,0x00,0x00}), 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         return -1;
</span></pre><pre style='margin:0'>

</pre>