From owner-svn-ports-all@FreeBSD.ORG Fri Dec 12 17:15:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC14A805; Fri, 12 Dec 2014 17:15:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C76B46B4; Fri, 12 Dec 2014 17:15:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBCHFkZD068850; Fri, 12 Dec 2014 17:15:46 GMT (envelope-from nox@FreeBSD.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBCHFkAA068846; Fri, 12 Dec 2014 17:15:46 GMT (envelope-from nox@FreeBSD.org) Message-Id: <201412121715.sBCHFkAA068846@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: nox set sender to nox@FreeBSD.org using -f From: Juergen Lock Date: Fri, 12 Dec 2014 17:15:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374600 - in head/multimedia/livestreamer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2014 17:15:47 -0000 Author: nox Date: Fri Dec 12 17:15:45 2014 New Revision: 374600 URL: https://svnweb.freebsd.org/changeset/ports/374600 QAT: https://qat.redports.org/buildarchive/r374600/ Log: - Update to 1.11.0 - changelog is here: http://livestreamer.tanuki.se/en/latest/changelog.html#changelog - Cherry-pick twitch.tv fix from git head. [1] Obtained from: https://github.com/chrippa/livestreamer/commit/bbc6d0e7c1a8b6bf053345e88366cae115baa2d3 [1] Added: head/multimedia/livestreamer/files/ head/multimedia/livestreamer/files/patch-bbc6d0e7c1a8b6bf053345e88366cae115baa2d3 (contents, props changed) Modified: head/multimedia/livestreamer/Makefile head/multimedia/livestreamer/distinfo Modified: head/multimedia/livestreamer/Makefile ============================================================================== --- head/multimedia/livestreamer/Makefile Fri Dec 12 17:12:19 2014 (r374599) +++ head/multimedia/livestreamer/Makefile Fri Dec 12 17:15:45 2014 (r374600) @@ -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}/multim USES= python USE_PYTHON= autoplist distutils +PATCH_STRIP= -p1 .include Modified: head/multimedia/livestreamer/distinfo ============================================================================== --- head/multimedia/livestreamer/distinfo Fri Dec 12 17:12:19 2014 (r374599) +++ head/multimedia/livestreamer/distinfo Fri Dec 12 17:15:45 2014 (r374600) @@ -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 Added: head/multimedia/livestreamer/files/patch-bbc6d0e7c1a8b6bf053345e88366cae115baa2d3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/livestreamer/files/patch-bbc6d0e7c1a8b6bf053345e88366cae115baa2d3 Fri Dec 12 17:15:45 2014 (r374600) @@ -0,0 +1,54 @@ +From bbc6d0e7c1a8b6bf053345e88366cae115baa2d3 Mon Sep 17 00:00:00 2001 +From: Christopher Rosell +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)