[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/

[Andreas Sturmlechner]

commit:     bfc72f62a3601ec5bd304b78c010f3dff2a53733
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 17:43:21 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 00:17:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfc72f62

media-video/vlc: Drop USE wma-fixed, disable in 3.0 stable branch

Module removed upstream in git master for security concerns, commit:
5aafa3a376f6ad3dee45be7857e5499b4b3e5381

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/vlc/vlc-3.0.9999.ebuild | 4 ++--
 media-video/vlc/vlc-9999.ebuild     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild 
b/media-video/vlc/vlc-3.0.9999.ebuild
index af284d62b6c..fdde9d6a3ea 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -37,7 +37,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb 
chromaprint chromeca
        neon nfs ogg omxil opencv optimisememory opus png postproc projectm 
pulseaudio +qt5
        rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
        svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc 
vorbis vpx
-       wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx 
cpu_flags_x86_sse
+       wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx 
cpu_flags_x86_sse
 "
 REQUIRED_USE="
        chromecast? ( encode )
@@ -385,7 +385,6 @@ src_configure() {
                $(use_enable vorbis)
                $(use_enable vpx)
                $(use_enable wayland)
-               $(use_enable wma-fixed)
                $(use_with X x)
                $(use_enable X xcb)
                $(use_enable X xvideo)
@@ -420,6 +419,7 @@ src_configure() {
                --disable-spatialaudio
                --disable-vsxu
                --disable-wasapi
+               --disable-wma-fixed
        )
        # ^ We don't have these disabled libraries in the Portage tree yet.
 

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index bbbc76ae607..9354de3beaf 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -37,7 +37,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb 
chromaprint chromeca
        neon nfs ogg omxil opencv optimisememory opus png postproc projectm 
pulseaudio +qt5
        rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
        svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc 
vorbis vpx
-       wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx 
cpu_flags_x86_sse
+       wayland +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx 
cpu_flags_x86_sse
 "
 REQUIRED_USE="
        chromecast? ( encode )
@@ -385,7 +385,6 @@ src_configure() {
                $(use_enable vorbis)
                $(use_enable vpx)
                $(use_enable wayland)
-               $(use_enable wma-fixed)
                $(use_with X x)
                $(use_enable X xcb)
                $(use_enable x264)