<!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>[134922] 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/134922">134922</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-04-10 17:33:32 -0700 (Fri, 10 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpv: update to 0.8.3. Also:
- Remove icu dependency. Fixes: #47383.
- Add CD audio support via libcdio-cdparanoia. Fixes: #47408.
- Add cdaudio to default variants.
- Add commented-out EGL stuff.
- Refresh patches using quilt:
+ patch-video_out_cocoa_common.m-define-constants.diff
+ patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvPortfile">trunk/dports/multimedia/mpv/Portfile</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_viewmreplaceconvertRectFromScreenwithconvertScreenToBasediff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.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 (134921 => 134922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/Portfile 2015-04-10 22:06:57 UTC (rev 134921)
+++ trunk/dports/multimedia/mpv/Portfile 2015-04-11 00:33:32 UTC (rev 134922)
</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.8.2 v
-revision 1
</del><ins>+github.setup mpv-player mpv 0.8.3 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">@@ -31,8 +31,8 @@
</span><span class="cx"> extract.only-delete ${waf_distfile}
</span><span class="cx">
</span><span class="cx"> checksums ${mpv_distfile} \
</span><del>- rmd160 bb747edd8badb1904d2873b9269dcbedb1e2473d \
- sha256 ed758577aff6c18fcd087b0281d263729a3e32af2f8f45eca32b1de6d8a41ffc \
</del><ins>+ rmd160 47b05fed9dfcb8e858e5f1ad1090c6ec392afe8b \
+ sha256 1dee09eb47bb26241af0f9f267424e078166e5182b5cdc4653d22ceef63bc20d \
</ins><span class="cx"> ${waf_distfile} \
</span><span class="cx"> rmd160 d58b790001664fe5f6a720e4ff9ce9f4105d195a \
</span><span class="cx"> sha256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8
</span><span class="lines">@@ -45,12 +45,11 @@
</span><span class="cx"> port:libass \
</span><span class="cx"> port:libbluray \
</span><span class="cx"> port:lcms2 \
</span><del>- port:ossp-uuid \
- port:icu
</del><ins>+ port:ossp-uuid
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-default_variants +bundle +network +osd +mp3 +opengl +dvd
</del><ins>+default_variants +bundle +network +osd +mp3 +opengl +dvd +audiocd
</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">@@ -316,12 +315,10 @@
</span><span class="cx"> --enable-dvdnav
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant audiocd description {Enable Audio CD support via libcdio-paranoia (currently unsupported!)} {
- #depends_lib-append port:libcdio-paranoia
- #configure.args-replace --disable-cdda \
- --enable-cdda
- ui_error "Audio CD support is currently disabled due to a missing libcdio-paranoia port."
- error "audiocd variant not supported"
</del><ins>+variant audiocd description {Enable Audio CD support via libcdio-paranoia} {
+ depends_lib-append port:libcdio-paranoia
+ configure.args-replace --disable-cdda \
+ --enable-cdda
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant enca description {Enable encoding support via ENCA} {
</span><span class="lines">@@ -385,13 +382,12 @@
</span><span class="cx"> --enable-gl-cocoa
</span><span class="cx">
</span><span class="cx"> if {[variant_isset x11]} {
</span><del>- # FIXME: add EGL? Leave it disabled? Test!
- # EGL requires a recent MESA version, but the only
- # suitable candidate (10.3) fails due to this blocker:
- # https://bugs.freedesktop.org/show_bug.cgi?id=66346
</del><span class="cx"> depends_lib-append port:mesa
</span><span class="cx"> configure.args-replace --disable-gl-x11 \
</span><span class="cx"> --enable-gl-x11
</span><ins>+ # FIXME: add EGL? Leave it disabled? Test!
+ #configure.args-replace --disable-egl-x11 \
+ # --enable-egl-x11
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</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 (134921 => 134922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2015-04-10 22:06:57 UTC (rev 134921)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2015-04-11 00:33:32 UTC (rev 134922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- video/out/cocoa_common.m.orig
++++ video/out/cocoa_common.m
+@@ -52,6 +52,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_rm_fs_screen_profile_observer(struct vo *vo);
</del><ins>+ static void cocoa_rm_fs_screen_profile_observer(struct vo_cocoa_state *s);
</ins><span class="cx">
</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 (134921 => 134922)</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-04-10 22:06:57 UTC (rev 134921)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff 2015-04-11 00:33:32 UTC (rev 134922)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- video/out/cocoa/events_view.m.orig
++++ video/out/cocoa/events_view.m
+@@ -133,7 +133,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>
</div>
</body>
</html>