<!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>[129459] 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/129459">129459</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2014-12-13 05:49:48 -0800 (Sat, 13 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpv: update to 0.7.1. Apply 10.6 patches cleanly against changes base.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvPortfile">trunk/dports/multimedia/mpv/Portfile</a></li>
<li><a href="#trunkdportsmultimediampvfilesconfigmaintainer">trunk/dports/multimedia/mpv/files/config-maintainer</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_commonmusedeprecatedColorSyncfunctionsdiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.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="#trunkdportsmultimediampvfilespatchTOOLS_osxbundlepyreplacesedcalldiff">trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff</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="#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>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewhremoveNSDraggingDestinationprotocoldiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.h-remove-NSDraggingDestination-protocol.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertPointToBackingwithuserSpaceScaleFactordiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertRectFromScreenwithconvertScreenToBasediff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff</a></li>
<li><a href="#trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertRectToBackingwithuserSpaceScaleFactordiff">trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.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 (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/Portfile 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/Portfile 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -6,7 +6,7 @@
</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.6.2 v
</del><ins>+github.setup mpv-player mpv 0.7.1 v
</ins><span class="cx"> revision 0
</span><span class="cx"> categories multimedia
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -22,14 +22,13 @@
</span><span class="cx"> and even H.264 movies.
</span><span class="cx"> homepage http://www.mpv.io/
</span><span class="cx">
</span><del>-checksums rmd160 9440f1e9d6c7a6118d156d1a39f081cf4aee40a2 \
- sha256 0e7890be66ec4686cfc6cbbb16dc8411bdf6be16f866c5e7a048ca78331f5a75
</del><ins>+checksums rmd160 0c34377f400bdb05536666866418442c32792866 \
+ sha256 e7aa04852944eae4ebe0c38da83093e757f04741b98b3dd2cc4c2cdd3cea3e91
</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="cx"> path:bin/perl:perl5 \
</span><span class="cx"> port:libiconv \
</span><del>- port:ncurses \
</del><span class="cx"> port:zlib \
</span><span class="cx"> port:libass \
</span><span class="cx"> port:libbluray \
</span><span class="lines">@@ -43,12 +42,15 @@
</span><span class="cx"> # This is really a bug in mpv code and should be fixed there, but
</span><span class="cx"> # we'll provide a workaround by making sure <GL/gl3.h> will
</span><span class="cx"> # not be included for the time being.
</span><del>-patchfiles patch-video_out_gl_common.h-use-OpenGL-legacy.diff
</del><ins>+patchfiles patch-video_out_gl_common.h-use-OpenGL-legacy.diff \
+ patch-TOOLS_osxbundle.py-replace-sed-call.diff
</ins><span class="cx">
</span><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="cx">
</span><ins>+# Current waf doesn't support --nocache anymore. Set by PortGroup.
+configure.args-delete --nocache
</ins><span class="cx">
</span><span class="cx"> # Default configuration options. Mostly Mac OS X specific.
</span><span class="cx"> configure.args-append --enable-manpage-build \
</span><span class="lines">@@ -63,15 +65,15 @@
</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><del>- --disable-macosx-bundle \
</del><span class="cx"> --disable-debug-build \
</span><span class="cx"> --disable-libsmbclient \
</span><span class="cx"> --disable-libass-osd \
</span><del>- --disable-libquvi \
</del><span class="cx"> --disable-lirc \
</span><span class="cx"> --disable-dvdread \
</span><span class="cx"> --disable-dvdnav \
</span><span class="cx"> --disable-cdda \
</span><ins>+ --disable-vapoursynth \
+ --disable-vapoursynth-lazy \
</ins><span class="cx"> --disable-enca \
</span><span class="cx"> --disable-mpg123 \
</span><span class="cx"> --disable-pulse \
</span><span class="lines">@@ -84,12 +86,14 @@
</span><span class="cx"> --disable-xext \
</span><span class="cx"> --disable-xv \
</span><span class="cx"> --disable-gl-x11 \
</span><ins>+ --disable-egl-x11 \
</ins><span class="cx"> --disable-xinerama \
</span><span class="cx"> --disable-xrandr \
</span><span class="cx"> --disable-caca \
</span><span class="cx"> --disable-jpeg \
</span><span class="cx"> --disable-tv \
</span><del>- --disable-lua
</del><ins>+ --disable-lua \
+ --disable-apple-remote
</ins><span class="cx">
</span><span class="cx"> # Fix picking up the correct talloc version.
</span><span class="cx"> # -isystem has the added benefit of moving the include
</span><span class="lines">@@ -100,7 +104,7 @@
</span><span class="cx"> configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
</span><span class="cx">
</span><span class="cx"> # clang is required to build mpv. The newer, the merrier.
</span><del>-# Hopefully fixes #44662 on SL.
</del><ins>+# Part of getting mpv to work on SL -- c.f. #44662
</ins><span class="cx"> compiler.blacklist-append *gcc* cc
</span><span class="cx">
</span><span class="cx"> compiler.fallback-delete macports-clang-3.4
</span><span class="lines">@@ -110,6 +114,13 @@
</span><span class="cx"> compiler.fallback-delete clang macports-clang-3.3
</span><span class="cx"> compiler.fallback-append clang macports-clang-3.3
</span><span class="cx">
</span><ins>+build.args-append -v
+
+platform macosx {
+ configure.args-replace --disable-apple-remote \
+ --enable-apple-remote
+}
+
</ins><span class="cx"> platform darwin {
</span><span class="cx"> notes-append "
</span><span class="cx"> The maintainer ships his personal config file in
</span><span class="lines">@@ -148,11 +159,11 @@
</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><del>- patch-audio_out_ao_coreaudio_device.c-compile-fix.diff \
- patch-video_out_cocoa_view.h-remove-NSDraggingDestination-protocol.diff \
- patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff \
- patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff \
- patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff \
</del><ins>+ patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff \
+ patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff \
+ patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff \
+ patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff \
+ patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff \
</ins><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-use-deprecated-ColorSync-functions.diff \
</span><span class="lines">@@ -168,11 +179,23 @@
</span><span class="cx"> Please do not expect it to work or be bug free.
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ post-extract {
+ xinstall -m 0644 -W ${filespath} config-maintainer ${worksrcpath}/TOOLS/
+ }
+
+ pre-configure {
+ if {[variant_isset network]} {
+ reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer
+ } else {
+ reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Shameless copy from ipe-tools.
</span><del>-set python.versions {27 32 33 34}
</del><ins>+set python.versions {27 34}
</ins><span class="cx"> set python.default_version 27
</span><span class="cx">
</span><span class="cx"> # Create python variants.
</span><span class="lines">@@ -211,12 +234,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-extract {
- if {${os.platform} eq "darwin"} {
- xinstall -m 0644 -W ${filespath} config-maintainer ${worksrcpath}/TOOLS/
- }
-}
-
</del><span class="cx"> post-patch {
</span><span class="cx"> set python_ver_dot [join [split ${python.version} {}] "."]
</span><span class="cx"> reinplace -W "${worksrcpath}" "s|'rst2man'|'rst2man-${python_ver_dot}'|" wscript
</span><span class="lines">@@ -242,11 +259,6 @@
</span><span class="cx"> xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer \
</span><span class="cx"> ${destroot}${prefix}/share/examples/${name}
</span><span class="cx"> }
</span><del>-
- if {[variant_isset bundle]} {
- xinstall -d -m 0755 ${destroot}${applications_dir}
- file rename ${destroot}${prefix}/bin/mpv.app ${destroot}${applications_dir}
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -254,14 +266,16 @@
</span><span class="cx"> # "enable" flags in order to make the waf build system error out in case
</span><span class="cx"> # a feature cannot be used/found. Problems like that indicate a missing
</span><span class="cx"> # runtime dependency.
</span><del>-# libquvi is a special case. We just add libquvi-scripts as a dependency
-# and hope for waf to autodetect this version. Do not explicitly enable
-# libquvi, as mpv supports multiple versions and we don't want waf to
-# throw an error if some other version wasn't found.
</del><span class="cx">
</span><span class="cx"> variant bundle description {Enable the optional Mac OS X bundle of mpv} {
</span><del>- configure.args-replace --disable-macosx-bundle \
- --enable-macosx-bundle
</del><ins>+ post-build {
+ system -W "${worksrcpath}" "${waf.python} TOOLS/osxbundle.py -s build/mpv"
+ }
+
+ post-destroot {
+ xinstall -d -m 0755 ${destroot}${applications_dir}
+ file rename ${worksrcpath}/build/mpv.app ${destroot}${applications_dir}
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant screenshot description {Enable optional screenshot support} {
</span><span class="lines">@@ -270,10 +284,8 @@
</span><span class="cx"> --enable-jpeg
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant network description {Enable networking support via libquvi-scripts} {
- depends_lib-append port:libquvi \
- port:libquvi-scripts
- configure.args-delete --disable-libquvi
</del><ins>+variant network description {Enable networking support via youtube-dl (supports wide variety of pages)} {
+ depends_run-append port:youtube-dl
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant lirc description {Enable Linux Infrared Remote Daemon support} {
</span><span class="lines">@@ -362,6 +374,10 @@
</span><span class="cx"> --enable-gl-cocoa
</span><span class="cx">
</span><span class="cx"> if {[variant_isset x11]} {
</span><ins>+ # 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
</ins><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></span></pre></div>
<a id="trunkdportsmultimediampvfilesconfigmaintainer"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/config-maintainer (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/config-maintainer 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/config-maintainer 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -18,3 +18,6 @@
</span><span class="cx"> #alang=en,eng,de,ger
</span><span class="cx">
</span><span class="cx"> cache=50700
</span><ins>+
+@@NETWORK@@ytdl
+@@NETWORK@@ytdl-format=best
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchTOOLS_osxbundlepyreplacesedcalldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff (0 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- 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()
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchaudio_out_ao_coreaudio_exclusiveccompilefixdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff (0 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- audio/out/ao_coreaudio_exclusive.c.old
++++ audio/out/ao_coreaudio_exclusive.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"
</ins></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 (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -57,11 +57,11 @@
</span><span class="cx"> +#endif
</span><span class="cx"> --- wscript_build.py.old
</span><span class="cx"> +++ wscript_build.py
</span><del>-@@ -385,6 +385,7 @@
- ( "osdep/ar/HIDRemote.m", "cocoa" ),
</del><ins>+@@ -379,6 +379,7 @@
+ ( "osdep/ar/HIDRemote.m", "apple-remote" ),
</ins><span class="cx"> ( "osdep/macosx_application.m", "cocoa-application" ),
</span><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><del>- ( "osdep/path-macosx.m", "cocoa" ),
- ( "osdep/path-win.c", "os-win32" ),
</del><ins>+ ( "osdep/subprocess-posix.c", "posix-spawn" ),
+ ( "osdep/subprocess-win.c", "os-win32" ),
</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 (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> --- video/out/cocoa_common.m.old
</span><span class="cx"> +++ video/out/cocoa_common.m
</span><del>-@@ -48,6 +48,14 @@
</del><ins>+@@ -52,6 +52,14 @@
+ #define cocoa_lock(s) pthread_mutex_lock(&s->mutex)
+ #define cocoa_unlock(s) pthread_mutex_unlock(&s->mutex)
</ins><span class="cx">
</span><del>- #define CF_RELEASE(a) if ((a) != NULL) CFRelease(a)
-
</del><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><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 vo_cocoa_ontop(struct vo *vo);
</del><span class="cx"> static void cocoa_change_profile(struct vo *vo, char **store, NSScreen *screen);
</span><ins>+ static void cocoa_rm_fs_screen_profile_observer(struct vo *vo);
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_commonmusedeprecatedColorSyncfunctionsdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- video/out/cocoa_common.m.old
</span><span class="cx"> +++ video/out/cocoa_common.m
</span><del>-@@ -553,6 +553,8 @@
</del><ins>+@@ -580,6 +580,8 @@
</ins><span class="cx"> CGDirectDisplayID displayID = (CGDirectDisplayID)
</span><span class="cx"> [[screen deviceDescription][@"NSScreenNumber"] unsignedLongValue];
</span><span class="cx">
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> CFUUIDRef uuid = CGDisplayCreateUUIDFromDisplayID(displayID);
</span><span class="cx"> if (CFGetTypeID(uuid) == CFNullGetTypeID()) {
</span><span class="cx"> MP_ERR(s, "cannot get display UUID.\n");
</span><del>-@@ -617,6 +619,23 @@
</del><ins>+@@ -644,6 +646,23 @@
</ins><span class="cx"> if (!result)
</span><span class="cx"> MP_ERR(s, "cannot get display profile path.\n");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewhremoveNSDraggingDestinationprotocoldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff (0 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- video/out/cocoa/events_view.h.old
++++ video/out/cocoa/events_view.h
+@@ -18,7 +18,7 @@
+ #import <Cocoa/Cocoa.h>
+ #import "video/out/cocoa/mpvadapter.h"
+
+-@interface MpvEventsView : NSView <NSDraggingDestination>
++@interface MpvEventsView : NSView
+ @property(nonatomic, retain) MpvCocoaAdapter *adapter;
+ - (void)setFullScreen:(BOOL)willBeFullscreen;
+ - (BOOL)canHideCursor;
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewmreplaceconvertPointToBackingwithuserSpaceScaleFactordifffromrev129458trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertPointToBackingwithuserSpaceScaleFactordiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff (from rev 129458, trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff) (0 => 129459)</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 (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- video/out/cocoa/events_view.m.old
++++ video/out/cocoa/events_view.m
+@@ -188,7 +188,9 @@
+ - (NSPoint)convertPointToPixels:(NSPoint)point
+ {
+ point = [self convertPoint:point fromView:nil];
+- point = [self convertPointToBacking:point];
++ CGFloat scale_factor = [self.window userSpaceScaleFactor];
++ //point = [self convertPointToBacking:point];
++ point = NSMakePoint (point.x * scale_factor, point.y * scale_factor);
+ // flip y since isFlipped returning YES doesn't affect the backing
+ // coordinate system
+ point.y = -point.y;
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_events_viewmreplaceconvertRectFromScreenwithconvertScreenToBasedifffromrev129458trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertRectFromScreenwithconvertScreenToBasediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff (from rev 129458, trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff) (0 => 129459)</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 (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- video/out/cocoa/events_view.m.old
++++ video/out/cocoa/events_view.m
+@@ -124,7 +124,12 @@
+ - (BOOL)containsMouseLocation
+ {
+ NSRect vF = [[self.window screen] visibleFrame];
+- NSRect vFW = [self.window convertRectFromScreen:vF];
++ NSPoint vFStart = vF.origin;
++ NSPoint vFEnd = NSMakePoint (vFStart.x + vF.size.width, vFStart.y + vF.size.height);
++ //NSRect vFW = [self.window convertRectFromScreen:vF];
++ NSPoint vFStartW = [self.window convertScreenToBase:vFStart];
++ NSPoint vFEndW = [self.window convertScreenToBase:vFEnd];
++ NSRect vFW = NSMakeRect (vFStartW.x, vFStartW.y, vFEndW.x - vFStartW.x, vFEndW.y - vFStartW.y);
+ NSRect vFV = [self convertRect:vFW fromView:nil];
+ NSPoint pt = [self convertPoint:[self mouseLocation] fromView:nil];
+
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_video_viewmreplaceconvertRectToBackingwithuserSpaceScaleFactordifffromrev129458trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertRectToBackingwithuserSpaceScaleFactordiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff (from rev 129458, trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff) (0 => 129459)</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 (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- video/out/cocoa/video_view.m.old
++++ video/out/cocoa/video_view.m
+@@ -38,7 +38,15 @@
+
+ - (NSRect)frameInPixels
+ {
+- return [self convertRectToBacking:[self frame]];
++ NSRect cur_frame = self.frame;
++ NSPoint frame_point = cur_frame.origin;
++ NSSize frame_extents = cur_frame.size;
++ CGFloat scale_factor = [self.window userSpaceScaleFactor];
++ NSPoint conv_frame_point = NSMakePoint (frame_point.x * scale_factor, frame_point.y * scale_factor);
++ NSSize conv_frame_extents = NSMakeSize (frame_extents.width * scale_factor, frame_extents.height * scale_factor);
++ NSRect conv_frame = NSMakeRect (conv_frame_point.x, conv_frame_point.y, conv_frame_extents.width, conv_frame_extents.height);
++ //return [self.window convertRectToBacking:[self frame]];
++ return conv_frame;
+ }
+
+ - (BOOL)canHideCursor
</ins></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewhremoveNSDraggingDestinationprotocoldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.h-remove-NSDraggingDestination-protocol.diff (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.h-remove-NSDraggingDestination-protocol.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.h-remove-NSDraggingDestination-protocol.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- video/out/cocoa/view.h.old
-+++ video/out/cocoa/view.h
-@@ -18,7 +18,7 @@
- #import <Cocoa/Cocoa.h>
- #import "video/out/cocoa/mpvadapter.h"
-
--@interface MpvVideoView : NSView <NSDraggingDestination> {
-+@interface MpvVideoView : NSView {
- BOOL hasMouseDown;
- }
- @property(nonatomic, retain) MpvCocoaAdapter *adapter;
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertPointToBackingwithuserSpaceScaleFactordiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- video/out/cocoa/view.m.old
-+++ video/out/cocoa/view.m
-@@ -165,7 +165,9 @@
- - (NSPoint)convertPointToPixels:(NSPoint)point
- {
- point = [self convertPoint:point fromView:nil];
-- point = [self convertPointToBacking:point];
-+ CGFloat scale_factor = [self.window userSpaceScaleFactor];
-+ //point = [self convertPointToBacking:point];
-+ point = NSMakePoint (point.x * scale_factor, point.y * scale_factor);
- // flip y since isFlipped returning YES doesn't affect the backing
- // coordinate system
- point.y = -point.y;
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertRectFromScreenwithconvertScreenToBasediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>---- video/out/cocoa/view.m.old
-+++ video/out/cocoa/view.m
-@@ -109,7 +109,12 @@
- - (BOOL)containsMouseLocation
- {
- NSRect vF = [[self.window screen] visibleFrame];
-- NSRect vFW = [self.window convertRectFromScreen:vF];
-+ NSPoint vFStart = vF.origin;
-+ NSPoint vFEnd = NSMakePoint (vFStart.x + vF.size.width, vFStart.y + vF.size.height);
-+ //NSRect vFW = [self.window convertRectFromScreen:vF];
-+ NSPoint vFStartW = [self.window convertScreenToBase:vFStart];
-+ NSPoint vFEndW = [self.window convertScreenToBase:vFEnd];
-+ NSRect vFW = NSMakeRect (vFStartW.x, vFStartW.y, vFEndW.x - vFStartW.x, vFEndW.y - vFStartW.y);
- NSRect vFV = [self convertRect:vFW fromView:nil];
- NSPoint pt = [self convertPoint:[self mouseLocation] fromView:nil];
-
</del></span></pre></div>
<a id="trunkdportsmultimediampvfilespatchvideo_out_cocoa_viewmreplaceconvertRectToBackingwithuserSpaceScaleFactordiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- video/out/cocoa/view.m.old
-+++ video/out/cocoa/view.m
-@@ -130,7 +130,15 @@
-
- - (NSRect)frameInPixels
- {
-- return [self convertRectToBacking:[self frame]];
-+ NSRect cur_frame = self.frame;
-+ NSPoint frame_point = cur_frame.origin;
-+ NSSize frame_extents = cur_frame.size;
-+ CGFloat scale_factor = [self.window userSpaceScaleFactor];
-+ NSPoint conv_frame_point = NSMakePoint (frame_point.x * scale_factor, frame_point.y * scale_factor);
-+ NSSize conv_frame_extents = NSMakeSize (frame_extents.width * scale_factor, frame_extents.height * scale_factor);
-+ NSRect conv_frame = NSMakeRect (conv_frame_point.x, conv_frame_point.y, conv_frame_extents.width, conv_frame_extents.height);
-+ //return [self.window convertRectToBacking:[self frame]];
-+ return conv_frame;
- }
-
- - (BOOL)canHideCursor
</del></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 (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> --- video/out/cocoa/window.m.old
</span><span class="cx"> +++ video/out/cocoa/window.m
</span><del>-@@ -27,6 +27,14 @@
</del><ins>+@@ -30,6 +30,14 @@
+ - (void)setCenteredContentSize:(NSSize)newSize;
+ @end
</ins><span class="cx">
</span><del>- #include "window.h"
-
</del><span class="cx"> +#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
</span><span class="cx"> +enum {
</span><span class="cx"> + NSFullScreenWindowMask = 0,
</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 (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- video/out/gl_cocoa.c.old
</span><span class="cx"> +++ video/out/gl_cocoa.c
</span><del>-@@ -56,6 +56,8 @@
</del><ins>+@@ -49,6 +49,8 @@
</ins><span class="cx"> struct cgl_context *p = ctx->priv;
</span><span class="cx"> CGLError err;
</span><span class="cx">
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> CGLOpenGLProfile gl_vers_map[] = {
</span><span class="cx"> [2] = kCGLOGLPVersion_Legacy,
</span><span class="cx"> #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
</span><del>-@@ -66,15 +68,24 @@
</del><ins>+@@ -59,15 +61,24 @@
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</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 (129458 => 129459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2014-12-13 13:23:35 UTC (rev 129458)
+++ trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2014-12-13 13:49:48 UTC (rev 129459)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- waftools/checks/custom.py.old
</span><span class="cx"> +++ waftools/checks/custom.py
</span><del>-@@ -123,7 +123,6 @@
</del><ins>+@@ -103,7 +103,6 @@
</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'],
</span></span></pre>
</div>
</div>
</body>
</html>