<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d833b9606eb3623ce9f635e8d0259687b8fdb7f4">https://github.com/macports/macports-ports/commit/d833b9606eb3623ce9f635e8d0259687b8fdb7f4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d833b9606eb3623ce9f635e8d0259687b8fdb7f4
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Jun 8 10:04:54 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> mpv-legacy: misc improvements
</span>---
multimedia/mpv-legacy/Portfile | 73 ++++++++++++++++++++++++++++--------------
1 file changed, 49 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpv-legacy/Portfile b/multimedia/mpv-legacy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45f364cabd8..d562cdc3233 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpv-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpv-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup waf 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span> PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup waf 1.0
</span>
# Please revbump mpv whenever ffmpeg{,-devel} is updated!
name mpv-legacy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,28 +44,35 @@ checksums ${mpv_distfile} \
</span>
installs_libs no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set real_name mpv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append path:bin/pkg-config:pkgconfig
configure.pkg_config_path-prepend \
${prefix}/libexec/ffmpeg6/lib/pkgconfig
depends_lib-append port:ffmpeg6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/perl:perl5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span> path:lib/pkgconfig/libass.pc:libass \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lcms2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/perl:perl5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zimg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
# Build system is a bit handicapped and cannot link correctly otherwise:
conflicts_build ffmpeg ffmpeg-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# mpv(18616,0xf0185000) malloc: *** error for object 0xe26e600:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# incorrect checksum for freed object - object was probably modified after being freed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.redirect_bins ${real_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> universal_variant no
# network is removed from defaults due to a build conflict with ffmpeg4.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +osd +opengl +bluray +dvd +audiocd +libarchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +audiocd +bluray +dvd +libarchive +osd +opengl +sdl2
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +rubberband
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +rubberband
</span>
if {${os.major} > 9} {
default_variants-append +coreaudio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +96,7 @@ configure.args-append --enable-cocoa \
</span> --enable-cplugins \
--enable-manpage-build \
--enable-swift \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-zimg \
</span> --enable-zlib \
--disable-android \
--disable-audiounit \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,6 +110,7 @@ configure.args-append --enable-cocoa \
</span> --disable-html-build \
--disable-ios-gl \
--disable-opensles \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-plain-gl \
</span> --disable-rpi \
--disable-videotoolbox-gl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,6 +132,7 @@ configure.args-append --disable-caca \
</span> --disable-jpeg \
--disable-libarchive \
--disable-libbluray \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libplacebo \
</span> --disable-lua \
--disable-openal \
--disable-pdf-build \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,17 +200,17 @@ platform macosx {
</span> platform darwin {
notes-append [subst {
The maintainer ships his personal config file in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * ${prefix}/share/doc/${name}/examples/config-maintainer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ${prefix}/share/doc/${real_name}/examples/config-maintainer.
</span>
You are strongly encouraged to copy this file to either
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * ${prefix}/etc/${name}/${name}.conf (globally for all users of the system) or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * ~/.config/${name}/config (only for your current user)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ${prefix}/etc/${real_name}/${real_name}.conf (globally for all users of the system) or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ~/.config/${real_name}/config (only for your current user)
</span> and adjust it to your needs.
If you previously had your configuration file in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * ~/.${name}/config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ~/.${real_name}/config
</span> please migrate it to
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * ~/.config/${name}/config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * ~/.config/${real_name}/config
</span> which is the location preferred by upstream.
}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -408,24 +419,23 @@ post-destroot {
</span> # to not overwrite this file on each (re-)build.
file rename ${worksrcpath}/etc/mpv.conf ${worksrcpath}/etc/mpv.conf.example
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/etc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/etc/${real_name}
</span> foreach etcfile {encoding-profiles.conf mpv.conf.example input.conf} {
xinstall -m 0644 ${worksrcpath}/etc/${etcfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/${name}/${etcfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/${real_name}/${etcfile}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${real_name}/examples
</span> copy {*}[glob ${worksrcpath}/TOOLS/lua ${worksrcpath}/TOOLS/*.pl \
${worksrcpath}/TOOLS/*.sh ${worksrcpath}/TOOLS/*.py \
${worksrcpath}/TOOLS/umpv ${worksrcpath}/TOOLS/lib] \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${real_name}/examples
</span>
if {${os.platform} eq "darwin"} {
xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${real_name}/examples
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # When enabling features, make sure to replace the "disable" flags with
# "enable" flags in order to make the waf build system error out in case
# a feature cannot be used/found. Problems like that indicate a missing
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,11 +531,11 @@ variant openal description {Enable OpenAL support} {
</span>
variant x11 {
depends_lib-append port:xorg-libXext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXScrnSaver \
</span> port:xorg-libXinerama \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXpresent \
</span> port:xorg-libXrandr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXpresent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXScrnSaver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXv
</span>
configure.args-delete --disable-x11 \
--disable-xv
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -539,8 +549,8 @@ variant opengl description {Enable OpenGL output support. Both the CoreVideo and
</span> --enable-gl-cocoa
}
<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 --disable-gl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-gl
</span>
if {[variant_isset x11]} {
depends_lib-append port:mesa
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -553,6 +563,14 @@ variant opengl description {Enable OpenGL output support. Both the CoreVideo and
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sdl2 description {Enable SDL2 output} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-sdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sdl2-audio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sdl2-video
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant caca description {Enable animated ASCII art video output} {
depends_lib-append port:libcaca
configure.args-replace --disable-caca \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,3 +619,10 @@ variant uchardet description {Enable the uchardet encoding detector} {
</span> variant libmpv description {Enable the libmpv library} {
configure.args-append --enable-libmpv-shared
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset bundle]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:desktop-file-utils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</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>