summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-10-30 13:43:22 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-10-30 13:48:50 +0100
commitd6c71d4dcc4c322e7b0b333d60106296aaea808e (patch)
treec3c5e48a8e4b822d46ab58991e8570a281415fca /media-video/vlc
parentmedia-sound/mpg321: Drop 0.3.1-r1 (diff)
downloadgentoo-d6c71d4dcc4c322e7b0b333d60106296aaea808e.tar.gz
gentoo-d6c71d4dcc4c322e7b0b333d60106296aaea808e.tar.bz2
gentoo-d6c71d4dcc4c322e7b0b333d60106296aaea808e.zip
media-video/vlc: Add USE mad, switch USE mp3 to media-sound/mpg123
Reported-by: Denis Kaganovich <mahatma@eu.by> Bug: https://bugs.gentoo.org/669924 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild14
-rw-r--r--media-video/vlc/vlc-9999.ebuild14
2 files changed, 16 insertions, 12 deletions
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index b2e1f771823a..bad9a61a7269 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass
libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
- macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
+ macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses
neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl
svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
@@ -130,13 +130,14 @@ RDEPEND="
lirc? ( app-misc/lirc:0 )
live? ( media-plugins/live:0 )
lua? ( >=dev-lang/lua-5.1:0 )
+ mad? ( media-libs/libmad )
matroska? (
dev-libs/libebml:0=
media-libs/libmatroska:0=
)
- modplug? ( media-libs/libmodplug:0 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( media-libs/libmpeg2:0 )
+ modplug? ( media-libs/libmodplug )
+ mp3? ( media-sound/mpg123 )
+ mpeg? ( media-libs/libmpeg2 )
mtp? ( media-libs/libmtp:0= )
musepack? ( media-sound/musepack-tools:0 )
ncurses? ( sys-libs/ncurses:0=[unicode] )
@@ -333,9 +334,10 @@ src_configure() {
$(use_enable lua)
$(use_enable macosx-notifications osx-notifications)
$(use_enable macosx-qtkit)
+ $(use_enable mad)
$(use_enable matroska)
$(use_enable modplug mod)
- $(use_enable mp3 mad)
+ $(use_enable mp3 mpg123)
$(use_enable mpeg libmpeg2)
$(use_enable mtp)
$(use_enable musepack mpc)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index bc8a5669d833..5081c4c23cf4 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass
libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
- macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
+ macosx-notifications macosx-qtkit mad matroska modplug mp3 mpeg mtp musepack ncurses
neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
rdp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl
svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
@@ -131,13 +131,14 @@ RDEPEND="
lirc? ( app-misc/lirc:0 )
live? ( media-plugins/live:0 )
lua? ( >=dev-lang/lua-5.1:0 )
+ mad? ( media-libs/libmad )
matroska? (
dev-libs/libebml:0=
media-libs/libmatroska:0=
)
- modplug? ( media-libs/libmodplug:0 )
- mp3? ( media-libs/libmad:0 )
- mpeg? ( media-libs/libmpeg2:0 )
+ modplug? ( media-libs/libmodplug )
+ mp3? ( media-sound/mpg123 )
+ mpeg? ( media-libs/libmpeg2 )
mtp? ( media-libs/libmtp:0= )
musepack? ( media-sound/musepack-tools:0 )
ncurses? ( sys-libs/ncurses:0=[unicode] )
@@ -336,9 +337,10 @@ src_configure() {
$(use_enable lua)
$(use_enable macosx-notifications osx-notifications)
$(use_enable macosx-qtkit)
+ $(use_enable mad)
$(use_enable matroska)
$(use_enable modplug mod)
- $(use_enable mp3 mad)
+ $(use_enable mp3 mpg123)
$(use_enable mpeg libmpeg2)
$(use_enable mtp)
$(use_enable musepack mpc)