Gentoo Archives: gentoo-commits

From: Ian Delaney <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
Date: Mon, 28 Dec 2015 14:07:38
Message-Id: 1451306833.6965c84f286cf0fb6a67765a00bdc6ae20cf0b19.idella4@gentoo
1 commit: 6965c84f286cf0fb6a67765a00bdc6ae20cf0b19
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Tue Dec 22 17:11:26 2015 +0000
4 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 28 12:47:13 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6965c84f
7
8 media-video/mpv: avoid uchardet automagic dep wrt bug 565646
9
10 Add missing uchardet USE flag to avoid automagic dependency on uchardet
11 wrt bug 565646.
12
13 Gentoo-Bug: 565646
14
15 Package-Manager: portage-2.2.24
16
17 media-video/mpv/metadata.xml | 1 +
18 media-video/mpv/mpv-9999.ebuild | 7 +++++--
19 2 files changed, 6 insertions(+), 2 deletions(-)
20
21 diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
22 index 6c14783..2f94626 100644
23 --- a/media-video/mpv/metadata.xml
24 +++ b/media-video/mpv/metadata.xml
25 @@ -37,6 +37,7 @@
26 <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
27 <flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
28 <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs</flag>
29 + <flag name="uchardet">Enable subtitles charset discovery via <pkg>dev-libs/uchardet</pkg></flag>
30 <flag name="vf-dlopen">Install additional video filters for using with -vf dlopen</flag>
31 </use>
32 <upstream>
33
34 diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
35 index 637d7f6..bee13f2 100644
36 --- a/media-video/mpv/mpv-9999.ebuild
37 +++ b/media-video/mpv/mpv-9999.ebuild
38 @@ -30,8 +30,8 @@ LICENSE="GPL-2+ BSD ISC"
39 SLOT="0"
40 IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd egl +enca encode +iconv
41 jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl
42 -oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux test v4l vaapi
43 -vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
44 +oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux test uchardet v4l
45 +vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
46
47 REQUIRED_USE="
48 || ( cli libmpv )
49 @@ -42,6 +42,7 @@ REQUIRED_USE="
50 luajit? ( lua )
51 opengl? ( || ( wayland X ) )
52 pvr? ( v4l )
53 + uchardet? ( iconv )
54 vaapi? ( X )
55 vdpau? ( X )
56 wayland? ( opengl )
57 @@ -84,6 +85,7 @@ COMMON_DEPEND="
58 rubberband? ( >=media-libs/rubberband-1.8.0 )
59 samba? ( net-fs/samba )
60 sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
61 + uchardet? ( dev-libs/uchardet )
62 v4l? ( media-libs/libv4l )
63 wayland? (
64 >=dev-libs/wayland-1.6.0
65 @@ -184,6 +186,7 @@ src_configure() {
66 $(use_enable cdda)
67 $(use_enable enca)
68 $(use_enable libguess)
69 + $(use_enable uchardet)
70 $(use_enable rubberband)
71 $(use_enable lcms lcms2)
72 --disable-vapoursynth # Only available in overlays