commit: 0760144b8a3669115057a865189a919b20ba2cd6
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 13:36:03 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> 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 <zlogene <AT> 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? ( <dev-lang/lua-5.3:= )
@@ -94,7 +92,6 @@ COMMON_DEPEND="
pulseaudio? ( media-sound/pulseaudio )
raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
rubberband? ( >=media-libs/rubberband-1.8.0 )
- samba? ( net-fs/samba )
sdl? ( media-libs/libsdl2[sound,threads,video] )
vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
vdpau? ( x11-libs/libvdpau )
@@ -127,6 +124,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,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)
