[135015] trunk/dports/net/youtube-dl

ryandesign at macports.org ryandesign at macports.org
Mon Apr 13 01:43:14 PDT 2015


Revision: 135015
          https://trac.macports.org/changeset/135015
Author:   ryandesign at macports.org
Date:     2015-04-13 01:43:14 -0700 (Mon, 13 Apr 2015)
Log Message:
-----------
youtube-dl: apply an upstream patch

Modified Paths:
--------------
    trunk/dports/net/youtube-dl/Portfile

Added Paths:
-----------
    trunk/dports/net/youtube-dl/files/patch-youtube_dl-extractor-mtv.py.diff

Modified: trunk/dports/net/youtube-dl/Portfile
===================================================================
--- trunk/dports/net/youtube-dl/Portfile	2015-04-13 07:46:50 UTC (rev 135014)
+++ trunk/dports/net/youtube-dl/Portfile	2015-04-13 08:43:14 UTC (rev 135015)
@@ -5,6 +5,7 @@
 
 name                youtube-dl
 version             2015.04.09
+revision            1
 categories          net
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -32,11 +33,14 @@
 
 patchfiles          patch-Makefile.diff \
                     patch-youtube_dl-update.py.diff
+patchfiles-append   patch-youtube_dl-extractor-mtv.py.diff
 patch.args          --backup
 
 post-patch {
-    # Restore the original mtime of update.py (changed by the patch) so that `make` doesn't try to regenerate the documentation with `pandoc`.
-    file mtime ${worksrcpath}/youtube_dl/update.py [file mtime ${worksrcpath}/youtube_dl/update.py.orig]
+    # Restore original mtimes of files changed by the patch so that `make` doesn't try to regenerate the documentation with `pandoc`.
+    foreach f {youtube_dl/extractor/mtv.py youtube_dl/update.py} {
+        file mtime ${worksrcpath}/${f} [file mtime ${worksrcpath}/${f}.orig]
+    }
 }
 
 use_configure       no

Added: trunk/dports/net/youtube-dl/files/patch-youtube_dl-extractor-mtv.py.diff
===================================================================
--- trunk/dports/net/youtube-dl/files/patch-youtube_dl-extractor-mtv.py.diff	                        (rev 0)
+++ trunk/dports/net/youtube-dl/files/patch-youtube_dl-extractor-mtv.py.diff	2015-04-13 08:43:14 UTC (rev 135015)
@@ -0,0 +1,23 @@
+https://github.com/rg3/youtube-dl/issues/5369
+https://github.com/malept/youtube-dl/commit/a4d5b00b6609dbe5f0cf8af919e89e0e32662538
+--- youtube_dl/extractor/mtv.py.orig
++++ youtube_dl/extractor/mtv.py
+@@ -182,7 +182,8 @@ def _real_extract(self, url):
+ 
+         if mgid is None or ':' not in mgid:
+             mgid = self._search_regex(
+-                [r'data-mgid="(.*?)"', r'swfobject.embedSWF\(".*?(mgid:.*?)"'],
++                [r'data-mgid="(.*?)"', r'swfobject.embedSWF\(".*?(mgid:.*?)"',
++                 r'sm4:video:embed.*?' + MTVServicesEmbeddedIE._VALID_URL],
+                 webpage, 'mgid')
+ 
+         videos_info = self._get_videos_info(mgid)
+@@ -191,7 +192,7 @@ def _real_extract(self, url):
+ 
+ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
+     IE_NAME = 'mtvservices:embedded'
+-    _VALID_URL = r'https?://media\.mtvnservices\.com/embed/(?P<mgid>.+?)(\?|/|$)'
++    _VALID_URL = r'https?://media\.mtvnservices\.com/embed/(?P<mgid>.+?)(\?|/|&|$)'
+ 
+     _TEST = {
+         # From http://www.thewrap.com/peter-dinklage-sums-up-game-of-thrones-in-45-seconds-video/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150413/9fbacf11/attachment.html>


More information about the macports-changes mailing list