<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141222] trunk/dports/multimedia/mpv</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141222">141222</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-10-12 21:06:53 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpv: update to 0.11.0. Fixes: #49228.
Changes:
- update to 0.11.0 (obviously.)
- split up configuration file into config-maintainer-vda and
config-maintainer-vtb.
- add support for VTB.
- work around VTB bug by also enabling VDA on 10.11.
- updated patchset for 10.6:
* a few files were renamed, hence also the patches
* fix new incompatibilities
* refresh all patches that didn't apply cleanly</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvPortfile">trunk/dports/multimedia/mpv/Portfile</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchmiscimportCoreVideodiff">trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchosdep_macosx_compatmaddsubscriptingimplementationdiff">trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmdefineconstantsdiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmportlightsensordiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchwaftools_checks_custompydisablelibarclitediff">trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvfilesconfigmaintainervda">trunk/dports/multimedia/mpv/files/config-maintainer-vda</a></li>
<li><a href="#trunkdportsmultimediampvfilesconfigmaintainervtb">trunk/dports/multimedia/mpv/files/config-maintainer-vtb</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchaudio_out_ao_coreaudio_utilscaddmissingheaderforgetpiddiff">trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_decode_vdacdisableHAVE_VDA_DEFAULT_INIT2diff">trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_opengl_cocoachardcodeOpenGL2diff">trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_opengl_hwdec_vdacdisableNV12diff">trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvfilesconfigmaintainer">trunk/dports/multimedia/mpv/files/config-maintainer</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_gl_cocoachardcodeOpenGL2diff">trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediampvPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/Portfile (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/Portfile 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/Portfile 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> PortGroup waf 1.0
</span><span class="cx">
</span><span class="cx"> # Please revbump mpv whenever ffmpeg{,-devel} is updated!
</span><del>-github.setup mpv-player mpv 0.9.2 v
-revision 1
</del><ins>+github.setup mpv-player mpv 0.11.0 v
+revision 0
</ins><span class="cx"> categories multimedia
</span><span class="cx"> license GPL-2+
</span><span class="cx"> maintainers ionic
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> and even H.264 movies.
</span><span class="cx"> homepage http://www.mpv.io/
</span><span class="cx">
</span><del>-set waf_version 1.8.4
</del><ins>+set waf_version 1.8.12
</ins><span class="cx"> set waf_distfile waf-${waf_version}
</span><span class="cx"> set mpv_distfile ${distfiles}
</span><span class="cx"> master_sites-append http://ftp.waf.io/pub/release:waf
</span><span class="lines">@@ -31,11 +31,11 @@
</span><span class="cx"> extract.only-delete ${waf_distfile}
</span><span class="cx">
</span><span class="cx"> checksums ${mpv_distfile} \
</span><del>- rmd160 00f381bc678a7900dcd137507ac93373859a6232 \
- sha256 468b86fa56f4d286c227f04cb0fe0f83d0311d55481da671a32296355fe75c9c \
</del><ins>+ rmd160 47d625b899b7bbe3867845e9710fef14d41d5249 \
+ sha256 7d0598a0f5f5825143e2678f058d6305683c82ff36702235703e8d54048132fe \
</ins><span class="cx"> ${waf_distfile} \
</span><del>- rmd160 d58b790001664fe5f6a720e4ff9ce9f4105d195a \
- sha256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8
</del><ins>+ rmd160 bb1dcd10a0c336a5497bb1247a301c27f997078c \
+ sha256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b
</ins><span class="cx">
</span><span class="cx"> depends_build path:bin/pkg-config:pkgconfig
</span><span class="cx"> depends_lib path:lib/libavcodec.dylib:ffmpeg \
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-default_variants +bundle +network +osd +rubberband +opengl +dvd +audiocd
</del><ins>+default_variants +bundle +network +osd +rubberband +opengl +dvd +audiocd +libarchive
</ins><span class="cx">
</span><span class="cx"> # Current waf doesn't support --nocache anymore. Set by PortGroup.
</span><span class="cx"> configure.args-delete --nocache
</span><span class="lines">@@ -62,7 +62,9 @@
</span><span class="cx"> --enable-coreaudio \
</span><span class="cx"> --enable-cocoa \
</span><span class="cx"> --disable-vda-hwaccel \
</span><del>- --disable-vda-gl
</del><ins>+ --disable-videotoolbox-hwaccel \
+ --disable-vda-gl \
+ --disable-videotoolbox-gl
</ins><span class="cx">
</span><span class="cx"> # mpv autodetects many support libs. To prevent undeclared
</span><span class="cx"> # dependencies, explicitly disable everything optional first.
</span><span class="lines">@@ -79,6 +81,7 @@
</span><span class="cx"> --disable-cdda \
</span><span class="cx"> --disable-vapoursynth \
</span><span class="cx"> --disable-vapoursynth-lazy \
</span><ins>+ --disable-libarchive \
</ins><span class="cx"> --disable-enca \
</span><span class="cx"> --disable-rubberband \
</span><span class="cx"> --disable-pulse \
</span><span class="lines">@@ -142,6 +145,9 @@
</span><span class="cx"> --enable-apple-remote
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+set has_vda 0
+set has_vtb 0
+
</ins><span class="cx"> platform darwin {
</span><span class="cx"> notes-append [subst {
</span><span class="cx"> The maintainer ships his personal config file in
</span><span class="lines">@@ -153,17 +159,44 @@
</span><span class="cx"> and adjust it to your needs.
</span><span class="cx"> }]
</span><span class="cx">
</span><del>- # VDA (video hardware acceleration, mostly H264) is only supported on 10.6.3+
</del><ins>+ # 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
</ins><span class="cx"> if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
</span><ins>+ set has_vda 1
</ins><span class="cx"> configure.args-delete --disable-vda-hwaccel \
</span><span class="cx"> --disable-vda-gl
</span><span class="cx"> configure.args-append --enable-vda-hwaccel \
</span><span class="cx"> --enable-vda-gl
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ # 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} {
+ set has_vtb 1
+ configure.args-delete --disable-videotoolbox-hwaccel \
+ --disable-videotoolbox-gl
+ configure.args-append --enable-videotoolbox-hwaccel \
+ --enable-videotoolbox-gl
+ }
+
+ if {(${has_vtb}) || (${has_vda})} {
</ins><span class="cx"> notes-append {
</span><span class="cx"> This config file already defines the necessary video output settings to make \
</span><span class="cx"> use of the hardware acceleration features provided by your operating system.
</span><span class="cx"> }
</span><ins>+
+ 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.
+ }]
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> notes-append {
</span><span class="cx"> Sadly, your system is incapable of utilizing mpv's hardware decoding features.
</span><span class="lines">@@ -193,8 +226,11 @@
</span><span class="cx"> patch-video_out_cocoa_window.m-fullscreen-fixes.diff \
</span><span class="cx"> patch-video_out_cocoa_common.m-define-constants.diff \
</span><span class="cx"> patch-video_out_cocoa_common.m-port-lightsensor.diff \
</span><del>- patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff \
- patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
</del><ins>+ 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
</ins><span class="cx">
</span><span class="cx"> # Let's hope this is actually unneeded...
</span><span class="cx"> #patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff
</span><span class="lines">@@ -210,14 +246,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- xinstall -m 0644 -W "${filespath}" config-maintainer "${worksrcpath}/TOOLS/"
</del><ins>+ xinstall -m 0644 -W "${filespath}" config-maintainer-vda config-maintainer-vtb "${worksrcpath}/TOOLS/"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="cx"> if {[variant_isset network]} {
</span><del>- reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer
</del><ins>+ reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer-vda
+ reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer-vtb
</ins><span class="cx"> } else {
</span><del>- reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer
</del><ins>+ reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer-vda
+ reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer-vtb
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -285,8 +323,18 @@
</span><span class="cx"> ${destroot}${prefix}/share/examples/${name}
</span><span class="cx">
</span><span class="cx"> if {${os.platform} eq "darwin"} {
</span><del>- xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer \
- ${destroot}${prefix}/share/examples/${name}
</del><ins>+ if {(${has_vtb})} {
+ xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer-vtb \
+ ${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
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -342,6 +390,12 @@
</span><span class="cx"> --enable-cdda
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant libarchive description {Enable transparent handling of Zip files and other compressed formats} {
+ depends_lib-append port:libarchive
+ configure.args-replace --disable-libarchive \
+ --enable-libarchive
+}
+
</ins><span class="cx"> variant enca description {Enable encoding support via ENCA} {
</span><span class="cx"> depends_lib-append port:enca
</span><span class="cx"> configure.args-replace --disable-enca \
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilesconfigmaintainer"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/config-maintainer (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/config-maintainer 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/files/config-maintainer 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-# Write your default config options here!
-[default]
-
-vo=opengl-hq:backend=cocoa
-ao=coreaudio
-
-sub-scale=3
-
-af=scaletempo
-
-softvol=yes
-softvol-max=800
-
-framedrop=vo
-
-hwdec=vda
-
-#alang=en,eng,de,ger
-
-cache=50700
-
-@@NETWORK@@ytdl
-@@NETWORK@@ytdl-format=best
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilesconfigmaintainervdafromrev141221trunkdportsmultimediampvfilesconfigmaintainer"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/mpv/files/config-maintainer-vda (from rev 141221, trunk/dports/multimedia/mpv/files/config-maintainer) (0 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/config-maintainer-vda (rev 0)
+++ trunk/dports/multimedia/mpv/files/config-maintainer-vda 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+# Write your default config options here!
+[default]
+
+vo=opengl-hq:backend=cocoa
+ao=coreaudio
+
+sub-scale=3
+
+af=scaletempo
+
+softvol=yes
+softvol-max=800
+
+framedrop=vo
+
+hwdec=vda
+
+#alang=en,eng,de,ger
+
+cache=50700
+
+@@NETWORK@@ytdl
+@@NETWORK@@ytdl-format=best
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilesconfigmaintainervtbfromrev141221trunkdportsmultimediampvfilesconfigmaintainer"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/mpv/files/config-maintainer-vtb (from rev 141221, trunk/dports/multimedia/mpv/files/config-maintainer) (0 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/config-maintainer-vtb (rev 0)
+++ trunk/dports/multimedia/mpv/files/config-maintainer-vtb 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+# Write your default config options here!
+[default]
+
+vo=opengl-hq:backend=cocoa
+ao=coreaudio
+
+sub-scale=3
+
+af=scaletempo
+
+softvol=yes
+softvol-max=800
+
+framedrop=vo
+
+hwdec=videotoolbox
+
+#alang=en,eng,de,ger
+
+cache=50700
+
+@@NETWORK@@ytdl
+@@NETWORK@@ytdl-format=best
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchaudio_out_ao_coreaudio_utilscaddmissingheaderforgetpiddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff (0 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- audio/out/ao_coreaudio_utils.c.orig
++++ audio/out/ao_coreaudio_utils.c
+@@ -23,6 +23,7 @@
+ */
+
+ #include <CoreAudio/HostTime.h>
++#include <unistd.h>
+
+ #include "audio/out/ao_coreaudio_utils.h"
+ #include "audio/out/ao_coreaudio_properties.h"
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchmiscimportCoreVideodiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> --- video/out/cocoa_common.m.orig
</span><span class="cx"> +++ video/out/cocoa_common.m
</span><span class="cx"> @@ -22,6 +22,7 @@
</span><del>- #import <IOKit/pwr_mgt/IOPMLib.h>
</del><span class="cx"> #import <IOKit/IOKitLib.h>
</span><ins>+ #import <AppKit/AppKit.h>
</ins><span class="cx"> #include <mach/mach.h>
</span><span class="cx"> +#import <CoreVideo/CoreVideo.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchosdep_macosx_compatmaddsubscriptingimplementationdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> +#endif
</span><span class="cx"> --- wscript_build.py.orig
</span><span class="cx"> +++ wscript_build.py
</span><del>-@@ -378,6 +378,7 @@ def build(ctx):
</del><ins>+@@ -364,6 +364,7 @@ def build(ctx):
</ins><span class="cx"> ( "osdep/ar/HIDRemote.m", "apple-remote" ),
</span><span class="cx"> ( "osdep/macosx_application.m", "cocoa" ),
</span><span class="cx"> ( "osdep/macosx_events.m", "cocoa" ),
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_decode_vdacdisableHAVE_VDA_DEFAULT_INIT2diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff (0 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+--- video/decode/vda.c.orig
++++ video/decode/vda.c
+@@ -19,6 +19,7 @@
+
+ #include <libavcodec/version.h>
+ #include <libavcodec/vda.h>
++#include <AvailabilityMacros.h>
+
+ #include "common/av_common.h"
+ #include "common/msg.h"
+@@ -76,6 +77,7 @@ static void print_vda_error(struct mp_lo
+ static int init_decoder(struct lavc_ctx *ctx, int w, int h)
+ {
+ av_vda_default_free(ctx->avctx);
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ #if HAVE_VDA_DEFAULT_INIT2
+ AVVDAContext *vdactx = av_vda_alloc_context();
+ vdactx->cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+@@ -83,6 +85,9 @@ static int init_decoder(struct lavc_ctx
+ #else
+ int err = av_vda_default_init(ctx->avctx);
+ #endif
++#else
++ int err = av_vda_default_init(ctx->avctx);
++#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 */
+
+ if (err < 0) {
+ print_vda_error(ctx->log, MSGL_ERR, "failed to init VDA decoder", err);
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmdefineconstantsdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -1,17 +1,14 @@
</span><span class="cx"> --- video/out/cocoa_common.m.orig
</span><span class="cx"> +++ video/out/cocoa_common.m
</span><del>-@@ -52,6 +52,14 @@
- #define cocoa_lock(s) pthread_mutex_lock(&s->mutex)
- #define cocoa_unlock(s) pthread_mutex_unlock(&s->mutex)
</del><ins>+@@ -50,6 +50,11 @@
</ins><span class="cx">
</span><ins>+ #include "common/msg.h"
+
</ins><span class="cx"> +/* not used on OS X < 10.8 */
</span><span class="cx"> +#if !defined(MAC_OS_X_VERSION_10_8) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
</span><span class="cx"> +#define kIOPMAssertionTypePreventUserIdleDisplaySleep CFSTR("PreventUserIdleDisplaySleep")
</span><del>-+enum {
-+ NSWindowCollectionBehaviorFullScreenPrimary = 0,
-+};
</del><span class="cx"> +#endif
</span><span class="cx"> +
</span><del>- static void vo_cocoa_fullscreen(struct vo *vo);
</del><ins>+ static int vo_cocoa_fullscreen(struct vo *vo);
</ins><span class="cx"> static void cocoa_rm_fs_screen_profile_observer(struct vo_cocoa_state *s);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmportlightsensordiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -1,15 +1,23 @@
</span><span class="cx"> --- video/out/cocoa_common.m.orig
</span><span class="cx"> +++ video/out/cocoa_common.m
</span><del>-@@ -87,6 +87,7 @@ struct vo_cocoa_state {
</del><ins>+@@ -23,6 +23,7 @@
+ #import <AppKit/AppKit.h>
+ #include <mach/mach.h>
+ #import <CoreVideo/CoreVideo.h>
++#import <AvailabilityMacros.h>
+
+ #import "cocoa_common.h"
+ #import "video/out/cocoa/window.h"
+@@ -85,6 +86,7 @@ struct vo_cocoa_state {
</ins><span class="cx"> uint64_t last_lmuvalue;
</span><span class="cx"> int last_lux;
</span><span class="cx"> IONotificationPortRef light_sensor_io_port;
</span><span class="cx"> + CFRunLoopSourceRef light_sensor_notify_rl_source;
</span><span class="cx">
</span><del>- pthread_mutex_t mutex;
</del><span class="cx"> struct mp_log *log;
</span><del>-@@ -220,8 +221,18 @@ static void cocoa_init_light_sensor(stru
</del><span class="cx">
</span><ins>+@@ -226,8 +228,18 @@ static void cocoa_init_light_sensor(stru
+
</ins><span class="cx"> // subscribe to notifications from the light sensor driver
</span><span class="cx"> s->light_sensor_io_port = IONotificationPortCreate(kIOMasterPortDefault);
</span><span class="cx"> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span class="lines">@@ -27,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> io_object_t n;
</span><span class="cx"> IOServiceAddInterestNotification(
</span><del>-@@ -243,6 +254,11 @@ static void cocoa_init_light_sensor(stru
</del><ins>+@@ -249,6 +261,11 @@ static void cocoa_init_light_sensor(stru
</ins><span class="cx"> static void cocoa_uninit_light_sensor(struct vo_cocoa_state *s)
</span><span class="cx"> {
</span><span class="cx"> if (s->light_sensor_io_port) {
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_gl_cocoachardcodeOpenGL2diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -1,138 +0,0 @@
</span><del>-Only in mpv-0.8.2/video/out: .gl_common.c.swp
-Only in mpv-0.8.2/video/out: .gl_utils.c.swp
---- video/out/gl_cocoa.c.orig
-+++ video/out/gl_cocoa.c
-@@ -61,12 +61,17 @@ static void *cocoa_glgetaddr(const char
-
- static CGLError test_gl_version(struct vo *vo,
- CGLContextObj *ctx,
-- CGLPixelFormatObj *pix,
-- CGLOpenGLProfile version)
-+ CGLPixelFormatObj *pix
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-+ , CGLOpenGLProfile version
-+#endif
-+ )
- {
- CGLPixelFormatAttribute attrs[] = {
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- kCGLPFAOpenGLProfile,
- (CGLPixelFormatAttribute) version,
-+#endif
- kCGLPFADoubleBuffer,
- kCGLPFAAccelerated,
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
-@@ -104,16 +109,22 @@ static bool create_gl_context(struct MPG
- struct cgl_context *p = ctx->priv;
- CGLError err;
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- CGLOpenGLProfile gl_versions[] = {
- kCGLOGLPVersion_3_2_Core,
- kCGLOGLPVersion_Legacy,
- };
-+#endif
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- for (int n = 0; n < MP_ARRAY_SIZE(gl_versions); n++) {
- err = test_gl_version(ctx->vo, &p->ctx, &p->pix, gl_versions[n]);
- if (err == kCGLNoError)
- break;
- }
-+#else
-+ err = test_gl_version(ctx->vo, &p->ctx, &p->pix);
-+#endif
-
- if (err != kCGLNoError) {
- MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
---- video/out/gl_common.c.orig
-+++ video/out/gl_common.c
-@@ -372,6 +372,7 @@ void mpgl_load_functions2(GL *gl, void *
- // and above.
-
- bool has_legacy = false;
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- if (gl->version >= 300) {
- gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
- gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
-@@ -392,12 +393,15 @@ void mpgl_load_functions2(GL *gl, void *
- // includes legacy (except with CONTEXT_FORWARD_COMPATIBLE_BIT_ARB).
- if (gl->version == 300)
- has_legacy = true;
-- } else {
-+ } else
-+#else
-+ {
- const char *ext = (char*)gl->GetString(GL_EXTENSIONS);
- gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
-
- has_legacy = true;
- }
-+#endif
-
- if (gl->es)
- has_legacy = false;
---- video/out/gl_common.h.orig
-+++ video/out/gl_common.h
-@@ -39,7 +39,6 @@
- #if HAVE_GL_COCOA
- #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
- #include <OpenGL/gl.h>
--#include <OpenGL/gl3.h>
- #include <OpenGL/glext.h>
- #else
- #include <GL/gl.h>
---- video/out/gl_utils.c.orig
-+++ video/out/gl_utils.c
-@@ -84,14 +84,20 @@ int glFmt2bpp(GLenum format, GLenum type
- return 2;
- case GL_RGB:
- case GL_BGR:
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- case GL_RGB_INTEGER:
-+#endif
- return 3 * component_size;
- case GL_RGBA:
- case GL_BGRA:
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- case GL_RGBA_INTEGER:
-+#endif
- return 4 * component_size;
- case GL_RED:
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- case GL_RED_INTEGER:
-+#endif
- return component_size;
- case GL_RG:
- case GL_LUMINANCE_ALPHA:
---- video/out/gl_video.c.orig
-+++ video/out/gl_video.c
-@@ -277,10 +277,10 @@ static const struct fmt_entry gl_byte_fo
- };
-
- static const struct fmt_entry gl_float16_formats[] = {
-- {0, GL_R16F, GL_RED, GL_FLOAT}, // 1 x f
-- {0, GL_RG16F, GL_RG, GL_FLOAT}, // 2 x f
-- {0, GL_RGB16F, GL_RGB, GL_FLOAT}, // 3 x f
-- {0, GL_RGBA16F, GL_RGBA, GL_FLOAT}, // 4 x f
-+ {0, 0, GL_RED, GL_FLOAT}, // 1 x f
-+ {0, 0, GL_RG, GL_FLOAT}, // 2 x f
-+ {0, 0, GL_RGB, GL_FLOAT}, // 3 x f
-+ {0, 0, GL_RGBA, GL_FLOAT}, // 4 x f
- };
-
- static const struct fmt_entry gl_apple_formats[] = {
-@@ -416,12 +416,8 @@ const struct m_sub_options gl_video_conf
- {"rgb10", GL_RGB10},
- {"rgb10_a2", GL_RGB10_A2},
- {"rgb16", GL_RGB16},
-- {"rgb16f", GL_RGB16F},
-- {"rgb32f", GL_RGB32F},
- {"rgba12", GL_RGBA12},
-- {"rgba16", GL_RGBA16},
-- {"rgba16f", GL_RGBA16F},
-- {"rgba32f", GL_RGBA32F})),
-+ {"rgba16", GL_RGBA16})),
- OPT_CHOICE_OR_INT("dither-depth", dither_depth, 0, -1, 16,
- ({"no", -1}, {"auto", 0})),
- OPT_CHOICE("dither", dither_algo, 0,
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_opengl_cocoachardcodeOpenGL2difffromrev141221trunkdportsmultimediampvfilespatchvideo_out_gl_cocoachardcodeOpenGL2diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff (from rev 141221, trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff) (0 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -0,0 +1,138 @@
</span><ins>+--- video/out/opengl/cocoa.c.orig
++++ video/out/opengl/cocoa.c
+@@ -61,12 +61,17 @@ static void *cocoa_glgetaddr(const char
+
+ static CGLError test_gl_version(struct vo *vo,
+ CGLContextObj *ctx,
+- CGLPixelFormatObj *pix,
+- CGLOpenGLProfile version)
++ CGLPixelFormatObj *pix
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++ , CGLOpenGLProfile version
++#endif
++ )
+ {
+ CGLPixelFormatAttribute attrs[] = {
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ kCGLPFAOpenGLProfile,
+ (CGLPixelFormatAttribute) version,
++#endif
+ kCGLPFADoubleBuffer,
+ kCGLPFAAccelerated,
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
+@@ -104,16 +109,22 @@ static bool create_gl_context(struct MPG
+ struct cgl_context *p = ctx->priv;
+ CGLError err;
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ CGLOpenGLProfile gl_versions[] = {
+ kCGLOGLPVersion_3_2_Core,
+ kCGLOGLPVersion_Legacy,
+ };
++#endif
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ for (int n = 0; n < MP_ARRAY_SIZE(gl_versions); n++) {
+ err = test_gl_version(ctx->vo, &p->ctx, &p->pix, gl_versions[n]);
+ if (err == kCGLNoError)
+ break;
+ }
++#else
++ err = test_gl_version(ctx->vo, &p->ctx, &p->pix);
++#endif
+
+ if (err != kCGLNoError) {
+ MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
+--- video/out/opengl/common.c.orig
++++ video/out/opengl/common.c
+@@ -356,6 +356,7 @@ void mpgl_load_functions2(GL *gl, void *
+ if (shader)
+ mp_verbose(log, "GL_SHADING_LANGUAGE_VERSION='%s'\n", shader);
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ if (gl->version >= 300) {
+ gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
+ gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
+@@ -370,7 +371,9 @@ void mpgl_load_functions2(GL *gl, void *
+ gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
+ }
+
+- } else {
++ } else
++#endif
++ {
+ const char *ext = (char*)gl->GetString(GL_EXTENSIONS);
+ gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
+ }
+--- video/out/opengl/common.h.orig
++++ video/out/opengl/common.h
+@@ -39,7 +39,6 @@
+ #if HAVE_GL_COCOA
+ #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
+ #include <OpenGL/gl.h>
+-#include <OpenGL/gl3.h>
+ #include <OpenGL/glext.h>
+ #else
+ #include <GL/gl.h>
+--- video/out/opengl/utils.c.orig
++++ video/out/opengl/utils.c
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <AvailabilityMacros.h>
+
+ #include "stream/stream.h"
+ #include "common/common.h"
+@@ -85,14 +86,20 @@ int glFmt2bpp(GLenum format, GLenum type
+ return 2;
+ case GL_RGB:
+ case GL_BGR:
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RGB_INTEGER:
++#endif
+ return 3 * component_size;
+ case GL_RGBA:
+ case GL_BGRA:
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RGBA_INTEGER:
++#endif
+ return 4 * component_size;
+ case GL_RED:
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RED_INTEGER:
++#endif
+ return component_size;
+ case GL_RG:
+ case GL_LUMINANCE_ALPHA:
+--- video/out/opengl/video.c.orig
++++ video/out/opengl/video.c
+@@ -264,10 +264,10 @@ static const struct fmt_entry gl_byte_fo
+ };
+
+ static const struct fmt_entry gl_float16_formats[] = {
+- {0, GL_R16F, GL_RED, GL_FLOAT}, // 1 x f
+- {0, GL_RG16F, GL_RG, GL_FLOAT}, // 2 x f
+- {0, GL_RGB16F, GL_RGB, GL_FLOAT}, // 3 x f
+- {0, GL_RGBA16F, GL_RGBA, GL_FLOAT}, // 4 x f
++ {0, 0, GL_RED, GL_FLOAT}, // 1 x f
++ {0, 0, GL_RG, GL_FLOAT}, // 2 x f
++ {0, 0, GL_RGB, GL_FLOAT}, // 3 x f
++ {0, 0, GL_RGBA, GL_FLOAT}, // 4 x f
+ };
+
+ static const struct fmt_entry gl_apple_formats[] = {
+@@ -389,12 +389,8 @@ const struct m_sub_options gl_video_conf
+ {"rgb10", GL_RGB10},
+ {"rgb10_a2", GL_RGB10_A2},
+ {"rgb16", GL_RGB16},
+- {"rgb16f", GL_RGB16F},
+- {"rgb32f", GL_RGB32F},
+ {"rgba12", GL_RGBA12},
+- {"rgba16", GL_RGBA16},
+- {"rgba16f", GL_RGBA16F},
+- {"rgba32f", GL_RGBA32F})),
++ {"rgba16", GL_RGBA16})),
+ OPT_CHOICE_OR_INT("dither-depth", dither_depth, 0, -1, 16,
+ ({"no", -1}, {"auto", 0})),
+ OPT_CHOICE("dither", dither_algo, 0,
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_opengl_hwdec_vdacdisableNV12diff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff (0 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+--- video/out/opengl/hwdec_vda.c.orig
++++ video/out/opengl/hwdec_vda.c
+@@ -23,6 +23,7 @@
+ #include <CoreVideo/CoreVideo.h>
+ #include <OpenGL/OpenGL.h>
+ #include <OpenGL/CGLIOSurface.h>
++#include <AvailabilityMacros.h>
+
+ #include "video/mp_image_pool.h"
+ #include "hwdec.h"
+@@ -54,7 +55,9 @@ static struct vda_format vda_formats[] =
+ .gl = {
+ { GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, GL_RGB }
+ }
+- }, {
++ }
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++ , {
+ .cvpixfmt = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
+ .imgfmt = IMGFMT_NV12,
+ .planes = 2,
+@@ -63,6 +66,7 @@ static struct vda_format vda_formats[] =
+ { GL_RG, GL_UNSIGNED_BYTE, GL_RG } ,
+ }
+ }
++#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 */
+ };
+
+ static struct vda_format *vda_get_gl_format(uint32_t cvpixfmt)
+@@ -159,11 +163,15 @@ static int create_common(struct gl_hwdec
+ static int create(struct gl_hwdec *hw)
+ {
+ // For videotoolbox, we always request NV12.
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ #if HAVE_VDA_DEFAULT_INIT2
+ struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_NV12);
+ #else
+ struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_UYVY);
+ #endif
++#else
++ struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_UYVY);
++#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 */
+ if (create_common(hw, f))
+ return -1;
+
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchwaftools_checks_custompydisablelibarclitediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff (141221 => 141222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2015-10-13 03:20:09 UTC (rev 141221)
+++ trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2015-10-13 04:06:53 UTC (rev 141222)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- waftools/checks/custom.py.orig
</span><span class="cx"> +++ waftools/checks/custom.py
</span><del>-@@ -108,7 +108,6 @@ def check_cocoa(ctx, dependency_identifi
</del><ins>+@@ -107,7 +107,6 @@ def check_cocoa(ctx, dependency_identifi
</ins><span class="cx"> fragment = load_fragment('cocoa.m'),
</span><span class="cx"> compile_filename = 'test.m',
</span><span class="cx"> framework_name = ['Cocoa', 'IOKit', 'OpenGL', 'QuartzCore'],
</span></span></pre>
</div>
</div>
</body>
</html>