From nobody Thu Mar 10 18:07:41 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6E15D19FED4A; Thu, 10 Mar 2022 18:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KDxqd2ZbLz4fQF; Thu, 10 Mar 2022 18:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646935661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lSAFyT+pvofwIFapYiKMoaRD0lGlLf5JXhDZ8yVN+wI=; b=sTiwPlVxnzTgKP3xYxrjROCrfL3xc1F8NEJFC2voIwT6KFWxUIkd/PafPOCf6GJ4tcq4KT 6w557EkeKSbqlSFJRjvOKDykg1QwJUoIzEo60zis2dY2dBRDKvtSeev6jnVLlAIZfAvhHT ya8JP1UXUe+UfbTZBvM2v3pewx8mG5uX1jlMpPsGMBHKdzmJ7UpPb/hH1AJjAA2Omf4ES/ TbixQHwSSqy7smJz5gF7dZWdQkxviD1bIo33oJP98ZviUDfHfj6f2QLlTUP3+2YpsdIgQp SSBoxjQs2+JyK6oJ/FnBE6OiqSI4atLiwdbfQU5UY1jluJDbmpNmH4iPw/UQCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A1751AA1; Thu, 10 Mar 2022 18:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22AI7fiD071518; Thu, 10 Mar 2022 18:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22AI7f44071517; Thu, 10 Mar 2022 18:07:41 GMT (envelope-from git) Date: Thu, 10 Mar 2022 18:07:41 GMT Message-Id: <202203101807.22AI7f44071517@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: d7277abb83fa - main - multimedia/streamlink: Revert version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7277abb83fad9e3a348d158f9bf9cd79853a922 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646935661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lSAFyT+pvofwIFapYiKMoaRD0lGlLf5JXhDZ8yVN+wI=; b=KcYq3gQNuxLy+2nL6R9wqgPhFMAAe94Kyu2H26iZXig/FDmMOrWe7WaKZG2JhnBtxUesKI OByL3Lw95WF4jQ/DMPRHoVhVLZJEuGs+gfFrCuyfOiThMTLm6hmT++CS2Sleo6qGjicAma s0I66oi8g2T63wJ6YbnuhzfbytZrrq/ZWeuHiM8KnPzbCJMNIs5OKSsueQgMyhxiqHDSoT 05UZ8ZimbDQp2ZHLNAl2vFtIpikkeyROi+aaeOZzkkP2FcoUHPGdnSuPdghDssRZlERawk N8Cg1/2hEnTHQ2VPGq2YRSFjPhT8dXhA1UEQBJqsP0vaxt57sCq9QlRcx6cjeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646935661; a=rsa-sha256; cv=none; b=xX2mSmJRxBq29ZwMkJJRBp25eWHQGca3IRUV4LJxgHJI7MXbiNLtHg7ROZ6nVAsmusuhmv bvUQPgXqNSN3G0G8UzmYkkCDaHoXnXbc4giVzV5fE69JM+Svgl3NspjpdGoDfGKpvgtue2 iPby6qWFG1kNIfg8zS4Fx6QDtERFA5iw3eB1qn4S15Q8bhPkAhR2w/L3IC24gFO/jIPbMS BySVVYEuQSOfFoHRxbE+vPfC0F8k00aV4nTEgXARFlt6gwzZSEiYR6O646g5pTYjIjLdj0 YN/1HBuGejFSCFHdMAPadEvhUgkznHlcx34CLoCGQV6yExMfW6O+Y+7Hi1Zf2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7277abb83fad9e3a348d158f9bf9cd79853a922 commit d7277abb83fad9e3a348d158f9bf9cd79853a922 Author: Neel Chauhan AuthorDate: 2022-03-10 18:07:14 +0000 Commit: Neel Chauhan CommitDate: 2022-03-10 18:07:14 +0000 multimedia/streamlink: Revert version Not all updates to dependencies were committed. This reverts commit a6976a7dda52e65445ed95bd1c3cacefb9566545. --- multimedia/streamlink/Makefile | 45 ++++++++++++++++++++++++----------------- multimedia/streamlink/distinfo | 6 +++--- multimedia/streamlink/pkg-descr | 11 +++++++--- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/multimedia/streamlink/Makefile b/multimedia/streamlink/Makefile index 3705afaa2e90..14afea460139 100644 --- a/multimedia/streamlink/Makefile +++ b/multimedia/streamlink/Makefile @@ -1,5 +1,5 @@ PORTNAME= streamlink -DISTVERSION= 3.2.0 +PORTVERSION= 2.1.2 CATEGORIES= multimedia MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,31 +10,40 @@ COMMENT= Command-line utility that pipes video streams LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}country>0:devel/py-country@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}isodate>0:devel/py-isodate@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}lxml>=4.6.4:devel/py-lxml@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>0:devel/py-isodate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4.3:security/py-pycryptodome@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.26.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}websocket-client>=1.2.1:www/py-websocket-client@${PY_FLAVOR} - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>=1.0.0:devel/py-freezegun@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.58.0:www/py-websocket-client@${PY_FLAVOR} + +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>0:devel/py-backports@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}country>0:devel/py-country@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-mock>0:www/py-requests-mock@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils -TEST_ENV= PYTHONPATH=${WRKSRC}/src - NO_ARCH= yes -OPTIONS_DEFINE= FFMPEG -OPTIONS_DEFAULT= FFMPEG - -FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg - -do-test: - @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} pytest -v -ra) +OPTIONS_DEFINE= FFMPEG PYCOUNTRY RTMPDUMP +OPTIONS_DEFAULT= FFMPEG RTMPDUMP +.if !exists(../../textproc/py-iso3166/Makefile) +OPTIONS_DEFAULT+= PYCOUNTRY +.endif +PYCOUNTRY_DESC= Use pycountry instead of py-iso-639 and py-iso3166 + +FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg +PYCOUNTRY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}country>0:devel/py-country@${PY_FLAVOR} +PYCOUNTRY_RUN_DEPENDS_OFF= ${PYTHON_PKGNAMEPREFIX}iso-639>0:textproc/py-iso-639@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso3166>0:textproc/py-iso3166@${PY_FLAVOR} +PYCOUNTRY_MAKE_ENV= STREAMLINK_USE_PYCOUNTRY=1 +RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump + +do-test: .PHONY + cd ${WRKSRC} && ${SETENV} PYTHONPATH=${WRKSRC}/src ${PYTHON_CMD} -u -m pytest -v -ra \ + || ${SETENV} PYTHONPATH=${WRKSRC}/src ${PYTHON_CMD} -um unittest discover -v .include diff --git a/multimedia/streamlink/distinfo b/multimedia/streamlink/distinfo index d18a651c6c60..c4c55e7687b7 100644 --- a/multimedia/streamlink/distinfo +++ b/multimedia/streamlink/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646776784 -SHA256 (streamlink-3.2.0.tar.gz) = 9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926 -SIZE (streamlink-3.2.0.tar.gz) = 517552 +TIMESTAMP = 1621854352 +SHA256 (streamlink-2.1.2.tar.gz) = 5e3be17673ed6b7da359a4636bd1e6961b4e58acb2dd7d219f9aaab377a4c84d +SIZE (streamlink-2.1.2.tar.gz) = 509287 diff --git a/multimedia/streamlink/pkg-descr b/multimedia/streamlink/pkg-descr index 827c2b475c9f..11e71973f472 100644 --- a/multimedia/streamlink/pkg-descr +++ b/multimedia/streamlink/pkg-descr @@ -1,7 +1,12 @@ -Streamlink is a CLI utility which pipes video streams from various services into a video player, such as VLC. +Streamlink is a command-line utility that pipes video streams from various +services into a video player, such as VLC. -The main purpose of streamlink is to avoid resource-heavy and unoptimized websites, while still allowing the user to enjoy various streamed content. +The main purpose of Streamlink is to allow the user to avoid buggy and CPU +heavy flash plugins but still be able to enjoy various streamed content. -Streamlink is a fork of the Livestreamer project. +There is also an API available for developers who want access to the video +stream data. + +This project was forked from Livestreamer, which is no longer maintained. WWW: https://streamlink.github.io/