<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/db1366c63958321290f8904289a3204c43bf1e09">https://github.com/macports/macports-ports/commit/db1366c63958321290f8904289a3204c43bf1e09</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 db1366c mythtv.28: build fix for x264 build 153+
</span>db1366c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit db1366c63958321290f8904289a3204c43bf1e09
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Mar 21 22:00:04 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> mythtv.28: build fix for x264 build 153+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As of build 153, x264 now supports multibitdepth builds, with a slightly changed API to
</span><span style='display:block; white-space:pre;color:#404040;'> request bitdepth during initialization. The previous global variable, x264_bit_depth,
</span><span style='display:block; white-space:pre;color:#404040;'> used by mythtv, was removed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Current x264 build is 157.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This PR backports the upstream ffmpeg fix for x264 153+ to the older embedded
</span><span style='display:block; white-space:pre;color:#404040;'> copy of ffmpeg in mythtv.28.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/FFmpeg/FFmpeg/commit/c6558e8840fbb2386bf8742e4d68dd6e067d262e
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Author: Luca Barbato <lu_zero@gentoo.org>
</span><span style='display:block; white-space:pre;color:#404040;'> Date: Tue Dec 26 12:32:42 2017 +0100
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> x264: Support version 153
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It has native simultaneus 8 and 10 bit support.
</span>---
multimedia/mythtv.28/Portfile | 4 +-
.../mythtv.28/files/patch-x264-build-153.diff | 116 +++++++++++++++++++++
2 files changed, 119 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mythtv.28/Portfile b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 373806a..ca8b419 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,7 +153,9 @@ if {$subport eq "mythtv-core${majorversion}"} {
</span> patchfiles-append patch-mythwidgets_osx_focus.diff
# https://code.mythtv.org/trac/ticket/13001
patchfiles-append patch_01_typlayer_qsp_ua_detection.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # backport ffmpeg upstream patch for compatibility with x264 build 153+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-x264-build-153.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
set sedPath ${worksrcpath}/mythtv/
ui_info "Make Myth utils use MacPorts Perl"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mythtv.28/files/patch-x264-build-153.diff b/multimedia/mythtv.28/files/patch-x264-build-153.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5d25e43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mythtv.28/files/patch-x264-build-153.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,116 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Backported from ffmpeg commit c6558e8840fbb2386bf8742e4d68dd6e067d262e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Luca Barbato <lu_zero@gentoo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue Dec 26 12:32:42 2017 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x264: Support version 153
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It has native simultaneus 8 and 10 bit support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mythtv/external/FFmpeg/libavcodec/libx264.c.orig 2018-02-01 04:00:06.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mythtv/external/FFmpeg/libavcodec/libx264.c 2019-03-17 01:17:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -268,7 +268,11 @@
</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_BUILD >= 153
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (x4->params.i_bitdepth > 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</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;'>++#endif
</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;'>+@@ -496,6 +500,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->params.p_log_private = avctx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->params.i_log_level = X264_LOG_DEBUG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x4->params.i_csp = convert_pix_fmt(avctx->pix_fmt);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PARSE_X264_OPT("weightp", wpredp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -858,6 +865,7 @@
</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;'>++#if X264_BUILD < 153
</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;'>+@@ -892,15 +900,45 @@
</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;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const enum AVPixelFormat pix_fmts_all[] = {
</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_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_NV21,
</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_NV20,
</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;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if CONFIG_LIBX264RGB_ENCODER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const enum AVPixelFormat pix_fmts_8bit_rgb[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_BGR0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_BGR24,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AV_PIX_FMT_RGB24,
</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;'>++#endif
</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_BUILD < 153
</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;'>+ 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;'>+ codec->pix_fmts = pix_fmts_10bit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ codec->pix_fmts = pix_fmts_all;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ #define OFFSET(x) offsetof(X264Context, x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1035,13 +1073,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .version = LIBAVUTIL_VERSION_INT,
</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 AVClass rgbclass = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .class_name = "libx264rgb",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .item_name = av_default_item_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .option = options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- .version = LIBAVUTIL_VERSION_INT,
</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;'>+ AVCodec ff_libx264_encoder = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .name = "libx264",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1058,6 +1089,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FF_CODEC_CAP_INIT_CLEANUP,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if CONFIG_LIBX264RGB_ENCODER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const AVClass rgbclass = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .class_name = "libx264rgb",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .item_name = av_default_item_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .option = options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ .version = LIBAVUTIL_VERSION_INT,
</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;'>+ AVCodec ff_libx264rgb_encoder = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .name = "libx264rgb",
</span></pre><pre style='margin:0'>
</pre>