[138221] trunk/dports/multimedia/mpv

2 Jul 2015

Revision: 138221
          https://trac.macports.org/changeset/138221
Author:   ionic@macports.org
Date:     2015-07-02 09:14:19 -0700 (Thu, 02 Jul 2015)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/dports/multimedia/mpv/Portfile
    trunk/dports/multimedia/mpv/files/patch-audio_out_ao_coreaudio_exclusive.c-compile-fix.diff
    trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff
    trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff
    trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.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_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.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-video_out_cocoa_common.m-port-lightsensor.diff

Modified: trunk/dports/multimedia/mpv/Portfile
===================================================================

--- 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)
@@ -6,8 +6,8 @@
 PortGroup               waf 1.0
 
 # Please revbump mpv whenever ffmpeg{,-devel} is updated!
-github.setup            mpv-player mpv 0.8.3 v
-revision                3
+github.setup            mpv-player mpv 0.9.2 v
+revision                0
 categories              multimedia
 license                 GPL-2+
 maintainers             ionic
@@ -31,8 +31,8 @@
 extract.only-delete     ${waf_distfile}
 
 checksums               ${mpv_distfile} \
-                        rmd160  47b05fed9dfcb8e858e5f1ad1090c6ec392afe8b \
-                        sha256  1dee09eb47bb26241af0f9f267424e078166e5182b5cdc4653d22ceef63bc20d \
+                        rmd160  00f381bc678a7900dcd137507ac93373859a6232 \
+                        sha256  468b86fa56f4d286c227f04cb0fe0f83d0311d55481da671a32296355fe75c9c \
                         ${waf_distfile} \
                         rmd160  d58b790001664fe5f6a720e4ff9ce9f4105d195a \
                         sha256  f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8
@@ -49,7 +49,7 @@
 
 universal_variant       no
 
-default_variants        +bundle +network +osd +mp3 +opengl +dvd +audiocd
+default_variants        +bundle +network +osd +rubberband +opengl +dvd +audiocd
 
 # Current waf doesn't support --nocache anymore. Set by PortGroup.
 configure.args-delete   --nocache
@@ -74,14 +74,13 @@
                         --disable-debug-build \
                         --disable-libsmbclient \
                         --disable-libass-osd \
-                        --disable-lirc \
                         --disable-dvdread \
                         --disable-dvdnav \
                         --disable-cdda \
                         --disable-vapoursynth \
                         --disable-vapoursynth-lazy \
                         --disable-enca \
-                        --disable-mpg123 \
+                        --disable-rubberband \
                         --disable-pulse \
                         --disable-jack \
                         --disable-openal \
@@ -193,6 +192,7 @@
                             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-port-lightsensor.diff \
                             patch-video_out_gl_cocoa.c-hardcode-OpenGL-2.diff \
                             patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
 
@@ -317,10 +317,14 @@
     depends_run-append      port:youtube-dl
 }
 
-variant lirc description {Enable Linux Infrared Remote Daemon support} {
-    depends_lib-append      port:lirc
-    configure.args-replace  --disable-lirc \
-                            --enable-lirc
+# 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.
+                 "
 }
 
 variant dvd description {Enable DVD and DeCSS support} {
@@ -344,12 +348,23 @@
                             --enable-enca
 }
 
-variant mp3 description {Enable mp3 support via mpg123} {
-    depends_lib-append      port:mpg123
-    configure.args-replace  --disable-mpg123 \
-                            --enable-mpg123
+# 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.
+                 "
 }
 
+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
+}
+
 variant pulseaudio description {Enable PulseAudio support} {
     depends_lib-append      port:pulseaudio
     configure.args-replace  --disable-pulse \

Modified: 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	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)
@@ -1,9 +1,9 @@
---- audio/out/ao_coreaudio_exclusive.c.old
+--- audio/out/ao_coreaudio_exclusive.c.orig
 +++ audio/out/ao_coreaudio_exclusive.c
-@@ -35,6 +35,8 @@
-  * when you are wanting to do good buffering of audio).
-  */
+@@ -36,6 +36,8 @@
  
+ #include <CoreAudio/HostTime.h>
+ 
 +#include <unistd.h>
 +
  #include "config.h"

Modified: trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff
===================================================================
--- 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)
@@ -1,6 +1,6 @@
---- common/common.h.old
+--- common/common.h.orig
 +++ common/common.h
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
  
  #include "osdep/compiler.h"
  #include "talloc.h"
@@ -8,7 +8,7 @@
  
  // double should be able to represent this exactly
  #define MP_NOPTS_VALUE (-0x1p+63)
---- common/compat.h.old
+--- /dev/null
 +++ common/compat.h
 @@ -0,0 +1,19 @@
 +#ifndef COMPAT_H
@@ -30,7 +30,7 @@
 +}
 +
 +#endif /* !defined (COMPAT_H) */
---- ta/ta.h.old
+--- ta/ta.h.orig
 +++ ta/ta.h
 @@ -18,6 +18,8 @@
  #include <stdbool.h>

Modified: trunk/dports/multimedia/mpv/files/patch-misc-import-CoreVideo.diff
===================================================================
--- 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)
@@ -1,15 +1,15 @@
---- 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
+--- video/out/cocoa_common.m.orig
++++ video/out/cocoa_common.m
+@@ -22,6 +22,7 @@
  #import <IOKit/pwr_mgt/IOPMLib.h>
+ #import <IOKit/IOKitLib.h>
+ #include <mach/mach.h>
 +#import <CoreVideo/CoreVideo.h>
  
  #import "cocoa_common.h"
  #import "video/out/cocoa/window.h"
---- waftools/fragments/cocoa.m.old	2015-03-06 20:35:34.000000000 +0100
-+++ waftools/fragments/cocoa.m	2015-03-06 20:42:16.000000000 +0100
+--- waftools/fragments/cocoa.m.orig
++++ waftools/fragments/cocoa.m
 @@ -1,6 +1,7 @@
  #import <CoreServices/CoreServices.h>
  #import <OpenGL/OpenGL.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	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)
@@ -1,4 +1,4 @@
---- osdep/macosx_compat.m.old
+--- /dev/null
 +++ osdep/macosx_compat.m
 @@ -0,0 +1,54 @@
 +/*
@@ -55,13 +55,13 @@
 +@end
 +
 +#endif
---- 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 @@
+--- wscript_build.py.orig
++++ wscript_build.py
+@@ -378,6 +378,7 @@ def build(ctx):
          ( "osdep/ar/HIDRemote.m",                "apple-remote" ),
-         ( "osdep/macosx_application.m",          "cocoa-application" ),
+         ( "osdep/macosx_application.m",          "cocoa" ),
          ( "osdep/macosx_events.m",               "cocoa" ),
 +        ( "osdep/macosx_compat.m" ),
          ( "osdep/semaphore_osx.c" ),
+         ( "osdep/subprocess.c" ),
          ( "osdep/subprocess-posix.c",            "posix-spawn" ),
-         ( "osdep/subprocess-win.c",              "os-win32" ),

Added: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff
===================================================================
--- 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)
@@ -0,0 +1,41 @@
+--- 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);
+     }

Modified: 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	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)
@@ -1,5 +1,5 @@
---- 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
+--- video/out/cocoa/events_view.h.orig
++++ video/out/cocoa/events_view.h
 @@ -18,7 +18,7 @@
  #import <Cocoa/Cocoa.h>
  #import "video/out/cocoa/mpvadapter.h"

Modified: 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-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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- video/out/cocoa/events_view.m.orig
++++ video/out/cocoa/events_view.m
+@@ -205,7 +205,9 @@
  - (NSPoint)convertPointToPixels:(NSPoint)point
  {
      point = [self convertPoint:point fromView:nil];

Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_video_view.m-replace-convertRectToBacking-with-userSpaceScaleFactor.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
---- 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
+--- video/out/cocoa/video_view.m.orig
++++ video/out/cocoa/video_view.m
 @@ -38,7 +38,15 @@
  
  - (NSRect)frameInPixels

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	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)
@@ -1,4 +1,4 @@
---- video/out/cocoa/window.m.old
+--- video/out/cocoa/window.m.orig
 +++ video/out/cocoa/window.m
 @@ -30,6 +30,14 @@
  - (void)setCenteredContentSize:(NSSize)newSize;

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	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)
@@ -1,8 +1,8 @@
 Only in mpv-0.8.2/video/out: .gl_common.c.swp
 Only in mpv-0.8.2/video/out: .gl_utils.c.swp
---- video/out/gl_cocoa.c.old	2015-03-06 20:45:08.000000000 +0100
-+++ video/out/gl_cocoa.c	2015-03-06 22:40:39.000000000 +0100
-@@ -60,12 +60,17 @@
+--- video/out/gl_cocoa.c.orig
++++ video/out/gl_cocoa.c
+@@ -61,12 +61,17 @@ static void *cocoa_glgetaddr(const char 
  
  static CGLError test_gl_version(struct vo *vo,
                                  CGLContextObj *ctx,
@@ -22,7 +22,7 @@
          kCGLPFADoubleBuffer,
          kCGLPFAAccelerated,
          #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
-@@ -103,16 +108,22 @@
+@@ -104,16 +109,22 @@ static bool create_gl_context(struct MPG
      struct cgl_context *p = ctx->priv;
      CGLError err;
  
@@ -45,9 +45,9 @@
  
      if (err != kCGLNoError) {
          MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
---- video/out/gl_common.c.old	2015-03-06 20:45:08.000000000 +0100
-+++ video/out/gl_common.c	2015-03-06 23:03:33.000000000 +0100
-@@ -376,6 +376,7 @@
+--- video/out/gl_common.c.orig
++++ video/out/gl_common.c
+@@ -372,6 +372,7 @@ void mpgl_load_functions2(GL *gl, void *
      //       and above.
  
      bool has_legacy = false;
@@ -55,7 +55,7 @@
      if (gl->version >= 300) {
          gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
          gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
-@@ -396,12 +397,15 @@
+@@ -392,12 +393,15 @@ void mpgl_load_functions2(GL *gl, void *
          // includes legacy (except with CONTEXT_FORWARD_COMPATIBLE_BIT_ARB).
          if (gl->version == 300)
              has_legacy = true;
@@ -72,9 +72,9 @@
  
      if (gl->es)
          has_legacy = false;
---- video/out/gl_common.h.old	2015-03-06 20:45:08.000000000 +0100
-+++ video/out/gl_common.h	2015-03-06 22:03:49.000000000 +0100
-@@ -40,7 +40,6 @@
+--- video/out/gl_common.h.orig
++++ video/out/gl_common.h
+@@ -39,7 +39,6 @@
  #if HAVE_GL_COCOA
  #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
  #include <OpenGL/gl.h>
@@ -82,9 +82,9 @@
  #include <OpenGL/glext.h>
  #else
  #include <GL/gl.h>
---- video/out/gl_utils.c.old	2015-03-06 20:45:08.000000000 +0100
-+++ video/out/gl_utils.c	2015-03-06 23:31:33.000000000 +0100
-@@ -83,14 +83,20 @@
+--- video/out/gl_utils.c.orig
++++ video/out/gl_utils.c
+@@ -84,14 +84,20 @@ int glFmt2bpp(GLenum format, GLenum type
          return 2;
      case GL_RGB:
      case GL_BGR:
@@ -105,9 +105,9 @@
          return component_size;
      case GL_RG:
      case GL_LUMINANCE_ALPHA:
---- video/out/gl_video.c.old	2015-03-06 20:45:08.000000000 +0100
-+++ video/out/gl_video.c	2015-03-06 23:40:14.000000000 +0100
-@@ -270,10 +270,10 @@
+--- video/out/gl_video.c.orig
++++ video/out/gl_video.c
+@@ -277,10 +277,10 @@ static const struct fmt_entry gl_byte_fo
  };
  
  static const struct fmt_entry gl_float16_formats[] = {
@@ -122,7 +122,7 @@
  };
  
  static const struct fmt_entry gl_apple_formats[] = {
-@@ -382,12 +382,8 @@
+@@ -416,12 +416,8 @@ const struct m_sub_options gl_video_conf
                      {"rgb10",  GL_RGB10},
                      {"rgb10_a2", GL_RGB10_A2},
                      {"rgb16",  GL_RGB16},

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	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)
@@ -1,6 +1,6 @@
---- 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 @@
+--- waftools/checks/custom.py.orig
++++ waftools/checks/custom.py
+@@ -108,7 +108,6 @@ def check_cocoa(ctx, dependency_identifi
          fragment         = load_fragment('cocoa.m'),
          compile_filename = 'test.m',
          framework_name   = ['Cocoa', 'IOKit', 'OpenGL', 'QuartzCore'],

    

ionic＠macports.org

tags

participants (1)