<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/155d173926353818286c372661b3071055e88afa">https://github.com/macports/macports-ports/commit/155d173926353818286c372661b3071055e88afa</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 155d1739263 mpv: update to 0.37.0, use meson build system
</span>155d1739263 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 155d173926353818286c372661b3071055e88afa
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Tue Nov 21 22:13:58 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> mpv: update to 0.37.0, use meson build system
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add Vulkan variant
</span><span style='display:block; white-space:pre;color:#404040;'> drop Python 3.8, add Python 3.12 variant
</span>---
multimedia/mpv/Portfile | 302 ++++++++++++++++-----------------
multimedia/mpv/files/config-maintainer | 2 +-
2 files changed, 145 insertions(+), 159 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 bd8512dab9e..f13b3564088 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;'>@@ -2,12 +2,13 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup waf 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
# Please revbump mpv whenever ffmpeg{,-devel} is updated!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mpv-player mpv 0.36.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mpv-player mpv 0.37.0 v
</span> revision 0
categories multimedia
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,22 +24,9 @@ long_description {*}${description} It plays most MPEG/VOB, AVI, Ogg/OGM,
</span> and even H.264 movies.
homepage http://www.mpv.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set waf_version 2.0.23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set waf_distfile waf-${waf_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set mpv_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites-append https://waf.io/:waf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append ${waf_distfile}:waf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only-delete ${waf_distfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${mpv_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9ff58a63048d9a18d233e40cdb4b529031086a54 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e6fed056d6981a165bfbb6c6391109a81078aa8be94f1fbb7c95cb5587d446e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3409580 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${waf_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6af5d2bc4c80d5a21045ea031344005cbcb7a512 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 105122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9cd4ada6decf8ca7a82c3e462fbc8a7b6859406a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 26c9007c655483438d83f17070190fc4b6bccb8ff5efc30fcedbb7d162681a7f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3384587
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +36,8 @@ depends_lib path:lib/libavcodec.dylib:ffmpeg \
</span> port:libiconv \
port:zlib \
port:libass \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lcms2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libplacebo
</span>
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,65 +55,55 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Current waf doesn't support --nocache anymore. Set by PortGroup.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args-delete --nocache
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# I'd *really* love to see what's going on in waf, but even the continue-on-failure option
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# makes waf bail out on the first optional component that was not found (which will always
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# happen, especially since tests for Win32 are bound to fail on other platforms...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append -vvv -kk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Default configuration options. Mostly macOS specific.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We cannot use --enable-cplayer here. Only --disable-cplayer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# is recognized. Boo!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --enable-manpage-build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-coreaudio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-cplugins \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-swift \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-html-build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-videotoolbox-gl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-cuda-hwaccel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-opensles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-egl-drm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-egl-angle-lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-egl-angle-win32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-audiounit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-ios-gl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-direct3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-android \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-rpi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dvbin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --buildtype=release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dmanpage-build=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcoreaudio=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcocoa=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcplugins=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dzlib=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dswift-build=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dhtml-build=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvideotoolbox-gl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcuda-hwaccel=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dopensles=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Degl-drm=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Degl-angle-lib=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Degl-angle-win32=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Daudiounit=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dios-gl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddirect3d=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dandroid-media-ndk=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Drpi=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddvbin=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibmpv=false
</span>
# mpv autodetects many support libs. To prevent undeclared
# dependencies, explicitly disable everything optional first.
# This list should be expanded each time the port is updated to a
# new version, disabling any newly added options.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --disable-caca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-cdda \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-clang-database \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-debug-build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dvdnav \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-egl-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gl-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gl-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-jack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-javascript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libarchive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libbluray \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-openal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-pdf-build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-pulse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-rubberband \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-tv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-uchardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-vapoursynth \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -Dcaca=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcdda=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpthread-debug=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddvdnav=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Degl-x11=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgl-cocoa=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvulkan=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgl-x11=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Djack=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Djavascript=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Djpeg=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibarchive=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibbluray=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlua=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dopenal=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpdf-build=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpulse=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Drubberband=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Duchardet=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapoursynth=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dx11=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dxv=disabled
</span>
# Fix picking up the correct talloc version.
# -isystem has the added benefit of moving the include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,8 +113,6 @@ configure.args-append --disable-caca \
</span> # directory.)
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append -v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Clear CPATH and LIBRARY_PATH because a ncurses include file
# conflicts with the one in MacPorts. It doesn't matter much anyway
# because the swift module in mpv doesn't have any dependencies to
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,8 +147,8 @@ platform macosx {
</span> if {${os.major} <= 14 || ${configure.build_arch} ni [list x86_64 arm64]} {
# Disable Cocoa output.
# Users on old systems will need to embrace X11.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --enable-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcocoa=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcocoa=disabled
</span>
default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,15 +175,15 @@ platform darwin {
</span> # in Xcode 9.1 onwards.
# From version 0.34.0 Swift 4.1 (Xcode 9.3+) or later is required
if {[vercmp ${xcodeversion} 9.3] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --enable-swift \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dswift-build=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dswift-build=disabled
</span> }
# VideotoolBox, a new hardware acceleration framework, is supported on 10.8+ and "here to stay".
# It provides support for H265, H264, H263, MPEG1, MPEG2 and MPEG4.
if {${os.major} > 14} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-videotoolbox-gl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-videotoolbox-gl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dvideotoolbox-gl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvideotoolbox-gl=enabled
</span> }
if {${os.major} > 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,7 +213,6 @@ platform darwin {
</span> # Shared build fixes for 10.6 and 10.7.
if {${os.major} < 12} {
patchfiles-append patch-misc-import-CoreVideo.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-waftools-detection-compiler-py-no-tautological.diff
</span> }
# Make mpv work as good as possible on 10.6 and below. No Cocoa support, instead concentrate
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,7 +220,6 @@ platform darwin {
</span> # Also fix some other minor compile issues only manifesting on 10.6 and below along the way.
if {${os.major} < 11} {
patchfiles-append patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-waftools_detections_compiler.py-support-older-GCC.diff
</span>
notes-append {
On systems older than Lion (10.7) or on architectures other than x86_64, Cocoa output support is not available.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -258,8 +233,8 @@ platform darwin {
</span>
# coreaudio does not build on < 10.6 so use pulseaudio instead (tested and works).
if {${os.major} < 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-coreaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-coreaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcoreaudio=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcoreaudio=disabled
</span>
default_variants-append +pulseaudio
notes-append {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,10 +287,10 @@ platform darwin {
</span> }
if {${os.major} < 11 || ${configure.build_arch} ni [list x86_64 arm64]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W "${worksrcpath}/TOOLS" "/@@VOGPU@@/d" config-maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "/@@VO@@/d" config-maintainer
</span> reinplace -W "${worksrcpath}/TOOLS" "s/@@BACKEND@@/x11/" config-maintainer
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W "${worksrcpath}/TOOLS" "s/@@VOGPU@@//" config-maintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W "${worksrcpath}/TOOLS" "s/@@VO@@//" config-maintainer
</span> reinplace -W "${worksrcpath}/TOOLS" "/@@BACKEND@@/d" config-maintainer
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -323,8 +298,8 @@ platform darwin {
</span>
# Shameless copy from ipe-tools.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.versions {38 39 310 311}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dict set python.legacy_versions 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python.versions {39 310 311 312}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dict set python.legacy_versions 38 39
</span> # After Python 3.9 is released, and mpv can be built with it,
# replace with the above lines with the following:
#set python.versions {27 39}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -387,12 +362,10 @@ if {${variant_none}} {
</span> }
# Set ${python.version} to the currently active variant.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# And let waf use the same python version as the currently active variant.
</span> foreach ver ${python.versions} {
if {[variant_isset python${ver}]} {
set python.version ${ver}
set python_branch [string index ${python.version} 0].[string range ${python.version} 1 end]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- waf.python_branch ${python_branch}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -401,13 +374,10 @@ if {[string length ${python.version}] == 0} {
</span> error "Select a python variant."
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
set python_ver_dot [string index ${python.version} 0].[string range ${python.version} 1 end]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W "${worksrcpath}" "s|'rst2man'|'rst2man-${python_ver_dot}'|" wscript
</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;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W "${distpath}" "${waf_distfile}" "${worksrcpath}/waf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|'rst2man.py'|'rst2man-${python_ver_dot}.py'|" ${worksrcpath}/meson.build
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,26 +403,15 @@ post-destroot {
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# When enabling features, make sure to replace the "disable" flags with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# "enable" flags in order to make the waf build system error out in case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# When enabling features, make sure to replace the "disabled" flags with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "enabled" flags in order to make the meson build system error out in case
</span> # a feature cannot be used/found. Problems like that indicate a missing
# runtime dependency.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant bundle description {Enable the optional macOS bundle of mpv} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W "${worksrcpath}" "${waf.python} TOOLS/osxbundle.py -s build/mpv"
</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;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/build/mpv.app ${destroot}${applications_dir}
</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;'>-
</span> variant screenshot description {Enable optional screenshot support} {
depends_lib-append path:include/turbojpeg.h:libjpeg-turbo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-jpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-jpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Djpeg=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Djpeg=enabled
</span> }
variant network conflicts ytdlp description {Enable networking support via youtube-dl (supports wide variety of pages)} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -467,7 +426,8 @@ variant bluray description {Enable Bluray and AACS/BD+ encryption support} {
</span> depends_lib-append port:libbluray
depends_run-append port:libaacs \
port:libbdplus
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-libbluray
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dlibbluray=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibbluray=enabled
</span> notes-append {
To play Bluray discs with AACS encryption, decryption key database file "keydb.cfg" needs to be placed at:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -480,45 +440,45 @@ variant bluray description {Enable Bluray and AACS/BD+ encryption support} {
</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-dvdnav \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-dvdnav
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Ddvdnav=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddvdnav=enabled
</span> }
variant audiocd description {Enable Audio CD support via libcdio-paranoia} {
depends_lib-append port:libcdio-paranoia
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-cdda \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-cdda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcdda=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcdda=enabled
</span> }
variant libarchive description {Enable transparent handling of Zip files and other compressed formats} {
depends_lib-append port:libarchive
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-libarchive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libarchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dlibarchive=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibarchive=enabled
</span> }
variant rubberband description {Enable support for the Rubber Band library, adding audio pitch and speed control} {
depends_lib-append port:rubberband
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-rubberband \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-rubberband
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Drubberband-disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Drubberband-enabled
</span> }
variant pulseaudio description {Enable PulseAudio support} {
depends_lib-append port:pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-pulse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-pulse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dpulse=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpulse=enabled
</span> }
variant jack description {Enable Jack Audio Connection Kit support} {
depends_lib-append port:jack
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-jack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-jack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Djack=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Djack=enabled
</span> }
# TODO: switch that to openal-soft? Leave it as-is?
variant openal description {Enable OpenAL support} {
depends_lib-append port:openal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-openal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-openal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dopenal=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dopenal=enabled
</span> }
variant x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,54 +489,68 @@ variant x11 {
</span> port:xorg-libXrandr \
port:xorg-libXpresent
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-xv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --Dx11=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --Dx11=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --Dxv=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --Dxv=enabled
</span> }
variant opengl description {Enable OpenGL output support. Both the CoreVideo and X11 (GLX) outputs are supported} {
if {${os.platform} eq "darwin" && ${os.major} > 14} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-gl-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-gl-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dgl-cocoa=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgl-cocoa=enabled
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-gl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-gl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dgl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgl=enabled
</span>
if {[variant_isset x11]} {
depends_lib-append port:mesa
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-gl-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-gl-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dgl-x11=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgl-x11=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libplacebo opengl
</span> # FIXME: add EGL? Leave it disabled? Test!
# As far as testing went, EGL is not available on macOS yet.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.args-replace --disable-egl-x11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # --enable-egl-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.args-replace -Degl-x11=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -Degl-x11=enabled
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant vulkan description {Enable Vulkan output support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vulkan-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:vulkan-loader
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvulkan=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvulkan=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libplacebo vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The following are needed as no .pc files are available from Vulkan ports above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|'vulkan', version: '>= 1.1.70'|'vulkan'|" ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir} "/usr/bin/install_name_tool -change @rpath/libvulkan.1.dylib ${prefix}/lib/libvulkan.1.dylib mpv"
</span> }
}
variant caca description {Enable animated ASCII art video output} {
depends_lib-append port:libcaca
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-caca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-caca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dcaca=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcaca=enabled
</span> }
variant osd description {Enable onscreen display and TrueType font support} {
depends_lib-append port:lua52
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --lua=52fbsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dlua=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlua=lua5.2
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant smb description {Enable Samba support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append path:lib/pkgconfig/smbclient.pc:samba3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-replace --disable-libsmbclient \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --enable-libsmbclient
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Removed in 0.33.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant debug description {Compile with debugging symbols} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-debug-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --buildtype=release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --buildtype=debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dpthread-debug=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpthread-debug=enabled
</span> }
variant printable_doc description {Generate printable documents (PDF help)} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -584,22 +558,34 @@ variant printable_doc description {Generate printable documents (PDF help)} {
</span> depends_build-append port:rst2pdf \
port:py27-pdfrw \
port:py27-Pillow
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-pdf-build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-pdf-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dpdf-build=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpdf-build=enabled
</span> }
#variant javascript description {Enable JavaScript support via mujs} {
# depends_lib-append port:mujs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-replace --disable-javascript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# --enable-javascript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-replace -Djavascript=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -Djavascript=enabled
</span> #}
variant uchardet description {Enable the uchardet encoding detector} {
depends_lib-append port:uchardet
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-uchardet \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-uchardet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Duchardet=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Duchardet=enabled
</span> }
variant libmpv description {Enable the libmpv library} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-libmpv-shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dlibmpv=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dlibmpv=true
</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;'>+variant bundle description {Enable the optional macOS bundle of mpv} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W "${worksrcpath}" "${prefix}/bin/python${python_branch} TOOLS/osxbundle.py -s ${build.dir}/mpv"
</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;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${build.dir}/mpv.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv/files/config-maintainer b/multimedia/mpv/files/config-maintainer
</span><span style='display:block; white-space:pre;color:#808080;'>index ce969f0aaf9..6c631f5e567 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv/files/config-maintainer
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv/files/config-maintainer
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span> [default]
gpu-context=@@BACKEND@@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@VOGPU@@vo=gpu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@VO@@vo=libmpv
</span> ao=coreaudio
sub-scale=3
</pre><pre style='margin:0'>
</pre>