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 A39A61382C5 for ; Mon, 8 Jun 2020 13:36:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2DBCE08E5; Mon, 8 Jun 2020 13:36:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 76E7CE08E5 for ; Mon, 8 Jun 2020 13:36:39 +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 2BE7C34F1F0 for ; Mon, 8 Jun 2020 13:36:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8FA921D for ; Mon, 8 Jun 2020 13:36:36 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1591623381.0760144b8a3669115057a865189a919b20ba2cd6.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/mpv-0.32.0-r1.ebuild media-video/mpv/mpv-9999.ebuild X-VCS-Directories: media-video/mpv/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 0760144b8a3669115057a865189a919b20ba2cd6 X-VCS-Branch: master Date: Mon, 8 Jun 2020 13:36:36 +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: 5d76d027-883b-4afd-a262-57128e20ffcc X-Archives-Hash: 335dbb540db4306c30754b4ce4347ea1 commit: 0760144b8a3669115057a865189a919b20ba2cd6 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Jun 8 13:36:03 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon Jun 8 13:36:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0760144b Revert "media-video/mpv: remove doc IUSE" This reverts commit 01ce43d3c5ad20d4a4ce638325100bbcc7f98561. Signed-off-by: Mikle Kolyada gentoo.org> media-video/mpv/mpv-0.32.0-r1.ebuild | 7 ++++--- media-video/mpv/mpv-9999.ebuild | 28 ++++++++++------------------ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/media-video/mpv/mpv-0.32.0-r1.ebuild b/media-video/mpv/mpv-0.32.0-r1.ebuild index e5d4688e0fb..eb6ccc9c653 100644 --- a/media-video/mpv/mpv-0.32.0-r1.ebuild +++ b/media-video/mpv/mpv-0.32.0-r1.ebuild @@ -28,7 +28,7 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug drm dvb +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb dvd +egl gamepad gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" @@ -127,6 +127,7 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig dev-python/docutils cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 ) + doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) " @@ -163,8 +164,8 @@ src_configure() { --disable-optimize # Don't add '-O2' to CFLAGS. $(usex debug '' '--disable-debug-build') - --disable-html-build - --disable-pdf-build + $(use_enable doc html-build) + $(use_enable doc pdf-build) --enable-manpage-build $(use_enable cplugins) $(use_enable test) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index e5d4688e0fb..c714f2d8b0c 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" DOCS=( RELEASE_NOTES ) else EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" @@ -26,11 +26,11 @@ SRC_URI+=" https://waf.io/waf-${WAF_PV}" DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )" +LICENSE="LGPL-2.1+ GPL-2+ BSD ISC" SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug drm dvb - dvd +egl gamepad gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua - luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb + dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua + luajit openal +opengl pulseaudio raspberry-pi rubberband sdl selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" REQUIRED_USE=" @@ -81,10 +81,8 @@ COMMON_DEPEND=" javascript? ( >=dev-lang/mujs-1.0.0 ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) - libass? ( - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] - virtual/ttf-fonts - ) + >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] + virtual/ttf-fonts libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( =media-libs/nv-codec-headers-8.2.15.7 ) + doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) " @@ -163,19 +161,16 @@ src_configure() { --disable-optimize # Don't add '-O2' to CFLAGS. $(usex debug '' '--disable-debug-build') - --disable-html-build - --disable-pdf-build + $(use_enable doc html-build) + $(use_enable doc pdf-build) --enable-manpage-build $(use_enable cplugins) $(use_enable test) $(use_enable iconv) - $(use_enable samba libsmbclient) $(use_enable lua) $(usex luajit '--lua=luajit' '') $(use_enable javascript) - $(use_enable libass) - $(use_enable libass libass-osd) $(use_enable zlib) $(use_enable bluray libbluray) $(use_enable dvd dvdnav) @@ -190,9 +185,6 @@ src_configure() { # Audio outputs: $(use_enable sdl sdl2) # Listed under audio, but also includes video. - $(use_enable oss oss-audio) - --disable-rsound # Only available in overlays. - --disable-sndio # Only available in overlays. $(use_enable pulseaudio pulse) $(use_enable jack) $(use_enable openal)