<!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>[133614] trunk</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/133614">133614</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-03-06 15:20:49 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpv: update to 0.8.2. Adapt 10.6 patchset.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvPortfile">trunk/dports/multimedia/mpv/Portfile</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_events_viewhremoveNSDraggingDestinationprotocoldiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewmreplaceconvertPointToBackingwithuserSpaceScaleFactordiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewmreplaceconvertRectFromScreenwithconvertScreenToBasediff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_video_viewmreplaceconvertRectToBackingwithuserSpaceScaleFactordiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff</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>
<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>trunk/multimedia/</li>
<li>trunk/multimedia/mpv/</li>
<li>trunk/multimedia/mpv/files/</li>
<li><a href="#trunkmultimediampvfilespatchmiscimportCoreVideodiff">trunk/multimedia/mpv/files/patch-misc-import-CoreVideo.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvfilespatchTOOLS_osxbundlepyreplacesedcalldiff">trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchaudio_out_ao_coreaudio_deviceccompilefixdiff">trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_device.c-compile-fix.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmusedeprecatedColorSyncfunctionsdiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_gl_commonhuseOpenGLlegacydiff">trunk/dports/multimedia/mpv/files/patch-video_out_gl_common.h-use-OpenGL-legacy.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 (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/Portfile 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/Portfile 2015-03-06 23:20:49 UTC (rev 133614)
</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.7.1 v
-revision 2
</del><ins>+github.setup mpv-player mpv 0.8.2 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.1
</del><ins>+set waf_version 1.8.4
</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 0c34377f400bdb05536666866418442c32792866 \
- sha256 e7aa04852944eae4ebe0c38da83093e757f04741b98b3dd2cc4c2cdd3cea3e91 \
</del><ins>+ rmd160 bb747edd8badb1904d2873b9269dcbedb1e2473d \
+ sha256 ed758577aff6c18fcd087b0281d263729a3e32af2f8f45eca32b1de6d8a41ffc \
</ins><span class="cx"> ${waf_distfile} \
</span><del>- rmd160 d74bf5e8b2399098aef8e9bf57fb800a473be6a1 \
- sha256 ec658116ba0b96629d91fde0b32321849e866e0819f1e835c4c2c7f7ffe1a21d
</del><ins>+ rmd160 d58b790001664fe5f6a720e4ff9ce9f4105d195a \
+ sha256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8
</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">@@ -48,15 +48,6 @@
</span><span class="cx"> port:ossp-uuid \
</span><span class="cx"> port:icu
</span><span class="cx">
</span><del>-# Without the OpenGL patch, mpv will sporadically include both <GL/gl3.h>
-# and <GL/gl.h>. This is a problem, as it will disable compile errors for
-# deprecated functions and may lead to crashes in OpenGL mode.
-# This is really a bug in mpv code and should be fixed there, but
-# we'll provide a workaround by making sure <GL/gl3.h> will
-# not be included for the time being.
-patchfiles patch-video_out_gl_common.h-use-OpenGL-legacy.diff \
- patch-TOOLS_osxbundle.py-replace-sed-call.diff
-
</del><span class="cx"> universal_variant no
</span><span class="cx">
</span><span class="cx"> default_variants +bundle +network +osd +mp3 +opengl +dvd
</span><span class="lines">@@ -65,6 +56,8 @@
</span><span class="cx"> configure.args-delete --nocache
</span><span class="cx">
</span><span class="cx"> # Default configuration options. Mostly Mac OS X specific.
</span><ins>+# We cannot use --enable-cplayer here. Only --disable-cplayer
+# is recognized. Boo!
</ins><span class="cx"> configure.args-append --enable-manpage-build \
</span><span class="cx"> --enable-libass \
</span><span class="cx"> --enable-coreaudio \
</span><span class="lines">@@ -77,6 +70,8 @@
</span><span class="cx"> # This list should be expanded each time the port is updated to a
</span><span class="cx"> # new version, disabling any newly added options.
</span><span class="cx"> configure.args-append --disable-pdf-build \
</span><ins>+ --disable-test \
+ --disable-clang-database \
</ins><span class="cx"> --disable-debug-build \
</span><span class="cx"> --disable-libsmbclient \
</span><span class="cx"> --disable-libass-osd \
</span><span class="lines">@@ -89,7 +84,6 @@
</span><span class="cx"> --disable-enca \
</span><span class="cx"> --disable-mpg123 \
</span><span class="cx"> --disable-pulse \
</span><del>- --disable-portaudio \
</del><span class="cx"> --disable-jack \
</span><span class="cx"> --disable-openal \
</span><span class="cx"> --disable-gl-cocoa \
</span><span class="lines">@@ -171,6 +165,7 @@
</span><span class="cx"> if {${os.major} < 11} {
</span><span class="cx"> patchfiles-append patch-waftools_checks_custom.py-disable-libarclite.diff \
</span><span class="cx"> patch-misc-add-strnlen.diff \
</span><ins>+ patch-misc-import-CoreVideo.diff \
</ins><span class="cx"> patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff \
</span><span class="cx"> patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff \
</span><span class="cx"> patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff \
</span><span class="lines">@@ -178,10 +173,12 @@
</span><span class="cx"> patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff \
</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><del>- patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff \
</del><span class="cx"> patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff \
</span><span class="cx"> patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
</span><span class="cx">
</span><ins>+ # Let's hope this is actually unneeded...
+ #patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff
+
</ins><span class="cx"> notes-append {
</span><span class="cx"> On systems older than Lion (10.7), Cocoa output support is currently
</span><span class="cx"> being patched by the MacPorts maintainer to make it work.
</span><span class="lines">@@ -341,10 +338,8 @@
</span><span class="cx"> --enable-pulse
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant portaudio description {Enable portaudio support} {
- depends_lib-append port:portaudio
- configure.args-replace --disable-portaudio \
- --enable-portaudio
</del><ins>+# Remove after 03-04-2016.
+variant portaudio description {Legacy compatibility variant for portaudio support. Will be removed soon.} {
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant jack description {Enable Jack Audio Connection Kit support} {
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchTOOLS_osxbundlepyreplacesedcalldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- TOOLS/osxbundle.py.old
-+++ TOOLS/osxbundle.py
-@@ -3,6 +3,7 @@
- import os
- import shutil
- import sys
-+import fileinput
- from optparse import OptionParser
-
- def sh(command):
-@@ -35,7 +36,8 @@ def copy_binary(binary_name):
- shutil.copy(binary_name, target_binary(binary_name))
-
- def apply_plist_template(plist_file, version):
-- sh("sed -i -e 's/${VERSION}/%s/g' %s" % (version, plist_file))
-+ for line in fileinput.input(plist_file, inplace=1):
-+ print (line.rstrip().replace('${VERSION}', version))
-
- def main():
- version = sh("./version.sh --print").strip()
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchaudio_out_ao_coreaudio_deviceccompilefixdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_device.c-compile-fix.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_device.c-compile-fix.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_device.c-compile-fix.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- audio/out/ao_coreaudio_device.c.old
-+++ audio/out/ao_coreaudio_device.c
-@@ -35,6 +35,8 @@
- * when you are wanting to do good buffering of audio).
- */
-
-+#include <unistd.h>
-+
- #include "config.h"
- #include "ao.h"
- #include "internal.h"
</del></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 (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx"> +@end
</span><span class="cx"> +
</span><span class="cx"> +#endif
</span><del>---- wscript_build.py.old
-+++ wscript_build.py
-@@ -379,6 +379,7 @@
</del><ins>+--- wscript_build.py.old 2015-03-04 05:13:41.000000000 +0100
++++ wscript_build.py 2015-03-04 05:15:32.000000000 +0100
+@@ -373,6 +373,7 @@
</ins><span class="cx"> ( "osdep/ar/HIDRemote.m", "apple-remote" ),
</span><span class="cx"> ( "osdep/macosx_application.m", "cocoa-application" ),
</span><span class="cx"> ( "osdep/macosx_events.m", "cocoa" ),
</span></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 (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- video/out/cocoa_common.m.old
-+++ video/out/cocoa_common.m
-@@ -52,6 +52,14 @@
</del><ins>+--- video/out/cocoa_common.m.old 2015-03-04 04:53:56.000000000 +0100
++++ video/out/cocoa_common.m 2015-03-04 04:55:08.000000000 +0100
+@@ -51,6 +51,14 @@
</ins><span class="cx"> #define cocoa_lock(s) pthread_mutex_lock(&s->mutex)
</span><span class="cx"> #define cocoa_unlock(s) pthread_mutex_unlock(&s->mutex)
</span><span class="cx">
</span><span class="lines">@@ -13,5 +13,5 @@
</span><span class="cx"> +#endif
</span><span class="cx"> +
</span><span class="cx"> static void vo_cocoa_fullscreen(struct vo *vo);
</span><del>- static void cocoa_change_profile(struct vo *vo, char **store, NSScreen *screen);
</del><span class="cx"> static void cocoa_rm_fs_screen_profile_observer(struct vo *vo);
</span><ins>+
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmusedeprecatedColorSyncfunctionsdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>---- video/out/cocoa_common.m.old
-+++ video/out/cocoa_common.m
-@@ -580,6 +580,8 @@
- CGDirectDisplayID displayID = (CGDirectDisplayID)
- [[screen deviceDescription][@"NSScreenNumber"] unsignedLongValue];
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-+
- CFUUIDRef uuid = CGDisplayCreateUUIDFromDisplayID(displayID);
- if (CFGetTypeID(uuid) == CFNullGetTypeID()) {
- MP_ERR(s, "cannot get display UUID.\n");
-@@ -644,6 +646,23 @@
- if (!result)
- MP_ERR(s, "cannot get display profile path.\n");
-
-+#else // 10.6 and lower
-+
-+ CMProfileRef profile = 0;
-+ CMProfileLocation location;
-+ int error = CMGetProfileByAVID ((CMDisplayIDType) displayID, &profile);
-+ if (!error) {
-+ UInt32 size = sizeof (location);
-+ error = NCMGetProfileLocation (profile, &location, &size);
-+ result = talloc_strdup (vo, location.u.pathLoc.path);
-+ CMCloseProfile (profile);
-+ }
-+ else {
-+ result = talloc_strdup (vo, "/System/Library/ColorSync/Profiles/Generic RGB Profile.icc");
-+ }
-+
-+#endif
-+
- get_icc_profile_path_err_out:
- CF_RELEASE(device_info);
- return result;
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewhremoveNSDraggingDestinationprotocoldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- video/out/cocoa/events_view.h.old
-+++ video/out/cocoa/events_view.h
</del><ins>+--- video/out/cocoa/events_view.h.old 2015-03-04 04:43:55.000000000 +0100
++++ video/out/cocoa/events_view.h 2015-03-04 04:45:38.000000000 +0100
</ins><span class="cx"> @@ -18,7 +18,7 @@
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="cx"> #import "video/out/cocoa/mpvadapter.h"
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> +@interface MpvEventsView : NSView
</span><span class="cx"> @property(nonatomic, retain) MpvCocoaAdapter *adapter;
</span><span class="cx"> - (void)setFullScreen:(BOOL)willBeFullscreen;
</span><del>- - (BOOL)canHideCursor;
</del><ins>+ - (void)clear;
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewmreplaceconvertPointToBackingwithuserSpaceScaleFactordiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- video/out/cocoa/events_view.m.old
-+++ video/out/cocoa/events_view.m
-@@ -188,7 +188,9 @@
</del><ins>+--- video/out/cocoa/events_view.m.old 2015-03-04 04:50:51.000000000 +0100
++++ video/out/cocoa/events_view.m 2015-03-04 04:52:11.000000000 +0100
+@@ -202,7 +202,9 @@
</ins><span class="cx"> - (NSPoint)convertPointToPixels:(NSPoint)point
</span><span class="cx"> {
</span><span class="cx"> point = [self convertPoint:point fromView:nil];
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewmreplaceconvertRectFromScreenwithconvertScreenToBasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- video/out/cocoa/events_view.m.old
-+++ video/out/cocoa/events_view.m
-@@ -124,7 +124,12 @@
</del><ins>+--- video/out/cocoa/events_view.m.old 2015-03-04 04:46:21.000000000 +0100
++++ video/out/cocoa/events_view.m 2015-03-04 04:48:00.000000000 +0100
+@@ -134,7 +134,12 @@
</ins><span class="cx"> - (BOOL)containsMouseLocation
</span><span class="cx"> {
</span><span class="cx"> NSRect vF = [[self.window screen] visibleFrame];
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_video_viewmreplaceconvertRectToBackingwithuserSpaceScaleFactordiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- video/out/cocoa/video_view.m.old
-+++ video/out/cocoa/video_view.m
</del><ins>+--- video/out/cocoa/video_view.m.old 2015-03-04 04:49:08.000000000 +0100
++++ video/out/cocoa/video_view.m 2015-03-04 04:50:15.000000000 +0100
</ins><span class="cx"> @@ -38,7 +38,15 @@
</span><span class="cx">
</span><span class="cx"> - (NSRect)frameInPixels
</span><span class="lines">@@ -16,4 +16,4 @@
</span><span class="cx"> + return conv_frame;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- - (BOOL)canHideCursor
</del><ins>+
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_gl_cocoachardcodeOpenGL2diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,36 +1,138 @@
</span><del>---- video/out/gl_cocoa.c.old
-+++ video/out/gl_cocoa.c
-@@ -49,6 +49,8 @@
</del><ins>+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.old 2015-03-06 20:45:08.000000000 +0100
++++ video/out/gl_cocoa.c 2015-03-06 22:40:39.000000000 +0100
+@@ -60,12 +60,17 @@
+
+ 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
+@@ -103,16 +108,22 @@
</ins><span class="cx"> struct cgl_context *p = ctx->priv;
</span><span class="cx"> CGLError err;
</span><span class="cx">
</span><span class="cx"> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><del>-+
- CGLOpenGLProfile gl_vers_map[] = {
- [2] = kCGLOGLPVersion_Legacy,
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
-@@ -59,15 +61,24 @@
- #endif
</del><ins>+ CGLOpenGLProfile gl_versions[] = {
+ kCGLOGLPVersion_3_2_Core,
+ kCGLOGLPVersion_Legacy,
</ins><span class="cx"> };
</span><ins>++#endif
</ins><span class="cx">
</span><ins>++#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);
</ins><span class="cx"> +#endif
</span><del>-+
- int gl_major = MPGL_VER_GET_MAJOR(ctx->requested_gl_version);
-+
</del><ins>+
+ if (err != kCGLNoError) {
+ MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
+--- video/out/gl_common.c.old 2015-03-06 20:45:08.000000000 +0100
++++ video/out/gl_common.c 2015-03-06 23:03:33.000000000 +0100
+@@ -376,6 +376,7 @@
+ // and above.
+
+ bool has_legacy = false;
</ins><span class="cx"> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><del>- if (gl_major < 2 || gl_major >= MP_ARRAY_SIZE(gl_vers_map)) {
</del><ins>+ if (gl->version >= 300) {
+ gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
+ gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
+@@ -396,12 +397,15 @@
+ // includes legacy (except with CONTEXT_FORWARD_COMPATIBLE_BIT_ARB).
+ if (gl->version == 300)
+ has_legacy = true;
+- } else {
++ } else
</ins><span class="cx"> +#else
</span><del>-+ if (gl_major != 2) {
</del><ins>++ {
+ const char *ext = (char*)gl->GetString(GL_EXTENSIONS);
+ gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
+
+ has_legacy = true;
+ }
</ins><span class="cx"> +#endif
</span><del>- MP_FATAL(ctx->vo, "OpenGL major version %d not supported", gl_major);
- return false;
- }
</del><span class="cx">
</span><del>- CGLPixelFormatAttribute attrs[] = {
</del><ins>+ if (gl->es)
+ has_legacy = false;
+--- video/out/gl_common.h.old 2015-03-06 20:45:08.000000000 +0100
++++ video/out/gl_common.h 2015-03-06 22:03:49.000000000 +0100
+@@ -40,7 +40,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.old 2015-03-06 20:45:08.000000000 +0100
++++ video/out/gl_utils.c 2015-03-06 23:31:33.000000000 +0100
+@@ -83,14 +83,20 @@
+ return 2;
+ case GL_RGB:
+ case GL_BGR:
</ins><span class="cx"> +#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><del>- kCGLPFAOpenGLProfile,
- (CGLPixelFormatAttribute) gl_vers_map[gl_major],
</del><ins>+ case GL_RGB_INTEGER:
</ins><span class="cx"> +#endif
</span><del>- kCGLPFADoubleBuffer,
- kCGLPFAAccelerated,
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
</del><ins>+ 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.old 2015-03-06 20:45:08.000000000 +0100
++++ video/out/gl_video.c 2015-03-06 23:40:14.000000000 +0100
+@@ -270,10 +270,10 @@
+ };
+
+ 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[] = {
+@@ -382,12 +382,8 @@
+ {"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_gl_commonhuseOpenGLlegacydiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_gl_common.h-use-OpenGL-legacy.diff (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_gl_common.h-use-OpenGL-legacy.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_gl_common.h-use-OpenGL-legacy.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>---- video/out/gl_common.h.old
-+++ video/out/gl_common.h
-@@ -38,11 +38,11 @@
- #include "video/mp_image.h"
-
- #if HAVE_GL_COCOA
-+/* Avoid <GL/gl3.h> on OS X. mpv doesn't use any 3.x features and including it causes the compiler
-+ * to not complain about missing functions/errors.
-+ */
-+#define __gl3_h
--#ifdef GL_VERSION_3_0
--#include <OpenGL/gl3.h>
--#else
- #include <OpenGL/gl.h>
--#endif
- #include <OpenGL/glext.h>
- #else
- #include <GL/gl.h>
</del></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 (133613 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2015-03-06 23:16:43 UTC (rev 133613)
+++ trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>---- waftools/checks/custom.py.old
-+++ waftools/checks/custom.py
-@@ -103,7 +103,6 @@
</del><ins>+--- waftools/checks/custom.py.old 2015-03-04 04:17:27.000000000 +0100
++++ waftools/checks/custom.py 2015-03-04 04:40:41.000000000 +0100
+@@ -107,7 +107,6 @@
</ins><span class="cx"> fragment = load_fragment('cocoa.m'),
</span><span class="cx"> compile_filename = 'test.m',
</span><del>- framework_name = ['Cocoa', 'IOKit', 'OpenGL'],
</del><ins>+ framework_name = ['Cocoa', 'IOKit', 'OpenGL', 'QuartzCore'],
</ins><span class="cx"> - includes = ctx.srcnode.abspath(),
</span><span class="cx"> - linkflags = '-fobjc-arc')
</span><span class="cx"> + includes = ctx.srcnode.abspath())
</span></span></pre></div>
<a id="trunkmultimediampvfilespatchmiscimportCoreVideodiff"></a>
<div class="addfile"><h4>Added: trunk/multimedia/mpv/files/patch-misc-import-CoreVideo.diff (0 => 133614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/multimedia/mpv/files/patch-misc-import-CoreVideo.diff (rev 0)
+++ trunk/multimedia/mpv/files/patch-misc-import-CoreVideo.diff 2015-03-06 23:20:49 UTC (rev 133614)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- video/out/cocoa_common.m.old 2015-03-06 20:35:32.000000000 +0100
++++ video/out/cocoa_common.m 2015-03-06 20:43:03.000000000 +0100
+@@ -20,6 +20,7 @@
+ #import <Cocoa/Cocoa.h>
+ #import <CoreServices/CoreServices.h> // for CGDisplayHideCursor
+ #import <IOKit/pwr_mgt/IOPMLib.h>
++#import <CoreVideo/CoreVideo.h>
+
+ #import "cocoa_common.h"
+ #import "video/out/cocoa/window.h"
+--- waftools/fragments/cocoa.m.old 2015-03-06 20:35:34.000000000 +0100
++++ waftools/fragments/cocoa.m 2015-03-06 20:42:16.000000000 +0100
+@@ -1,6 +1,7 @@
+ #import <CoreServices/CoreServices.h>
+ #import <OpenGL/OpenGL.h>
+ #import <Cocoa/Cocoa.h>
++#import <CoreVideo/CoreVideo.h>
+
+ #include "osdep/macosx_compat.h"
+
</ins></span></pre>
</div>
</div>
</body>
</html>