| 1 |
commit: 5be8c6f8c6137132dfdcf571aa1f24dbeee3c81a |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Apr 27 16:50:33 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 9 18:07:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be8c6f8 |
| 7 |
|
| 8 |
media-video/vlc: Merge "postproc" USE flag into "ffmpeg" USE flag. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/719818 |
| 11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
media-video/vlc/metadata.xml | 1 - |
| 15 |
media-video/vlc/vlc-3.0.10.ebuild | 5 ++--- |
| 16 |
media-video/vlc/vlc-3.0.8.ebuild | 7 +++---- |
| 17 |
media-video/vlc/vlc-3.0.9999.ebuild | 7 +++---- |
| 18 |
media-video/vlc/vlc-9999.ebuild | 7 +++---- |
| 19 |
5 files changed, 11 insertions(+), 16 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml |
| 22 |
index fdc2df2324f..8442a26823a 100644 |
| 23 |
--- a/media-video/vlc/metadata.xml |
| 24 |
+++ b/media-video/vlc/metadata.xml |
| 25 |
@@ -37,7 +37,6 @@ |
| 26 |
<flag name="nfs">Enable support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag> |
| 27 |
<flag name="omxil">Enable OpenMAX Integration Layer codec module</flag> |
| 28 |
<flag name="optimisememory">Enable optimisation for memory rather than performance</flag> |
| 29 |
- <flag name="postproc">Enable image post-processing via libpostproc (part of FFmpeg)</flag> |
| 30 |
<flag name="projectm">Enable the projectM visualization plugin</flag> |
| 31 |
<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag> |
| 32 |
<flag name="sdl-image">Enable sdl image video decoder (depends on sdl)</flag> |
| 33 |
|
| 34 |
diff --git a/media-video/vlc/vlc-3.0.10.ebuild b/media-video/vlc/vlc-3.0.10.ebuild |
| 35 |
index df602aabb05..5ef94fb86be 100644 |
| 36 |
--- a/media-video/vlc/vlc-3.0.10.ebuild |
| 37 |
+++ b/media-video/vlc/vlc-3.0.10.ebuild |
| 38 |
@@ -34,7 +34,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca |
| 39 |
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate |
| 40 |
libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc |
| 41 |
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses |
| 42 |
- nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5 rdp |
| 43 |
+ nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp |
| 44 |
run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib |
| 45 |
theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X |
| 46 |
x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse |
| 47 |
@@ -46,7 +46,6 @@ REQUIRED_USE=" |
| 48 |
libcaca? ( X ) |
| 49 |
libtar? ( skins ) |
| 50 |
libtiger? ( kate ) |
| 51 |
- postproc? ( ffmpeg ) |
| 52 |
skins? ( qt5 truetype X xml ) |
| 53 |
ssl? ( gcrypt ) |
| 54 |
vaapi? ( ffmpeg X ) |
| 55 |
@@ -309,6 +308,7 @@ src_configure() { |
| 56 |
$(use_enable fdk fdkaac) |
| 57 |
$(use_enable ffmpeg avcodec) |
| 58 |
$(use_enable ffmpeg avformat) |
| 59 |
+ $(use_enable ffmpeg postproc) |
| 60 |
$(use_enable ffmpeg swscale) |
| 61 |
$(use_enable flac) |
| 62 |
$(use_enable fluidsynth) |
| 63 |
@@ -347,7 +347,6 @@ src_configure() { |
| 64 |
$(use_enable optimisememory optimize-memory) |
| 65 |
$(use_enable opus) |
| 66 |
$(use_enable png) |
| 67 |
- $(use_enable postproc) |
| 68 |
$(use_enable projectm) |
| 69 |
$(use_enable pulseaudio pulse) |
| 70 |
$(use_enable qt5 qt) |
| 71 |
|
| 72 |
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild |
| 73 |
index 1b6c3bbb4d1..e85da62a511 100644 |
| 74 |
--- a/media-video/vlc/vlc-3.0.8.ebuild |
| 75 |
+++ b/media-video/vlc/vlc-3.0.8.ebuild |
| 76 |
@@ -34,7 +34,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca |
| 77 |
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate |
| 78 |
libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc |
| 79 |
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses |
| 80 |
- nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5 rdp |
| 81 |
+ nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp |
| 82 |
run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib |
| 83 |
theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X |
| 84 |
x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse |
| 85 |
@@ -46,7 +46,6 @@ REQUIRED_USE=" |
| 86 |
libcaca? ( X ) |
| 87 |
libtar? ( skins ) |
| 88 |
libtiger? ( kate ) |
| 89 |
- postproc? ( ffmpeg ) |
| 90 |
skins? ( qt5 truetype X xml ) |
| 91 |
ssl? ( gcrypt ) |
| 92 |
vaapi? ( ffmpeg X ) |
| 93 |
@@ -95,7 +94,7 @@ RDEPEND=" |
| 94 |
) |
| 95 |
faad? ( media-libs/faad2 ) |
| 96 |
fdk? ( media-libs/fdk-aac:= ) |
| 97 |
- ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc?,vaapi?,vdpau?] ) |
| 98 |
+ ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) |
| 99 |
flac? ( |
| 100 |
media-libs/flac |
| 101 |
media-libs/libogg |
| 102 |
@@ -310,6 +309,7 @@ src_configure() { |
| 103 |
$(use_enable fdk fdkaac) |
| 104 |
$(use_enable ffmpeg avcodec) |
| 105 |
$(use_enable ffmpeg avformat) |
| 106 |
+ $(use_enable ffmpeg postproc) |
| 107 |
$(use_enable ffmpeg swscale) |
| 108 |
$(use_enable flac) |
| 109 |
$(use_enable fluidsynth) |
| 110 |
@@ -348,7 +348,6 @@ src_configure() { |
| 111 |
$(use_enable optimisememory optimize-memory) |
| 112 |
$(use_enable opus) |
| 113 |
$(use_enable png) |
| 114 |
- $(use_enable postproc) |
| 115 |
$(use_enable projectm) |
| 116 |
$(use_enable pulseaudio pulse) |
| 117 |
$(use_enable qt5 qt) |
| 118 |
|
| 119 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 120 |
index ee56dc0ca25..eb1a4cfe9d4 100644 |
| 121 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 122 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 123 |
@@ -34,7 +34,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 124 |
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate |
| 125 |
libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc |
| 126 |
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses |
| 127 |
- nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5 rdp |
| 128 |
+ nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp |
| 129 |
run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib |
| 130 |
theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X |
| 131 |
x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx |
| 132 |
@@ -47,7 +47,6 @@ REQUIRED_USE=" |
| 133 |
libcaca? ( X ) |
| 134 |
libtar? ( skins ) |
| 135 |
libtiger? ( kate ) |
| 136 |
- postproc? ( ffmpeg ) |
| 137 |
skins? ( qt5 truetype X xml ) |
| 138 |
ssl? ( gcrypt ) |
| 139 |
vaapi? ( ffmpeg X ) |
| 140 |
@@ -96,7 +95,7 @@ RDEPEND=" |
| 141 |
) |
| 142 |
faad? ( media-libs/faad2 ) |
| 143 |
fdk? ( media-libs/fdk-aac:= ) |
| 144 |
- ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc?,vaapi?,vdpau?] ) |
| 145 |
+ ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) |
| 146 |
flac? ( |
| 147 |
media-libs/flac |
| 148 |
media-libs/libogg |
| 149 |
@@ -311,6 +310,7 @@ src_configure() { |
| 150 |
$(use_enable fdk fdkaac) |
| 151 |
$(use_enable ffmpeg avcodec) |
| 152 |
$(use_enable ffmpeg avformat) |
| 153 |
+ $(use_enable ffmpeg postproc) |
| 154 |
$(use_enable ffmpeg swscale) |
| 155 |
$(use_enable flac) |
| 156 |
$(use_enable fluidsynth) |
| 157 |
@@ -349,7 +349,6 @@ src_configure() { |
| 158 |
$(use_enable optimisememory optimize-memory) |
| 159 |
$(use_enable opus) |
| 160 |
$(use_enable png) |
| 161 |
- $(use_enable postproc) |
| 162 |
$(use_enable projectm) |
| 163 |
$(use_enable pulseaudio pulse) |
| 164 |
$(use_enable qt5 qt) |
| 165 |
|
| 166 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 167 |
index 206465d11d3..fa184a95dce 100644 |
| 168 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 169 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 170 |
@@ -34,7 +34,7 @@ IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast |
| 171 |
fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms |
| 172 |
libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc |
| 173 |
live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses |
| 174 |
- nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5 rdp |
| 175 |
+ nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp |
| 176 |
run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib |
| 177 |
theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X |
| 178 |
x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx |
| 179 |
@@ -47,7 +47,6 @@ REQUIRED_USE=" |
| 180 |
libcaca? ( X ) |
| 181 |
libtar? ( skins ) |
| 182 |
libtiger? ( kate ) |
| 183 |
- postproc? ( ffmpeg ) |
| 184 |
skins? ( qt5 truetype X xml ) |
| 185 |
ssl? ( gcrypt ) |
| 186 |
vaapi? ( ffmpeg X ) |
| 187 |
@@ -96,7 +95,7 @@ RDEPEND=" |
| 188 |
) |
| 189 |
faad? ( media-libs/faad2 ) |
| 190 |
fdk? ( media-libs/fdk-aac:= ) |
| 191 |
- ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc?,vaapi?,vdpau?] ) |
| 192 |
+ ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) |
| 193 |
flac? ( |
| 194 |
media-libs/flac |
| 195 |
media-libs/libogg |
| 196 |
@@ -312,6 +311,7 @@ src_configure() { |
| 197 |
$(use_enable fdk fdkaac) |
| 198 |
$(use_enable ffmpeg avcodec) |
| 199 |
$(use_enable ffmpeg avformat) |
| 200 |
+ $(use_enable ffmpeg postproc) |
| 201 |
$(use_enable ffmpeg swscale) |
| 202 |
$(use_enable flac) |
| 203 |
$(use_enable fluidsynth) |
| 204 |
@@ -351,7 +351,6 @@ src_configure() { |
| 205 |
$(use_enable optimisememory optimize-memory) |
| 206 |
$(use_enable opus) |
| 207 |
$(use_enable png) |
| 208 |
- $(use_enable postproc) |
| 209 |
$(use_enable projectm) |
| 210 |
$(use_enable pulseaudio pulse) |
| 211 |
$(use_enable qt5 qt) |
Archives