youtube-dl fix

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

youtube-dl fix

Stuart Henderson
Update and apply a patch from a pull request to unbreak youtube.
OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/youtube-dl/Makefile,v
retrieving revision 1.160
diff -u -p -r1.160 Makefile
--- Makefile 23 Dec 2016 08:07:54 -0000 1.160
+++ Makefile 31 Jan 2017 13:51:26 -0000
@@ -2,7 +2,7 @@
 
 COMMENT = CLI program to download videos from YouTube and other sites
 
-VERSION = 2016.12.22
+VERSION = 2017.01.29
 MODPY_EGG_VERSION = ${VERSION:S/.0/./g}
 
 DISTNAME = youtube-dl-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/youtube-dl/distinfo,v
retrieving revision 1.148
diff -u -p -r1.148 distinfo
--- distinfo 23 Dec 2016 08:07:54 -0000 1.148
+++ distinfo 31 Jan 2017 13:51:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2016.12.22.tar.gz) = 9bxesa8XORt6HaeV9BgcNwL7LB2iZosl8SYNvbqIJSQ=
-SIZE (youtube-dl-2016.12.22.tar.gz) = 2502964
+SHA256 (youtube-dl-2017.01.29.tar.gz) = NHU4Did/NRcyLDVYFaHX4COgI6Vls8ckJHyalQnrOm4=
+SIZE (youtube-dl-2017.01.29.tar.gz) = 2545198
Index: patches/patch-youtube_dl_extractor_youtube_py
===================================================================
RCS file: patches/patch-youtube_dl_extractor_youtube_py
diff -N patches/patch-youtube_dl_extractor_youtube_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-youtube_dl_extractor_youtube_py 31 Jan 2017 13:51:26 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+https://github.com/rg3/youtube-dl/pull/11892
+
+--- youtube_dl/extractor/youtube.py.orig Tue Jan 31 13:48:23 2017
++++ youtube_dl/extractor/youtube.py Tue Jan 31 13:49:04 2017
+@@ -1028,7 +1028,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
+
+     def _parse_sig_js(self, jscode):
+         funcname = self._search_regex(
+-            r'\.sig\|\|([a-zA-Z0-9$]+)\(', jscode,
++            r'"signature",\s?([a-zA-Z0-9$]+)\(', jscode,
+             'Initial JS player signature function name')
+
+         jsi = JSInterpreter(jscode)
+@@ -1050,6 +1050,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
+
+         if player_url.startswith('//'):
+             player_url = 'https:' + player_url
++        elif player_url.startswith('/'):
++            player_url = 'https://youtube.com' + player_url
+         try:
+             player_id = (player_url, self._signature_cache_id(s))
+             if player_id not in self._player_cache:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/youtube-dl/pkg/PLIST,v
retrieving revision 1.104
diff -u -p -r1.104 PLIST
--- pkg/PLIST 23 Dec 2016 08:07:54 -0000 1.104
+++ pkg/PLIST 31 Jan 2017 13:51:26 -0000
@@ -115,6 +115,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/audiomack.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/awaan.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/awaan.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/azmedien.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/azmedien.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/azubu.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/azubu.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/baidu.py
@@ -125,6 +127,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/bandcamp.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/bbc.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/bbc.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/beampro.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/beampro.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/beatport.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/beatport.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/beeg.py
@@ -303,6 +307,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/discovery.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/discoverygo.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/discoverygo.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/disney.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/disney.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/dispeak.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/dispeak.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/dotsub.py
@@ -335,6 +341,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ebaumsworld.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/echomsk.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/echomsk.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/egghead.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/egghead.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ehow.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ehow.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/eighttracks.py
@@ -423,8 +431,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freesound.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freespeech.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freespeech.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freevideo.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/freevideo.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funimation.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funimation.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/funnyordie.py
@@ -499,6 +505,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/historicfilms.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/hitbox.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/hitbox.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/hitrecord.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/hitrecord.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/hornbunny.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/hornbunny.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/hotnewhiphop.py
@@ -527,6 +535,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/imgur.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ina.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ina.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/inc.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/inc.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/indavideo.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/indavideo.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/infoq.py
@@ -541,6 +551,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/iqiyi.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ir90tv.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ir90tv.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/itv.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/itv.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ivi.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ivi.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/ivideon.py
@@ -879,6 +891,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/porn91.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/porncom.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/porncom.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornflip.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornflip.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornhd.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornhd.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/pornhub.py
@@ -997,8 +1011,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/screencast.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/screencastomatic.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/screencastomatic.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/screenjunkies.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/screenjunkies.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/seeker.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/seeker.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/senateisvp.py
@@ -1013,8 +1025,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/shahid.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/shared.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/shared.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sharesix.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sharesix.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/showroomlive.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/showroomlive.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sina.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sina.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/sixplay.py
@@ -1193,6 +1205,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tv3.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tv4.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tv4.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tva.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tva.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tvanouvelles.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tvanouvelles.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/tvc.py
@@ -1269,6 +1283,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/vidbit.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/viddler.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/viddler.pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videa.py
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videa.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videodetective.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videodetective.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videofyme.py
@@ -1279,8 +1295,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videomore.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videopremium.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videopremium.pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videott.py
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/videott.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/vidio.py
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/vidio.pyc
 lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/vidme.py

Reply | Threaded
Open this post in threaded view
|

Re: youtube-dl fix

Jeremie Courreges-Anglas-2
Stuart Henderson <[hidden email]> writes:

> Update and apply a patch from a pull request to unbreak youtube.
> OK?

Works for me, ok jca@

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: youtube-dl fix

Davide Gerhard

On Tuesday, 31/01/2017 16:03 GMT, Jeremie Courreges-Anglas wrote:

> Stuart Henderson <[hidden email]> writes:
>
>> Update and apply a patch from a pull request to unbreak youtube.
>> OK?
>
> Works for me, ok jca@

works also for me. tested on amd64 -current.

Reply | Threaded
Open this post in threaded view
|

Re: youtube-dl fix

Stuart Henderson
In reply to this post by Jeremie Courreges-Anglas-2
On 2017/01/31 17:03, Jeremie Courreges-Anglas wrote:
> Stuart Henderson <[hidden email]> writes:
>
> > Update and apply a patch from a pull request to unbreak youtube.
> > OK?
>
> Works for me, ok jca@

Ah, upstream have made a release with a modified version in, closing
19 dup tickets with the commit(!), so I'll go for the new release
rather than patching.