Ticket #50660: Portfile.diff

Portfile

@@ -6 +6 @@
 PortGroup               waf 1.0
 
 # Please revbump mpv whenever ffmpeg{,-devel} is updated!
-github.setup            mpv-player mpv 0.11.0 v
+github.setup            mpv-player mpv 0.15.0 v
 revision                2
 categories              multimedia
 license                 GPL-2+
@@ -31 +31 @@
 extract.only-delete     ${waf_distfile}
 
 checksums               ${mpv_distfile} \
-                        rmd160  47d625b899b7bbe3867845e9710fef14d41d5249 \
-                        sha256  7d0598a0f5f5825143e2678f058d6305683c82ff36702235703e8d54048132fe \
+                        rmd160  78569931a3bf6bfe18154da8eaf9f3623d543957 \
+                        sha256  c2011c9c9a9e22cf84d16dcb5f23572bbbcf414b51955b5e095af274e51351c1 \
                         ${waf_distfile} \
                         rmd160  bb1dcd10a0c336a5497bb1247a301c27f997078c \
                         sha256  01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b
@@ -61 +61 @@
                         --enable-libass \
                         --enable-coreaudio \
                         --enable-cocoa \
-                        --disable-vda-hwaccel \
                         --disable-videotoolbox-hwaccel \
-                        --disable-vda-gl \
                         --disable-videotoolbox-gl
 
 # mpv autodetects many support libs. To prevent undeclared
@@ -100 +98 @@
                         --disable-jpeg \
                         --disable-tv \
                         --disable-lua \
-                        --disable-apple-remote
+                        --disable-apple-remote \
+                        --disable-libmpv-shared
 
 # Fix picking up the correct talloc version.
 # -isystem has the added benefit of moving the include
@@ -145 +144 @@
                             --enable-apple-remote
 }
 
-set has_vda 0
 set has_vtb 0
 
 platform darwin {
@@ -159 +157 @@
                     and adjust it to your needs.
     }]
 
-    # Note: VDA support has already been removed on master. The next update will probably not include it anymore.
-
-    # VDA (video hardware acceleration, mostly H264) is only supported on 10.6.3+ up to (excluding) 10.11.
-    #if {(${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)) && (${os.major} < 15)}
-    # Due to a bug in ffmpeg(?), we have to enable VDA on 10.11 as well, even though it shouldn't be supported.
-    # More information: https://github.com/mpv-player/mpv/issues/2299
-    if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
-        set has_vda 1
-        configure.args-delete   --disable-vda-hwaccel \
-                                --disable-vda-gl
-        configure.args-append   --enable-vda-hwaccel \
-                                --enable-vda-gl
-    }
-
     # VideotoolBox, a new hardware acceleration framework, is supported on 10.8+ and "here to stay".
     # It provides support for H264, H263, MPEG1, MPEG2 and MPEG4.
     if {${os.major} > 11} {
@@ -183 +167 @@
                                 --enable-videotoolbox-gl
     }
 
-    if {(${has_vtb}) || (${has_vda})} {
+    if {${has_vtb}} {
         notes-append {
                         This config file already defines the necessary video output settings to make \
                         use of the hardware acceleration features provided by your operating system.
         }
-
-        if {(${has_vtb}) && (${has_vda})} {
-            notes-append [subst {
-                            While the default configuration file makes use of the newer and preferred \
-                            VideoToolBox framework, a separate config file set up for the old VDA \
-                            framework has been installed as
-                            * ${prefix}/share/examples/${name}/config-maintainer-vda.
-            }]
-        }
     } else {
         notes-append {
                         Sadly, your system is incapable of utilizing mpv's hardware decoding features.
@@ -229 +204 @@
                             patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff \
                             patch-osdep_macosx_compat.m-add-subscripting-implementation.diff \
                             patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff \
-                            patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff \
-                            patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff
-
                             # Let's hope this is actually unneeded...
                             #patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff
 
@@ -246 +218 @@
     }
 
     post-extract {
-        xinstall -m 0644 -W "${filespath}" config-maintainer-vda config-maintainer-vtb "${worksrcpath}/TOOLS/"
+        xinstall -m 0644 -W "${filespath}" config-maintainer "${worksrcpath}/TOOLS/"
     }
 
     pre-configure {
         if {[variant_isset network]} {
-            reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer-vda
-            reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer-vtb
+            reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer
         } else {
-            reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer-vda
-            reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer-vtb
+            reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer
         }
     }
 }
@@ -312 +282 @@
 
 post-destroot {
     xinstall -d -m 0755 ${destroot}${prefix}/etc/${name}
-    foreach etcfile {encoding-profiles.conf example.conf input.conf} {
+    foreach etcfile {encoding-profiles.conf mpv.conf input.conf} {
         xinstall -m 0644 ${worksrcpath}/etc/${etcfile} \
             ${destroot}${prefix}/etc/${name}/${etcfile}
     }
@@ -324 +294 @@
 
     if {${os.platform} eq "darwin"} {
         if {(${has_vtb})} {
-            xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer-vtb \
+            xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer \
                              ${destroot}${prefix}/share/examples/${name}/config-maintainer
 
-            if {(${has_vda})} {
-                xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer-vda \
-                                 ${destroot}${prefix}/share/examples/${name}/
-            }
-        } else {
-            xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer-vda \
-                             ${destroot}${prefix}/share/examples/${name}/config-maintainer
         }
     }
 }
@@ -496 +459 @@
     configure.args-replace  --disable-pdf-build \
                             --enable-pdf-build
 }
+
+variant api description {Enable C API} {
+    configure.args-replace  --disable-libmpv-shared \
+                            --enable-libmpv-shared
+}