mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

- Update to 1.11.0 - changelog is here:

Browse Source 
http://livestreamer.tanuki.se/en/latest/changelog.html#changelog

- Cherry-pick twitch.tv fix from git head. [1]

Obtained from:	bbc6d0e7c1 [1]
This commit is contained in:
Juergen Lock 2014-12-12 17:15:45 +00:00
parent cef62f6012
commit 9c64d41eee
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=374600
3 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/livestreamer/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= livestreamer
PORTVERSION= 1.10.2
PORTVERSION= 1.11.0
CATEGORIES= multimedia python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -21,5 +21,6 @@ RUN_DEPENDS= rtmpdump:${PORTSDIR}/multimedia/rtmpdump \
USES= python
USE_PYTHON= autoplist distutils
PATCH_STRIP= -p1
.include <bsd.port.mk>

4
multimedia/livestreamer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (livestreamer-1.10.2.tar.gz) = 50bae61fe2a1ec1df215a825b62ebba508a31d7d54ecb332586feb968d137391
SIZE (livestreamer-1.10.2.tar.gz) = 418516
SHA256 (livestreamer-1.11.0.tar.gz) = 5af677ec93ebce229ac235ea6c23aec915deb4aacc8bdb8418c8488fbdd96920
SIZE (livestreamer-1.11.0.tar.gz) = 421706

54
multimedia/livestreamer/files/patch-bbc6d0e7c1a8b6bf053345e88366cae115baa2d3 Normal file
View File

@ -0,0 +1,54 @@
From bbc6d0e7c1a8b6bf053345e88366cae115baa2d3 Mon Sep 17 00:00:00 2001
From: Christopher Rosell <chrippa@tanuki.se>
Date: Fri, 12 Dec 2014 00:14:43 +0100
Subject: [PATCH] plugins.twitch: Update for API change.
Resolves #633.
---
src/livestreamer/plugins/twitch.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/livestreamer/plugins/twitch.py b/src/livestreamer/plugins/twitch.py
index ca0d2bd..0adc872 100644
--- a/src/livestreamer/plugins/twitch.py
+++ b/src/livestreamer/plugins/twitch.py
@@ -125,8 +125,8 @@ def time_to_offset(t):
class UsherService(object):
- def _create_url(self, endpoint, asset, **extra_params):
- url = "http://usher.twitch.tv/{0}/{1}".format(endpoint, asset)
+ def _create_url(self, endpoint, **extra_params):
+ url = "http://usher.twitch.tv{0}".format(endpoint)
params = {
"player": "twitchweb",
"p": int(random() * 999999),
@@ -145,11 +145,12 @@ def _create_url(self, endpoint, asset, **extra_params):
return req.url
- def select(self, channel, **extra_params):
- return self._create_url("select", channel, **extra_params)
+ def channel(self, channel, **extra_params):
+ return self._create_url("/api/channel/hls/{0}.m3u8".format(channel),
+ **extra_params)
- def vod(self, vod_id, **extra_params):
- return self._create_url("vod", vod_id, **extra_params)
+ def video(self, video_id, **extra_params):
+ return self._create_url("/vod/{0}".format(video_id), **extra_params)
class TwitchAPI(object):
@@ -417,9 +418,9 @@ def _get_hls_streams(self, type="live"):
self._authenticate()
sig, token = self._access_token(type)
if type == "live":
- url = self.usher.select(self.channel, nauthsig=sig, nauth=token)
+ url = self.usher.channel(self.channel, sig=sig, token=token)
elif type == "video":
- url = self.usher.vod(self.video_id, nauthsig=sig, nauth=token)
+ url = self.usher.video(self.video_id, nauthsig=sig, nauth=token)
try:
streams = HLSStream.parse_variant_playlist(self.session, url)