Ticket #45302: mpv-0.6.0_v2.diff

ports/multimedia/mpv/Portfile

@@ -5 +5 @@
 PortGroup               github 1.0
 PortGroup               waf 1.0
 
-github.setup            mpv-player mpv 0.5.0 v
-revision                1
+github.setup            mpv-player mpv 0.6.0 v
+revision                0
 categories              multimedia
 license                 GPL-2+
 maintainers             ionic.de:ionic
@@ -21 +21 @@
                         and even H.264 movies.
 homepage                http://www.mpv.io/
 
-checksums               rmd160  f1d443d3c4999d1b1610f95fac43827a4cea8602 \
-                        sha256  9ca7ab6fdd533c5ec9aac2a4963a42220940b5bc6c1de940ff1d174f57460965
+checksums               rmd160  7730a45810e018029fb1f6a0525f112b8968362b \
+                        sha256  158ef6066c1270e66bcf865bb250c8c6e1d7a1ace1d30c9a193956b30ee650c4
 
 depends_build           path:bin/pkg-config:pkgconfig
 depends_lib             path:lib/libavcodec.dylib:ffmpeg \
@@ -54 +54 @@
                         --enable-libass \
                         --enable-coreaudio \
                         --enable-cocoa \
-                        --enable-corevideo \
                         --disable-vda-hwaccel \
                         --disable-vda-gl
 
@@ -85 +84 @@
                         --disable-xv \
                         --disable-gl-x11 \
                         --disable-xinerama \
-                        --disable-xf86vm \
-                        --disable-xf86xk \
                         --disable-caca \
                         --disable-jpeg \
                         --disable-tv \
@@ -189 +186 @@
     system -W "${worksrcpath}" "${waf.python} bootstrap.py"
 }
 
+post-build {
+    if {[variant_isset bundle_standalone]} {
+        system -W "${worksrcpath}" "TOOLS/osxbundle.py build/mpv"
+    }
+}
+
 post-destroot {
     xinstall -d -m 0755 ${destroot}${prefix}/etc/${name}
     foreach etcfile {encoding-profiles.conf example.conf input.conf} {
@@ -210 +213 @@
         xinstall -d -m 0755 ${destroot}${applications_dir}
         file rename ${destroot}${prefix}/bin/mpv.app ${destroot}${applications_dir}
     }
+
+    if {[variant_isset bundle_standalone]} {
+        xinstall -d -m 0755 ${destroot}${applications_dir}
+        file rename  ${worksrcpath}/build/mpv.app ${destroot}${applications_dir}
+    }
 }
 
 
@@ -222 +230 @@
 # libquvi, as mpv supports multiple versions and we don't want waf to
 # throw an error if some other version wasn't found.
 
-variant bundle description {Enable the optional Mac OS X bundle of mpv} {
+variant bundle conflicts bundle_standalone description {Enable the optional Mac OS X bundle of mpv} {
     configure.args-replace  --disable-macosx-bundle \
                             --enable-macosx-bundle
 }
 
+variant bundle_standalone conflicts bundle description {Enable the optional Mac OS X bundle of mpv (standalone version)} {
+}
+
 variant screenshot description {Enable optional screenshot support} {
     depends_lib-append      port:jpeg
     configure.args-replace  --disable-jpeg \