From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7B13138350 for ; Thu, 2 Apr 2020 10:12:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADF49E0C40; Thu, 2 Apr 2020 10:12:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8CB77E0C40 for ; Thu, 2 Apr 2020 10:12:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DA5234F025 for ; Thu, 2 Apr 2020 10:12:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 512171C6 for ; Thu, 2 Apr 2020 10:12:34 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1585819091.8fd3794e55c8782f342e6ac188c5218b195ae6ee.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: media-video/vidify/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-video/vidify/metadata.xml media-video/vidify/vidify-2.2.0.ebuild X-VCS-Directories: media-video/vidify/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 8fd3794e55c8782f342e6ac188c5218b195ae6ee X-VCS-Branch: master Date: Thu, 2 Apr 2020 10:12:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 66167abf-d956-426c-9be5-48a25066304f X-Archives-Hash: 9cda21e1057b3a55425ff058a59a132c commit: 8fd3794e55c8782f342e6ac188c5218b195ae6ee Author: Andrew Ammerlaan riseup net> AuthorDate: Thu Apr 2 09:18:11 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Apr 2 09:18:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8fd3794e media-video/vidify: do not hardepend on everything we can only use one video/audio player at the time so there is no need to force the user to install all the dependencies Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan riseup.net> media-video/vidify/metadata.xml | 2 ++ media-video/vidify/vidify-2.2.0.ebuild | 35 +++++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/media-video/vidify/metadata.xml b/media-video/vidify/metadata.xml index 13b78b5..bb03a0b 100644 --- a/media-video/vidify/metadata.xml +++ b/media-video/vidify/metadata.xml @@ -9,5 +9,7 @@ Use python-vlc as backend for vidify Use python-mpv as backend for vidify + Use an external network player + Support local MPRIS players diff --git a/media-video/vidify/vidify-2.2.0.ebuild b/media-video/vidify/vidify-2.2.0.ebuild index 66c27c9..dd17701 100644 --- a/media-video/vidify/vidify-2.2.0.ebuild +++ b/media-video/vidify/vidify-2.2.0.ebuild @@ -17,21 +17,23 @@ LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+vlc mpv" +IUSE="dbus vlc mpv zeroconf" -REQUIRED_USE="|| ( vlc mpv )" +REQUIRED_USE="|| ( vlc mpv zeroconf )" RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] dev-python/lyricwikia[${PYTHON_USEDEP}] - dev-python/pydbus[${PYTHON_USEDEP}] - dev-python/qdarkstyle[${PYTHON_USEDEP}] dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}] - dev-python/tekore[${PYTHON_USEDEP}] net-misc/youtube-dl[${PYTHON_USEDEP}] - dev-python/zeroconf[${PYTHON_USEDEP}] + || ( + dev-python/tekore[${PYTHON_USEDEP}] + dev-python/pydbus[${PYTHON_USEDEP}] + ) + dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] ) mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] ) vlc? ( dev-python/python-vlc[${PYTHON_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] ) " distutils_enable_tests unittest @@ -48,6 +50,17 @@ python_prepare_all() { # likely because of the removal of the above tests rm tests/test_api_and_player_data.py || die + # do not hard depend on this + sed -i \ + -e '/qdarkstyle/d' \ + -e '/python-vlc/d' \ + -e '/python-mpv/d' \ + -e '/pydbus/d' \ + -e '/tekore/d' \ + -e '/zeroconf/d' \ + -e '/If PySide2 is installed and PyQt5/,/PyQtWebEngine/d' \ + setup.py || die + distutils-r1_python_prepare_all } @@ -58,9 +71,13 @@ python_test() { pkg_postinst() { xdg_pkg_postinst - use mpv && elog "media-video/vlc is the default vidify player, to use mpv run 'vidify --player mpv' or set 'player = mpv' in the config file" - use vlc && elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors and recompile media-video/vlc with the missing codecs" - use mpv && elog "If video playback is not working please check 'vidify --player mpv --debug' for missing-codec-errors and recompile media-video/mpv with the missing codecs" + elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors and recompile media-video/vlc or media-video/mpv with the missing codecs" + optfeature "using a MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus + optfeature "using the spotify web API as audio player" dev-python/tekore + optfeature "using an external network player" dev-python/zeroconf + optfeature "using media-video/mpv for video playback" dev-python/python-mpv + optfeature "using media-video/vlc for video playback" dev-python/python-vlc + optfeature "'vidify --dark-mode'" dev-python/qdarkstyle optfeature "'vidify --audiosync'" media-video/vidify-audiosync } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 35E1E138350 for ; Thu, 2 Apr 2020 09:18:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D960E0A81; Thu, 2 Apr 2020 09:18:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2367BE0A81 for ; Thu, 2 Apr 2020 09:18:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA1E034EFFE for ; Thu, 2 Apr 2020 09:18:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EA7871 for ; Thu, 2 Apr 2020 09:18:20 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1585819091.8fd3794e55c8782f342e6ac188c5218b195ae6ee.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-video/vidify/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-video/vidify/metadata.xml media-video/vidify/vidify-2.2.0.ebuild X-VCS-Directories: media-video/vidify/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 8fd3794e55c8782f342e6ac188c5218b195ae6ee X-VCS-Branch: dev Date: Thu, 2 Apr 2020 09:18:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2be08a05-3d50-496f-a0b1-dad9d5ed0249 X-Archives-Hash: 390bd7c5486b610fc88b5c994bc1aa43 Message-ID: <20200402091820.jKE0l32Ih-Y6Aqtz9BaLh7RLNzMTtcw65s3GJScNZHc@z> commit: 8fd3794e55c8782f342e6ac188c5218b195ae6ee Author: Andrew Ammerlaan riseup net> AuthorDate: Thu Apr 2 09:18:11 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Apr 2 09:18:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8fd3794e media-video/vidify: do not hardepend on everything we can only use one video/audio player at the time so there is no need to force the user to install all the dependencies Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andrew Ammerlaan riseup.net> media-video/vidify/metadata.xml | 2 ++ media-video/vidify/vidify-2.2.0.ebuild | 35 +++++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/media-video/vidify/metadata.xml b/media-video/vidify/metadata.xml index 13b78b5..bb03a0b 100644 --- a/media-video/vidify/metadata.xml +++ b/media-video/vidify/metadata.xml @@ -9,5 +9,7 @@ Use python-vlc as backend for vidify Use python-mpv as backend for vidify + Use an external network player + Support local MPRIS players diff --git a/media-video/vidify/vidify-2.2.0.ebuild b/media-video/vidify/vidify-2.2.0.ebuild index 66c27c9..dd17701 100644 --- a/media-video/vidify/vidify-2.2.0.ebuild +++ b/media-video/vidify/vidify-2.2.0.ebuild @@ -17,21 +17,23 @@ LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+vlc mpv" +IUSE="dbus vlc mpv zeroconf" -REQUIRED_USE="|| ( vlc mpv )" +REQUIRED_USE="|| ( vlc mpv zeroconf )" RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] dev-python/lyricwikia[${PYTHON_USEDEP}] - dev-python/pydbus[${PYTHON_USEDEP}] - dev-python/qdarkstyle[${PYTHON_USEDEP}] dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}] - dev-python/tekore[${PYTHON_USEDEP}] net-misc/youtube-dl[${PYTHON_USEDEP}] - dev-python/zeroconf[${PYTHON_USEDEP}] + || ( + dev-python/tekore[${PYTHON_USEDEP}] + dev-python/pydbus[${PYTHON_USEDEP}] + ) + dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] ) mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] ) vlc? ( dev-python/python-vlc[${PYTHON_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] ) " distutils_enable_tests unittest @@ -48,6 +50,17 @@ python_prepare_all() { # likely because of the removal of the above tests rm tests/test_api_and_player_data.py || die + # do not hard depend on this + sed -i \ + -e '/qdarkstyle/d' \ + -e '/python-vlc/d' \ + -e '/python-mpv/d' \ + -e '/pydbus/d' \ + -e '/tekore/d' \ + -e '/zeroconf/d' \ + -e '/If PySide2 is installed and PyQt5/,/PyQtWebEngine/d' \ + setup.py || die + distutils-r1_python_prepare_all } @@ -58,9 +71,13 @@ python_test() { pkg_postinst() { xdg_pkg_postinst - use mpv && elog "media-video/vlc is the default vidify player, to use mpv run 'vidify --player mpv' or set 'player = mpv' in the config file" - use vlc && elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors and recompile media-video/vlc with the missing codecs" - use mpv && elog "If video playback is not working please check 'vidify --player mpv --debug' for missing-codec-errors and recompile media-video/mpv with the missing codecs" + elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors and recompile media-video/vlc or media-video/mpv with the missing codecs" + optfeature "using a MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus + optfeature "using the spotify web API as audio player" dev-python/tekore + optfeature "using an external network player" dev-python/zeroconf + optfeature "using media-video/mpv for video playback" dev-python/python-mpv + optfeature "using media-video/vlc for video playback" dev-python/python-vlc + optfeature "'vidify --dark-mode'" dev-python/qdarkstyle optfeature "'vidify --audiosync'" media-video/vidify-audiosync }