<!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>[138221] 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/138221">138221</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-07-02 09:14:19 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpv: update to 0.9.2. (By extension) Fixes: #48221.
- Remove unused variants:
o lirc
o mp3
- Add new variants:
o rubberband
- Regenerate patchset.
- Add new patch for light sensor notifications on OS X 10.6.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvPortfile">trunk/dports/multimedia/mpv/Portfile</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchaudio_out_ao_coreaudio_exclusiveccompilefixdiff">trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchmiscaddstrnlendiff">trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff</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_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_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_cocoa_windowmfullscreenfixesdiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.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><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmportlightsensordiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.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 (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/Portfile 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/Portfile 2015-07-02 16:14:19 UTC (rev 138221)
</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.3 v
-revision 3
</del><ins>+github.setup mpv-player mpv 0.9.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">@@ -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 47b05fed9dfcb8e858e5f1ad1090c6ec392afe8b \
- sha256 1dee09eb47bb26241af0f9f267424e078166e5182b5cdc4653d22ceef63bc20d \
</del><ins>+ rmd160 00f381bc678a7900dcd137507ac93373859a6232 \
+ sha256 468b86fa56f4d286c227f04cb0fe0f83d0311d55481da671a32296355fe75c9c \
</ins><span class="cx"> ${waf_distfile} \
</span><span class="cx"> rmd160 d58b790001664fe5f6a720e4ff9ce9f4105d195a \
</span><span class="cx"> sha256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8
</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 +mp3 +opengl +dvd +audiocd
</del><ins>+default_variants +bundle +network +osd +rubberband +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">@@ -74,14 +74,13 @@
</span><span class="cx"> --disable-debug-build \
</span><span class="cx"> --disable-libsmbclient \
</span><span class="cx"> --disable-libass-osd \
</span><del>- --disable-lirc \
</del><span class="cx"> --disable-dvdread \
</span><span class="cx"> --disable-dvdnav \
</span><span class="cx"> --disable-cdda \
</span><span class="cx"> --disable-vapoursynth \
</span><span class="cx"> --disable-vapoursynth-lazy \
</span><span class="cx"> --disable-enca \
</span><del>- --disable-mpg123 \
</del><ins>+ --disable-rubberband \
</ins><span class="cx"> --disable-pulse \
</span><span class="cx"> --disable-jack \
</span><span class="cx"> --disable-openal \
</span><span class="lines">@@ -193,6 +192,7 @@
</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><ins>+ patch-video_out_cocoa_common.m-port-lightsensor.diff \
</ins><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><span class="lines">@@ -317,10 +317,14 @@
</span><span class="cx"> depends_run-append port:youtube-dl
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant lirc description {Enable Linux Infrared Remote Daemon support} {
- depends_lib-append port:lirc
- configure.args-replace --disable-lirc \
- --enable-lirc
</del><ins>+# Remove after 06-28-2016.
+variant lirc description {Legacy compatibility variant for Linux Infrared Remote Control Daemon support. Will be removed soon.} {
+ notes-append "
+ You have enabled the legacy lirc variant.
+ Upstream removed built-in support for LIRC in version 0.9.0.
+ You can still use remote controls. Install the lirc port manually
+ and configure your remotes as an input device.
+ "
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant dvd description {Enable DVD and DeCSS support} {
</span><span class="lines">@@ -344,12 +348,23 @@
</span><span class="cx"> --enable-enca
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mp3 description {Enable mp3 support via mpg123} {
- depends_lib-append port:mpg123
- configure.args-replace --disable-mpg123 \
- --enable-mpg123
</del><ins>+# Remove after 06-28-2016.
+variant mp3 description {Legacy compatibility variant for MP3 support via mpg123. Will be removed soon.} {
+ notes-append "
+ You have enabled the legacy mp3 variant.
+ Upstream ceased using mpg123 in version 0.8.0 and removed support
+ completely in 0.9.0.
+ Decoding and playback of MP3 content is still available via
+ ffmpeg, so no action is needed on your side.
+ "
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+variant rubberband description {Enable support for the Rubber Band library, adding audio pitch and speed control} {
+ depends_lib-append port:rubberband
+ configure.args-replace --disable-rubberband \
+ --enable-rubberband
+}
+
</ins><span class="cx"> variant pulseaudio description {Enable PulseAudio support} {
</span><span class="cx"> depends_lib-append port:pulseaudio
</span><span class="cx"> configure.args-replace --disable-pulse \
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchaudio_out_ao_coreaudio_exclusiveccompilefixdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>---- audio/out/ao_coreaudio_exclusive.c.old
</del><ins>+--- audio/out/ao_coreaudio_exclusive.c.orig
</ins><span class="cx"> +++ audio/out/ao_coreaudio_exclusive.c
</span><del>-@@ -35,6 +35,8 @@
- * when you are wanting to do good buffering of audio).
- */
</del><ins>+@@ -36,6 +36,8 @@
</ins><span class="cx">
</span><ins>+ #include <CoreAudio/HostTime.h>
+
</ins><span class="cx"> +#include <unistd.h>
</span><span class="cx"> +
</span><span class="cx"> #include "config.h"
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchmiscaddstrnlendiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- common/common.h.old
</del><ins>+--- common/common.h.orig
</ins><span class="cx"> +++ common/common.h
</span><del>-@@ -26,6 +26,7 @@
</del><ins>+@@ -25,6 +25,7 @@
</ins><span class="cx">
</span><span class="cx"> #include "osdep/compiler.h"
</span><span class="cx"> #include "talloc.h"
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> // double should be able to represent this exactly
</span><span class="cx"> #define MP_NOPTS_VALUE (-0x1p+63)
</span><del>---- common/compat.h.old
</del><ins>+--- /dev/null
</ins><span class="cx"> +++ common/compat.h
</span><span class="cx"> @@ -0,0 +1,19 @@
</span><span class="cx"> +#ifndef COMPAT_H
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> +}
</span><span class="cx"> +
</span><span class="cx"> +#endif /* !defined (COMPAT_H) */
</span><del>---- ta/ta.h.old
</del><ins>+--- ta/ta.h.orig
</ins><span class="cx"> +++ ta/ta.h
</span><span class="cx"> @@ -18,6 +18,8 @@
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchmiscimportCoreVideodiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><del>---- 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
</del><ins>+--- video/out/cocoa_common.m.orig
++++ video/out/cocoa_common.m
+@@ -22,6 +22,7 @@
</ins><span class="cx"> #import <IOKit/pwr_mgt/IOPMLib.h>
</span><ins>+ #import <IOKit/IOKitLib.h>
+ #include <mach/mach.h>
</ins><span class="cx"> +#import <CoreVideo/CoreVideo.h>
</span><span class="cx">
</span><span class="cx"> #import "cocoa_common.h"
</span><span class="cx"> #import "video/out/cocoa/window.h"
</span><del>---- 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
</del><ins>+--- waftools/fragments/cocoa.m.orig
++++ waftools/fragments/cocoa.m
</ins><span class="cx"> @@ -1,6 +1,7 @@
</span><span class="cx"> #import <CoreServices/CoreServices.h>
</span><span class="cx"> #import <OpenGL/OpenGL.h>
</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 (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>---- osdep/macosx_compat.m.old
</del><ins>+--- /dev/null
</ins><span class="cx"> +++ osdep/macosx_compat.m
</span><span class="cx"> @@ -0,0 +1,54 @@
</span><span class="cx"> +/*
</span><span class="lines">@@ -55,13 +55,13 @@
</span><span class="cx"> +@end
</span><span class="cx"> +
</span><span class="cx"> +#endif
</span><del>---- 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 @@
</del><ins>+--- wscript_build.py.orig
++++ wscript_build.py
+@@ -378,6 +378,7 @@ def build(ctx):
</ins><span class="cx"> ( "osdep/ar/HIDRemote.m", "apple-remote" ),
</span><del>- ( "osdep/macosx_application.m", "cocoa-application" ),
</del><ins>+ ( "osdep/macosx_application.m", "cocoa" ),
</ins><span class="cx"> ( "osdep/macosx_events.m", "cocoa" ),
</span><span class="cx"> + ( "osdep/macosx_compat.m" ),
</span><span class="cx"> ( "osdep/semaphore_osx.c" ),
</span><ins>+ ( "osdep/subprocess.c" ),
</ins><span class="cx"> ( "osdep/subprocess-posix.c", "posix-spawn" ),
</span><del>- ( "osdep/subprocess-win.c", "os-win32" ),
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmportlightsensordiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff (0 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+--- video/out/cocoa_common.m.orig
++++ video/out/cocoa_common.m
+@@ -87,6 +87,7 @@ struct vo_cocoa_state {
+ uint64_t last_lmuvalue;
+ int last_lux;
+ IONotificationPortRef light_sensor_io_port;
++ CFRunLoopSourceRef light_sensor_notify_rl_source;
+
+ pthread_mutex_t mutex;
+ struct mp_log *log;
+@@ -220,8 +221,18 @@ static void cocoa_init_light_sensor(stru
+
+ // subscribe to notifications from the light sensor driver
+ s->light_sensor_io_port = IONotificationPortCreate(kIOMasterPortDefault);
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ IONotificationPortSetDispatchQueue(
+ s->light_sensor_io_port, dispatch_get_main_queue());
++#else
++ if ((s->light_sensor_notify_rl_source = IONotificationPortGetRunLoopSource (s->light_sensor_io_port)) != NULL) {
++ CFRunLoopAddSource (CFRunLoopGetCurrent (), s->light_sensor_notify_rl_source, kCFRunLoopCommonModes);
++ }
++ else {
++ MP_WARN (vo, "can't start ambient light sensor connection\n");
++ return;
++ }
++#endif
+
+ io_object_t n;
+ IOServiceAddInterestNotification(
+@@ -243,6 +254,11 @@ static void cocoa_init_light_sensor(stru
+ static void cocoa_uninit_light_sensor(struct vo_cocoa_state *s)
+ {
+ if (s->light_sensor_io_port) {
++ if (s->light_sensor_notify_rl_source) {
++ CFRunLoopSourceInvalidate (s->light_sensor_notify_rl_source);
++ s->light_sensor_notify_rl_source = NULL;
++ }
++
+ IONotificationPortDestroy(s->light_sensor_io_port);
+ IOObjectRelease(s->light_sensor);
+ }
</ins></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 (138220 => 138221)</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-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- 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
</del><ins>+--- video/out/cocoa/events_view.h.orig
++++ video/out/cocoa/events_view.h
</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></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 (138220 => 138221)</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-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- video/out/cocoa/events_view.m.orig
++++ video/out/cocoa/events_view.m
+@@ -205,7 +205,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_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 (138220 => 138221)</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-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- 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
</del><ins>+--- video/out/cocoa/video_view.m.orig
++++ video/out/cocoa/video_view.m
</ins><span class="cx"> @@ -38,7 +38,15 @@
</span><span class="cx">
</span><span class="cx"> - (NSRect)frameInPixels
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_windowmfullscreenfixesdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>---- video/out/cocoa/window.m.old
</del><ins>+--- video/out/cocoa/window.m.orig
</ins><span class="cx"> +++ video/out/cocoa/window.m
</span><span class="cx"> @@ -30,6 +30,14 @@
</span><span class="cx"> - (void)setCenteredContentSize:(NSSize)newSize;
</span></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 (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> Only in mpv-0.8.2/video/out: .gl_common.c.swp
</span><span class="cx"> Only in mpv-0.8.2/video/out: .gl_utils.c.swp
</span><del>---- 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 @@
</del><ins>+--- video/out/gl_cocoa.c.orig
++++ video/out/gl_cocoa.c
+@@ -61,12 +61,17 @@ static void *cocoa_glgetaddr(const char
</ins><span class="cx">
</span><span class="cx"> static CGLError test_gl_version(struct vo *vo,
</span><span class="cx"> CGLContextObj *ctx,
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> kCGLPFADoubleBuffer,
</span><span class="cx"> kCGLPFAAccelerated,
</span><span class="cx"> #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
</span><del>-@@ -103,16 +108,22 @@
</del><ins>+@@ -104,16 +109,22 @@ static bool create_gl_context(struct MPG
</ins><span class="cx"> struct cgl_context *p = ctx->priv;
</span><span class="cx"> CGLError err;
</span><span class="cx">
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx">
</span><span class="cx"> if (err != kCGLNoError) {
</span><span class="cx"> MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
</span><del>---- 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 @@
</del><ins>+--- video/out/gl_common.c.orig
++++ video/out/gl_common.c
+@@ -372,6 +372,7 @@ void mpgl_load_functions2(GL *gl, void *
</ins><span class="cx"> // and above.
</span><span class="cx">
</span><span class="cx"> bool has_legacy = false;
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> if (gl->version >= 300) {
</span><span class="cx"> gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
</span><span class="cx"> gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
</span><del>-@@ -396,12 +397,15 @@
</del><ins>+@@ -392,12 +393,15 @@ void mpgl_load_functions2(GL *gl, void *
</ins><span class="cx"> // includes legacy (except with CONTEXT_FORWARD_COMPATIBLE_BIT_ARB).
</span><span class="cx"> if (gl->version == 300)
</span><span class="cx"> has_legacy = true;
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx">
</span><span class="cx"> if (gl->es)
</span><span class="cx"> has_legacy = false;
</span><del>---- 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 @@
</del><ins>+--- video/out/gl_common.h.orig
++++ video/out/gl_common.h
+@@ -39,7 +39,6 @@
</ins><span class="cx"> #if HAVE_GL_COCOA
</span><span class="cx"> #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
</span><span class="cx"> #include <OpenGL/gl.h>
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> #include <OpenGL/glext.h>
</span><span class="cx"> #else
</span><span class="cx"> #include <GL/gl.h>
</span><del>---- 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 @@
</del><ins>+--- video/out/gl_utils.c.orig
++++ video/out/gl_utils.c
+@@ -84,14 +84,20 @@ int glFmt2bpp(GLenum format, GLenum type
</ins><span class="cx"> return 2;
</span><span class="cx"> case GL_RGB:
</span><span class="cx"> case GL_BGR:
</span><span class="lines">@@ -105,9 +105,9 @@
</span><span class="cx"> return component_size;
</span><span class="cx"> case GL_RG:
</span><span class="cx"> case GL_LUMINANCE_ALPHA:
</span><del>---- 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 @@
</del><ins>+--- video/out/gl_video.c.orig
++++ video/out/gl_video.c
+@@ -277,10 +277,10 @@ static const struct fmt_entry gl_byte_fo
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const struct fmt_entry gl_float16_formats[] = {
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const struct fmt_entry gl_apple_formats[] = {
</span><del>-@@ -382,12 +382,8 @@
</del><ins>+@@ -416,12 +416,8 @@ const struct m_sub_options gl_video_conf
</ins><span class="cx"> {"rgb10", GL_RGB10},
</span><span class="cx"> {"rgb10_a2", GL_RGB10_A2},
</span><span class="cx"> {"rgb16", GL_RGB16},
</span></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 (138220 => 138221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2015-07-02 16:12:42 UTC (rev 138220)
+++ trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2015-07-02 16:14:19 UTC (rev 138221)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- waftools/checks/custom.py.orig
++++ waftools/checks/custom.py
+@@ -108,7 +108,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>