<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/968496de4d39c0a8c65e3a306e14e6886827ac2a">https://github.com/macports/macports-ports/commit/968496de4d39c0a8c65e3a306e14e6886827ac2a</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 968496d mpv: update to 0.31.0 (#6293)
</span>968496d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 968496de4d39c0a8c65e3a306e14e6886827ac2a
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Feb 8 11:37:46 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> mpv: update to 0.31.0 (#6293)
</span>---
multimedia/mpv/Portfile | 40 +++++-----------------
.../mpv/files/patch-fix-swift-detection.diff | 31 -----------------
.../files/patch-osdep-macosx_compat-h-typo.diff | 11 ------
3 files changed, 8 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/Portfile b/multimedia/mpv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 20a1605..bf05121 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup waf 1.0
</span> PortGroup legacysupport 1.0
# Please revbump mpv whenever ffmpeg{,-devel} is updated!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mpv-player mpv 0.29.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mpv-player mpv 0.31.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories multimedia
license GPL-2+
maintainers {ionic @Ionic}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ distfiles-append ${waf_distfile}:waf
</span> extract.only-delete ${waf_distfile}
checksums ${mpv_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 10edd02cf12c4668c57317caf3042df30ae1128c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c7076df8c46f2696121d0b96cc5edfc472cbccc3b6a70d9b5c00a72b6a41c820 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3059829 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 803163ceb49056a211263a118236553e3668c260 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 22d307779653ac8921258d311e1f5e1ea28ce1c7f8083e49d187c41d21318a25 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3143066 \
</span> ${waf_distfile} \
rmd160 bbb01fa7c1d552c01e5a6531ed27aef710d668e7 \
sha256 2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,6 @@ configure.args-append --enable-manpage-build \
</span> --disable-egl-angle-win32 \
--disable-audiounit \
--disable-ios-gl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-mali-fbdev \
</span> --disable-direct3d \
--disable-android \
--disable-rpi \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,11 +107,9 @@ configure.args-append --disable-pdf-build \
</span> --disable-debug-build \
--disable-libsmbclient \
--disable-libass-osd \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dvdread \
</span> --disable-dvdnav \
--disable-cdda \
--disable-vapoursynth \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-vapoursynth-lazy \
</span> --disable-libarchive \
--disable-rubberband \
--disable-pulse \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,9 +124,7 @@ configure.args-append --disable-pdf-build \
</span> --disable-jpeg \
--disable-tv \
--disable-lua \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-apple-remote \
</span> --disable-gl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-zsh-comp \
</span> --disable-javascript \
--disable-uchardet
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,9 +166,6 @@ platform macosx {
</span>
# Force clang compiler as installed by Xcode's CLT's... hopefully.
compiler.blacklist-append *gcc* cc macports-*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-apple-remote \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-apple-remote
</span> }
if {${os.major} <= 10 || ${configure.build_arch} ne "x86_64"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,13 +195,9 @@ platform darwin {
</span> which is the location preferred by upstream.
}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/mpv-player/mpv/pull/6214
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-swift-detection.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cocoa-cb backend requires Swift 3 support, which is only available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in Xcode 8.0 to Xcode 10.1. Xcode 10.2 ship with Swift 5 which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dropped Swift 3 compatibility.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 8.0] < 0 || {[vercmp ${xcodeversion} 10.2]} >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cocoa-cb backend requires Swift 5 or 4 support, which is only available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in Xcode 9.1 onwards.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 9.1] < 0} {
</span> configure.args-replace --enable-swift \
--disable-swift
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,10 +229,6 @@ platform darwin {
</span> patchfiles-append patch-waftools-detection-compiler-py-no-tautological.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix typo in restricted block. This patch can disappear after next update as this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix has been merged upstream 20190126
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-osdep-macosx_compat-h-typo.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Make mpv work as good as possible on 10.6 and below. No Cocoa support, instead concentrate
# on getting the OpenGL output to work via X11.
# Also fix some other minor compile issues only manifesting on 10.6 and below along the way.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,8 +422,6 @@ variant network description {Enable networking support via youtube-dl (supports
</span> variant dvd description {Enable DVD and DeCSS support} {
depends_lib-append port:libdvdread \
port:libdvdnav
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-dvdread \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-dvdread
</span> configure.args-replace --disable-dvdnav \
--enable-dvdnav
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -549,12 +531,6 @@ variant printable_doc description {Generate printable documents (PDF help)} {
</span> --enable-pdf-build
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant zsh description {Enable/install zsh completion support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:${prefix}/bin/zsh:zsh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-zsh-comp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-zsh-comp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #variant javascript description {Enable JavaScript support via mujs} {
# depends_lib-append port:mujs
# configure.args-replace --disable-javascript \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-fix-swift-detection.diff b/multimedia/mpv/files/patch-fix-swift-detection.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2ffff73..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-fix-swift-detection.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 23cfa8ffd77c7543a06c9744b0dfbcc1bf1df760 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Akemi <der.richter@gmx.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 15 Oct 2018 19:59:11 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] build: more reliable way of getting the Swift version from a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes #6212
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- waftools/detections/compiler_swift.py | 5 ++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git waftools/detections/compiler_swift.py waftools/detections/compiler_swift.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cf55149291..3c130302be 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- waftools/detections/compiler_swift.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ waftools/detections/compiler_swift.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import re
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from waflib import Utils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def __run(cmd):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +12,9 @@ def __add_swift_flags(ctx):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctx.env.SWIFT_FLAGS = ('-frontend -c -sdk %s -enable-objc-interop'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ' -emit-objc-header -parse-as-library'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ' -target x86_64-apple-macosx10.10') % (ctx.env.MACOS_SDK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ctx.env.SWIFT_VERSION = __run([ctx.env.SWIFT, '-version']).split(' ')[3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ver = re.compile("(?i)version\s?([\d.]+)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ctx.env.SWIFT_VERSION = ver.search(__run([ctx.env.SWIFT, '-version'])).group(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- major, minor = [int(n) for n in ctx.env.SWIFT_VERSION.split('.')[:2]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the -swift-version parameter is only supported on swift 3.1 and newer
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/patch-osdep-macosx_compat-h-typo.diff b/multimedia/mpv/files/patch-osdep-macosx_compat-h-typo.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b258048..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/patch-osdep-macosx_compat-h-typo.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./osdep/macosx_compat.h.orig 2019-01-25 19:27:21.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./osdep/macosx_compat.h 2019-01-25 19:27:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,7 +55,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef NSUInteger NSModalResponse;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static const NSModalResponse NSModalResponseOK = NSFileHandlingPanelOKButton
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const NSModalResponse NSModalResponseOK = NSFileHandlingPanelOKButton;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>