[129459] trunk/dports/multimedia/mpv

ionic at macports.org ionic at macports.org
Sat Dec 13 05:49:48 PST 2014


Revision: 129459
          https://trac.macports.org/changeset/129459
Author:   ionic at macports.org
Date:     2014-12-13 05:49:48 -0800 (Sat, 13 Dec 2014)
Log Message:
-----------
mpv: update to 0.7.1. Apply 10.6 patches cleanly against changes base.

Modified Paths:
--------------
    trunk/dports/multimedia/mpv/Portfile
    trunk/dports/multimedia/mpv/files/config-maintainer
    trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff
    trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff

Added Paths:
-----------
    trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff
    trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff

Removed Paths:
-------------
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.h-remove-NSDraggingDestination-protocol.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff

Modified: trunk/dports/multimedia/mpv/Portfile
===================================================================
--- 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)
@@ -6,7 +6,7 @@
 PortGroup               waf 1.0
 
 # Please revbump mpv whenever ffmpeg{,-devel} is updated!
-github.setup            mpv-player mpv 0.6.2 v
+github.setup            mpv-player mpv 0.7.1 v
 revision                0
 categories              multimedia
 license                 GPL-2+
@@ -22,14 +22,13 @@
                         and even H.264 movies.
 homepage                http://www.mpv.io/
 
-checksums               rmd160  9440f1e9d6c7a6118d156d1a39f081cf4aee40a2 \
-                        sha256  0e7890be66ec4686cfc6cbbb16dc8411bdf6be16f866c5e7a048ca78331f5a75
+checksums               rmd160  0c34377f400bdb05536666866418442c32792866 \
+                        sha256  e7aa04852944eae4ebe0c38da83093e757f04741b98b3dd2cc4c2cdd3cea3e91
 
 depends_build           path:bin/pkg-config:pkgconfig
 depends_lib             path:lib/libavcodec.dylib:ffmpeg \
                         path:bin/perl:perl5 \
                         port:libiconv \
-                        port:ncurses \
                         port:zlib \
                         port:libass \
                         port:libbluray \
@@ -43,12 +42,15 @@
 # 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
+patchfiles              patch-video_out_gl_common.h-use-OpenGL-legacy.diff \
+                        patch-TOOLS_osxbundle.py-replace-sed-call.diff
 
 universal_variant       no
 
 default_variants        +bundle +network +osd +mp3 +opengl +dvd
 
+# Current waf doesn't support --nocache anymore. Set by PortGroup.
+configure.args-delete   --nocache
 
 # Default configuration options. Mostly Mac OS X specific.
 configure.args-append   --enable-manpage-build \
@@ -63,15 +65,15 @@
 # This list should be expanded each time the port is updated to a
 # new version, disabling any newly added options.
 configure.args-append   --disable-pdf-build \
-                        --disable-macosx-bundle \
                         --disable-debug-build \
                         --disable-libsmbclient \
                         --disable-libass-osd \
-                        --disable-libquvi \
                         --disable-lirc \
                         --disable-dvdread \
                         --disable-dvdnav \
                         --disable-cdda \
+                        --disable-vapoursynth \
+                        --disable-vapoursynth-lazy \
                         --disable-enca \
                         --disable-mpg123 \
                         --disable-pulse \
@@ -84,12 +86,14 @@
                         --disable-xext \
                         --disable-xv \
                         --disable-gl-x11 \
+                        --disable-egl-x11 \
                         --disable-xinerama \
                         --disable-xrandr \
                         --disable-caca \
                         --disable-jpeg \
                         --disable-tv \
-                        --disable-lua
+                        --disable-lua \
+                        --disable-apple-remote
 
 # Fix picking up the correct talloc version.
 # -isystem has the added benefit of moving the include
@@ -100,7 +104,7 @@
 configure.cppflags-replace  -I${prefix}/include -isystem${prefix}/include
 
 # clang is required to build mpv. The newer, the merrier.
-# Hopefully fixes #44662 on SL.
+# Part of getting mpv to work on SL -- c.f. #44662
 compiler.blacklist-append   *gcc* cc
 
 compiler.fallback-delete    macports-clang-3.4
@@ -110,6 +114,13 @@
 compiler.fallback-delete    clang macports-clang-3.3
 compiler.fallback-append    clang macports-clang-3.3
 
+build.args-append           -v
+
+platform macosx {
+    configure.args-replace  --disable-apple-remote \
+                            --enable-apple-remote
+}
+
 platform darwin {
     notes-append    "
                      The maintainer ships his personal config file in
@@ -148,11 +159,11 @@
     if {${os.major} < 11} {
         patchfiles-append   patch-waftools_checks_custom.py-disable-libarclite.diff \
                             patch-misc-add-strnlen.diff \
-                            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 \
+                            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 \
                             patch-video_out_cocoa_window.m-fullscreen-fixes.diff \
                             patch-video_out_cocoa_common.m-define-constants.diff \
                             patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff \
@@ -168,11 +179,23 @@
                        Please do not expect it to work or be bug free.
         }
     }
+
+    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
+        }
+    }
 }
 
 
 # Shameless copy from ipe-tools.
-set python.versions         {27 32 33 34}
+set python.versions         {27 34}
 set python.default_version  27
 
 # Create python variants.
@@ -211,12 +234,6 @@
     }
 }
 
-post-extract {
-    if {${os.platform} eq "darwin"} {
-        xinstall -m 0644 -W ${filespath} config-maintainer ${worksrcpath}/TOOLS/
-    }
-}
-
 post-patch {
     set python_ver_dot [join [split ${python.version} {}] "."]
     reinplace -W "${worksrcpath}" "s|'rst2man'|'rst2man-${python_ver_dot}'|" wscript
@@ -242,11 +259,6 @@
         xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer \
                          ${destroot}${prefix}/share/examples/${name}
     }
-
-    if {[variant_isset bundle]} {
-        xinstall -d -m 0755 ${destroot}${applications_dir}
-        file rename ${destroot}${prefix}/bin/mpv.app ${destroot}${applications_dir}
-    }
 }
 
 
@@ -254,14 +266,16 @@
 # "enable" flags in order to make the waf build system error out in case
 # a feature cannot be used/found. Problems like that indicate a missing
 # runtime dependency.
-# 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.
 
 variant bundle description {Enable the optional Mac OS X bundle of mpv} {
-    configure.args-replace  --disable-macosx-bundle \
-                            --enable-macosx-bundle
+    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}
+    }
 }
 
 variant screenshot description {Enable optional screenshot support} {
@@ -270,10 +284,8 @@
                             --enable-jpeg
 }
 
-variant network description {Enable networking support via libquvi-scripts} {
-    depends_lib-append      port:libquvi \
-                            port:libquvi-scripts
-    configure.args-delete   --disable-libquvi
+variant network description {Enable networking support via youtube-dl (supports wide variety of pages)} {
+    depends_run-append      port:youtube-dl
 }
 
 variant lirc description {Enable Linux Infrared Remote Daemon support} {
@@ -362,6 +374,10 @@
                             --enable-gl-cocoa
 
     if {[variant_isset x11]} {
+        # 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
         depends_lib-append      port:mesa
         configure.args-replace  --disable-gl-x11 \
                                 --enable-gl-x11

Modified: trunk/dports/multimedia/mpv/files/config-maintainer
===================================================================
--- 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)
@@ -18,3 +18,6 @@
 #alang=en,eng,de,ger
 
 cache=50700
+
+@@NETWORK@@ytdl
+@@NETWORK@@ytdl-format=best

Added: trunk/dports/multimedia/mpv/files/patch-TOOLS_osxbundle.py-replace-sed-call.diff
===================================================================
--- 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)
@@ -0,0 +1,20 @@
+--- 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()

Added: trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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"

Modified: trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
===================================================================
--- 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)
@@ -57,11 +57,11 @@
 +#endif
 --- wscript_build.py.old
 +++ wscript_build.py
-@@ -385,6 +385,7 @@
-         ( "osdep/ar/HIDRemote.m",                "cocoa" ),
+@@ -379,6 +379,7 @@
+         ( "osdep/ar/HIDRemote.m",                "apple-remote" ),
          ( "osdep/macosx_application.m",          "cocoa-application" ),
          ( "osdep/macosx_events.m",               "cocoa" ),
 +        ( "osdep/macosx_compat.m" ),
          ( "osdep/semaphore_osx.c" ),
-         ( "osdep/path-macosx.m",                 "cocoa" ),
-         ( "osdep/path-win.c",                    "os-win32" ),
+         ( "osdep/subprocess-posix.c",            "posix-spawn" ),
+         ( "osdep/subprocess-win.c",              "os-win32" ),

Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff
===================================================================
--- 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)
@@ -1,9 +1,9 @@
 --- video/out/cocoa_common.m.old
 +++ video/out/cocoa_common.m
-@@ -48,6 +48,14 @@
+@@ -52,6 +52,14 @@
+ #define cocoa_lock(s)    pthread_mutex_lock(&s->mutex)
+ #define cocoa_unlock(s)  pthread_mutex_unlock(&s->mutex)
  
- #define CF_RELEASE(a) if ((a) != NULL) CFRelease(a)
- 
 +/* not used on OS X < 10.8 */
 +#if !defined(MAC_OS_X_VERSION_10_8) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
 +#define kIOPMAssertionTypePreventUserIdleDisplaySleep CFSTR("PreventUserIdleDisplaySleep")
@@ -13,5 +13,5 @@
 +#endif
 +
  static void vo_cocoa_fullscreen(struct vo *vo);
- static void vo_cocoa_ontop(struct vo *vo);
  static void cocoa_change_profile(struct vo *vo, char **store, NSScreen *screen);
+ static void cocoa_rm_fs_screen_profile_observer(struct vo *vo);

Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
 --- video/out/cocoa_common.m.old
 +++ video/out/cocoa_common.m
-@@ -553,6 +553,8 @@
+@@ -580,6 +580,8 @@
      CGDirectDisplayID displayID = (CGDirectDisplayID)
          [[screen deviceDescription][@"NSScreenNumber"] unsignedLongValue];
  
@@ -9,7 +9,7 @@
      CFUUIDRef uuid = CGDisplayCreateUUIDFromDisplayID(displayID);
      if (CFGetTypeID(uuid) == CFNullGetTypeID()) {
          MP_ERR(s, "cannot get display UUID.\n");
-@@ -617,6 +619,23 @@
+@@ -644,6 +646,23 @@
     if (!result)
         MP_ERR(s, "cannot get display profile path.\n");
  

Added: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.h-remove-NSDraggingDestination-protocol.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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"
+ 
+- at interface MpvEventsView : NSView <NSDraggingDestination>
++ at interface MpvEventsView : NSView
+ @property(nonatomic, retain) MpvCocoaAdapter *adapter;
+ - (void)setFullScreen:(BOOL)willBeFullscreen;
+ - (BOOL)canHideCursor;

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)
===================================================================
--- 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)
@@ -0,0 +1,13 @@
+--- 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;

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)
===================================================================
--- 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)
@@ -0,0 +1,16 @@
+--- 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];
+ 

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)
===================================================================
--- 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)
@@ -0,0 +1,19 @@
+--- 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

Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.h-remove-NSDraggingDestination-protocol.diff
===================================================================
--- 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)
@@ -1,11 +0,0 @@
---- 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"
- 
-- at interface MpvVideoView : NSView <NSDraggingDestination> {
-+ at interface MpvVideoView : NSView {
-     BOOL hasMouseDown;
- }
- @property(nonatomic, retain) MpvCocoaAdapter *adapter;

Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertPointToBacking-with-userSpaceScaleFactor.diff
===================================================================
--- 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)
@@ -1,13 +0,0 @@
---- 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;

Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff
===================================================================
--- 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)
@@ -1,16 +0,0 @@
---- 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];
- 

Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff
===================================================================
--- 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)
@@ -1,19 +0,0 @@
---- 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

Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_window.m-fullscreen-fixes.diff
===================================================================
--- 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)
@@ -1,9 +1,9 @@
 --- video/out/cocoa/window.m.old
 +++ video/out/cocoa/window.m
-@@ -27,6 +27,14 @@
+@@ -30,6 +30,14 @@
+ - (void)setCenteredContentSize:(NSSize)newSize;
+ @end
  
- #include "window.h"
- 
 +#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 +enum {
 +    NSFullScreenWindowMask = 0,

Modified: trunk/dports/multimedia/mpv/files/patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
 --- video/out/gl_cocoa.c.old
 +++ video/out/gl_cocoa.c
-@@ -56,6 +56,8 @@
+@@ -49,6 +49,8 @@
      struct cgl_context *p = ctx->priv;
      CGLError err;
  
@@ -9,7 +9,7 @@
      CGLOpenGLProfile gl_vers_map[] = {
          [2] = kCGLOGLPVersion_Legacy,
          #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
-@@ -66,15 +68,24 @@
+@@ -59,15 +61,24 @@
          #endif
      };
  

Modified: trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
 --- waftools/checks/custom.py.old
 +++ waftools/checks/custom.py
-@@ -123,7 +123,6 @@
+@@ -103,7 +103,6 @@
          fragment         = load_fragment('cocoa.m'),
          compile_filename = 'test.m',
          framework_name   = ['Cocoa', 'IOKit', 'OpenGL'],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141213/188a0dc1/attachment-0001.html>


More information about the macports-changes mailing list