[134922] trunk/dports/multimedia/mpv

ionic at macports.org ionic at macports.org
Fri Apr 10 17:33:32 PDT 2015


Revision: 134922
          https://trac.macports.org/changeset/134922
Author:   ionic at macports.org
Date:     2015-04-10 17:33:32 -0700 (Fri, 10 Apr 2015)
Log Message:
-----------
mpv: update to 0.8.3. Also:

  - Remove icu dependency. Fixes: #47383.
  - Add CD audio support via libcdio-cdparanoia. Fixes: #47408.
  - Add cdaudio to default variants.
  - Add commented-out EGL stuff.
  - Refresh patches using quilt:
    + patch-video_out_cocoa_common.m-define-constants.diff
    + patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff

Modified Paths:
--------------
    trunk/dports/multimedia/mpv/Portfile
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff
    trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff

Modified: trunk/dports/multimedia/mpv/Portfile
===================================================================
--- trunk/dports/multimedia/mpv/Portfile	2015-04-10 22:06:57 UTC (rev 134921)
+++ trunk/dports/multimedia/mpv/Portfile	2015-04-11 00:33:32 UTC (rev 134922)
@@ -6,8 +6,8 @@
 PortGroup               waf 1.0
 
 # Please revbump mpv whenever ffmpeg{,-devel} is updated!
-github.setup            mpv-player mpv 0.8.2 v
-revision                1
+github.setup            mpv-player mpv 0.8.3 v
+revision                0
 categories              multimedia
 license                 GPL-2+
 maintainers             ionic
@@ -31,8 +31,8 @@
 extract.only-delete     ${waf_distfile}
 
 checksums               ${mpv_distfile} \
-                        rmd160  bb747edd8badb1904d2873b9269dcbedb1e2473d \
-                        sha256  ed758577aff6c18fcd087b0281d263729a3e32af2f8f45eca32b1de6d8a41ffc \
+                        rmd160  47b05fed9dfcb8e858e5f1ad1090c6ec392afe8b \
+                        sha256  1dee09eb47bb26241af0f9f267424e078166e5182b5cdc4653d22ceef63bc20d \
                         ${waf_distfile} \
                         rmd160  d58b790001664fe5f6a720e4ff9ce9f4105d195a \
                         sha256  f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8
@@ -45,12 +45,11 @@
                         port:libass \
                         port:libbluray \
                         port:lcms2 \
-                        port:ossp-uuid \
-                        port:icu
+                        port:ossp-uuid
 
 universal_variant       no
 
-default_variants        +bundle +network +osd +mp3 +opengl +dvd
+default_variants        +bundle +network +osd +mp3 +opengl +dvd +audiocd
 
 # Current waf doesn't support --nocache anymore. Set by PortGroup.
 configure.args-delete   --nocache
@@ -316,12 +315,10 @@
                             --enable-dvdnav
 }
 
-variant audiocd description {Enable Audio CD support via libcdio-paranoia (currently unsupported!)} {
-    #depends_lib-append      port:libcdio-paranoia
-    #configure.args-replace   --disable-cdda \
-                              --enable-cdda
-    ui_error "Audio CD support is currently disabled due to a missing libcdio-paranoia port."
-    error "audiocd variant not supported"
+variant audiocd description {Enable Audio CD support via libcdio-paranoia} {
+    depends_lib-append      port:libcdio-paranoia
+    configure.args-replace   --disable-cdda \
+                             --enable-cdda
 }
 
 variant enca description {Enable encoding support via ENCA} {
@@ -385,13 +382,12 @@
                             --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
+        # FIXME: add EGL? Leave it disabled? Test!
+        #configure.args-replace  --disable-egl-x11 \
+        #                        --enable-egl-x11
     }
 }
 

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	2015-04-10 22:06:57 UTC (rev 134921)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff	2015-04-11 00:33:32 UTC (rev 134922)
@@ -1,6 +1,6 @@
---- video/out/cocoa_common.m.old	2015-03-04 04:53:56.000000000 +0100
-+++ video/out/cocoa_common.m	2015-03-04 04:55:08.000000000 +0100
-@@ -51,6 +51,14 @@
+--- video/out/cocoa_common.m.orig
++++ video/out/cocoa_common.m
+@@ -52,6 +52,14 @@
  #define cocoa_lock(s)    pthread_mutex_lock(&s->mutex)
  #define cocoa_unlock(s)  pthread_mutex_unlock(&s->mutex)
  
@@ -13,5 +13,5 @@
 +#endif
 +
  static void vo_cocoa_fullscreen(struct vo *vo);
- static void cocoa_rm_fs_screen_profile_observer(struct vo *vo);
+ static void cocoa_rm_fs_screen_profile_observer(struct vo_cocoa_state *s);
  

Modified: 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_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff	2015-04-10 22:06:57 UTC (rev 134921)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_events_view.m-replace-convertRectFromScreen-with-convertScreenToBase.diff	2015-04-11 00:33:32 UTC (rev 134922)
@@ -1,6 +1,6 @@
---- video/out/cocoa/events_view.m.old	2015-03-04 04:46:21.000000000 +0100
-+++ video/out/cocoa/events_view.m	2015-03-04 04:48:00.000000000 +0100
-@@ -134,7 +134,12 @@
+--- video/out/cocoa/events_view.m.orig
++++ video/out/cocoa/events_view.m
+@@ -133,7 +133,12 @@
  - (BOOL)containsMouseLocation
  {
      NSRect vF  = [[self.window screen] visibleFrame];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150410/e7bee764/attachment-0001.html>


More information about the macports-changes mailing list