<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ae6ed649a718033f29b3e8aba5cbcda5e5e44937">https://github.com/macports/macports-ports/commit/ae6ed649a718033f29b3e8aba5cbcda5e5e44937</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 ae6ed64 mplayer: patch internal ffmpeg for libx264
</span>ae6ed64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ae6ed649a718033f29b3e8aba5cbcda5e5e44937
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Wed Feb 13 12:43:57 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> mplayer: patch internal ffmpeg for libx264
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> backport of minor upstream patch for new API
</span><span style='display:block; white-space:pre;color:#404040;'> bump revision to rebuild against new libx264
</span>---
multimedia/MPlayer/Portfile | 5 +-
.../files/patch-mplayer-libx264-updated.diff | 64 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/MPlayer/Portfile b/multimedia/MPlayer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8eb7cb..8f00447 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/MPlayer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/MPlayer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name MPlayer
version 1.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories multimedia
license GPL-2+
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +79,9 @@ configure.args-append \
</span> patchfiles configure.x11.patch configure.vorbis.patch
patchfiles-append patch-libvo-osx-objc-common-opengl-headers.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/58055
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-mplayer-libx264-updated.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# https://trac.macports.org/ticket/38935
reinplace "s|-maltivec|-faltivec -maltivec|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/MPlayer/files/patch-mplayer-libx264-updated.diff b/multimedia/MPlayer/files/patch-mplayer-libx264-updated.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..36c20d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/MPlayer/files/patch-mplayer-libx264-updated.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ffmpeg/libavcodec/libx264.c ffmpeg/libavcodec/libx264.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5030d65..18ea6c6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ffmpeg/libavcodec/libx264.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ffmpeg/libavcodec/libx264.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +268,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x264_picture_init( &x4->pic );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->pic.img.i_csp = x4->params.i_csp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (x264_bit_depth > 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (X264_BIT_DEPTH > 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -745,6 +745,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->params.i_width = avctx->width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->params.i_height = avctx->height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if X264_BUILD >= 153
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x4->params.i_bitdepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ av_reduce(&sw, &sh, avctx->sample_aspect_ratio.num, avctx->sample_aspect_ratio.den, 4096);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->params.vui.i_sar_width = sw;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->params.vui.i_sar_height = sh;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -858,6 +861,25 @@ FF_ENABLE_DEPRECATION_WARNINGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</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;'>++static const enum AVPixelFormat pix_fmts[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUV420P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUVJ420P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUV422P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUVJ422P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUV444P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUVJ444P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUV420P10,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUV422P10,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_YUV444P10,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_NV12,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_NV16,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_NV20,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef X264_CSP_NV21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_NV21,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_NONE
</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;'>+ static const enum AVPixelFormat pix_fmts_8bit[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AV_PIX_FMT_YUV420P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AV_PIX_FMT_YUVJ420P,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -895,11 +917,11 @@ static const enum AVPixelFormat pix_fmts_8bit_rgb[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static av_cold void X264_init_static(AVCodec *codec)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (x264_bit_depth == 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (X264_BIT_DEPTH == 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ codec->pix_fmts = pix_fmts_8bit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (x264_bit_depth == 9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (X264_BIT_DEPTH == 9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ codec->pix_fmts = pix_fmts_9bit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (x264_bit_depth == 10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (X264_BIT_DEPTH == 10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ codec->pix_fmts = pix_fmts_10bit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>