1 |
commit: d6c71d4dcc4c322e7b0b333d60106296aaea808e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 30 12:43:22 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 30 12:48:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c71d4d |
7 |
|
8 |
media-video/vlc: Add USE mad, switch USE mp3 to media-sound/mpg123 |
9 |
|
10 |
Reported-by: Denis Kaganovich <mahatma <AT> eu.by> |
11 |
Bug: https://bugs.gentoo.org/669924 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
14 |
|
15 |
media-video/vlc/vlc-3.0.9999.ebuild | 14 ++++++++------ |
16 |
media-video/vlc/vlc-9999.ebuild | 14 ++++++++------ |
17 |
2 files changed, 16 insertions(+), 12 deletions(-) |
18 |
|
19 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
20 |
index b2e1f771823..bad9a61a726 100644 |
21 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
22 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2018 Gentoo Foundation |
25 |
+# Copyright 1999-2018 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=6 |
29 |
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca |
30 |
dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
31 |
fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass |
32 |
libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
33 |
- macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses |
34 |
+ macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses |
35 |
neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 |
36 |
rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl |
37 |
svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx |
38 |
@@ -130,13 +130,14 @@ RDEPEND=" |
39 |
lirc? ( app-misc/lirc:0 ) |
40 |
live? ( media-plugins/live:0 ) |
41 |
lua? ( >=dev-lang/lua-5.1:0 ) |
42 |
+ mad? ( media-libs/libmad ) |
43 |
matroska? ( |
44 |
dev-libs/libebml:0= |
45 |
media-libs/libmatroska:0= |
46 |
) |
47 |
- modplug? ( media-libs/libmodplug:0 ) |
48 |
- mp3? ( media-libs/libmad:0 ) |
49 |
- mpeg? ( media-libs/libmpeg2:0 ) |
50 |
+ modplug? ( media-libs/libmodplug ) |
51 |
+ mp3? ( media-sound/mpg123 ) |
52 |
+ mpeg? ( media-libs/libmpeg2 ) |
53 |
mtp? ( media-libs/libmtp:0= ) |
54 |
musepack? ( media-sound/musepack-tools:0 ) |
55 |
ncurses? ( sys-libs/ncurses:0=[unicode] ) |
56 |
@@ -333,9 +334,10 @@ src_configure() { |
57 |
$(use_enable lua) |
58 |
$(use_enable macosx-notifications osx-notifications) |
59 |
$(use_enable macosx-qtkit) |
60 |
+ $(use_enable mad) |
61 |
$(use_enable matroska) |
62 |
$(use_enable modplug mod) |
63 |
- $(use_enable mp3 mad) |
64 |
+ $(use_enable mp3 mpg123) |
65 |
$(use_enable mpeg libmpeg2) |
66 |
$(use_enable mtp) |
67 |
$(use_enable musepack mpc) |
68 |
|
69 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
70 |
index bc8a5669d83..5081c4c23cf 100644 |
71 |
--- a/media-video/vlc/vlc-9999.ebuild |
72 |
+++ b/media-video/vlc/vlc-9999.ebuild |
73 |
@@ -1,4 +1,4 @@ |
74 |
-# Copyright 1999-2018 Gentoo Foundation |
75 |
+# Copyright 1999-2018 Gentoo Authors |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
|
78 |
EAPI=6 |
79 |
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca |
80 |
dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth |
81 |
fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass |
82 |
libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua |
83 |
- macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses |
84 |
+ macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses |
85 |
neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 |
86 |
rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl |
87 |
svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx |
88 |
@@ -131,13 +131,14 @@ RDEPEND=" |
89 |
lirc? ( app-misc/lirc:0 ) |
90 |
live? ( media-plugins/live:0 ) |
91 |
lua? ( >=dev-lang/lua-5.1:0 ) |
92 |
+ mad? ( media-libs/libmad ) |
93 |
matroska? ( |
94 |
dev-libs/libebml:0= |
95 |
media-libs/libmatroska:0= |
96 |
) |
97 |
- modplug? ( media-libs/libmodplug:0 ) |
98 |
- mp3? ( media-libs/libmad:0 ) |
99 |
- mpeg? ( media-libs/libmpeg2:0 ) |
100 |
+ modplug? ( media-libs/libmodplug ) |
101 |
+ mp3? ( media-sound/mpg123 ) |
102 |
+ mpeg? ( media-libs/libmpeg2 ) |
103 |
mtp? ( media-libs/libmtp:0= ) |
104 |
musepack? ( media-sound/musepack-tools:0 ) |
105 |
ncurses? ( sys-libs/ncurses:0=[unicode] ) |
106 |
@@ -336,9 +337,10 @@ src_configure() { |
107 |
$(use_enable lua) |
108 |
$(use_enable macosx-notifications osx-notifications) |
109 |
$(use_enable macosx-qtkit) |
110 |
+ $(use_enable mad) |
111 |
$(use_enable matroska) |
112 |
$(use_enable modplug mod) |
113 |
- $(use_enable mp3 mad) |
114 |
+ $(use_enable mp3 mpg123) |
115 |
$(use_enable mpeg libmpeg2) |
116 |
$(use_enable mtp) |
117 |
$(use_enable musepack mpc) |