commit: 8ee3bcf1a81fec0c92980164afb4a71408dc3a65
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 23:11:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 09:02:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee3bcf1
media-video/vlc: Drop USE=bidi from REQUIRED_USE
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-video/vlc/vlc-3.0.9999.ebuild | 16 ++++++++++++----
media-video/vlc/vlc-9999.ebuild | 16 ++++++++++++----
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.9999.ebuild
index 248cb95f3cd..6c691145bec 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb
chromaprint chromecast dbus
x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
"
REQUIRED_USE="
- bidi? ( truetype )
chromecast? ( encode )
directx? ( ffmpeg )
fontconfig? ( truetype )
@@ -62,7 +61,11 @@ RDEPEND="
alsa? ( media-libs/alsa-lib:0 )
aom? ( media-libs/libaom:= )
archive? ( app-arch/libarchive:= )
- bidi? ( dev-libs/fribidi:0 )
+ bidi? (
+ dev-libs/fribidi:0
+ media-libs/freetype:2
+ virtual/ttf-fonts:0
+ )
bluray? ( media-libs/libbluray:0= )
cddb? ( media-libs/libcddb:0 )
chromaprint? ( media-libs/chromaprint:0= )
@@ -355,7 +358,6 @@ src_configure() {
$(use_enable taglib)
$(use_enable theora)
$(use_enable tremor)
- $(use_enable truetype freetype)
$(use_enable twolame)
$(use_enable udev)
$(use_enable upnp)
@@ -421,7 +423,13 @@ src_configure() {
xdg_environment_reset # bug 608256
- if use truetype || use projectm ; then
+ if use truetype || use bidi; then
+ myeconfargs+=( --enable-freetype )
+ else
+ myeconfargs+=( --disable-freetype )
+ fi
+
+ if use truetype || use projectm; then
local dejavu="/usr/share/fonts/dejavu/"
myeconfargs+=(
--with-default-font=${dejavu}/DejaVuSans.ttf
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 0de960bb657..9fcb8c7bb6b 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb
chromaprint chromecast dbus
x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
"
REQUIRED_USE="
- bidi? ( truetype )
chromecast? ( encode )
directx? ( ffmpeg )
fontconfig? ( truetype )
@@ -62,7 +61,11 @@ RDEPEND="
alsa? ( media-libs/alsa-lib:0 )
aom? ( media-libs/libaom:= )
archive? ( app-arch/libarchive:= )
- bidi? ( dev-libs/fribidi:0 )
+ bidi? (
+ dev-libs/fribidi:0
+ media-libs/freetype:2
+ virtual/ttf-fonts:0
+ )
bluray? ( media-libs/libbluray:0= )
cddb? ( media-libs/libcddb:0 )
chromaprint? ( media-libs/chromaprint:0= )
@@ -354,7 +357,6 @@ src_configure() {
$(use_enable taglib)
$(use_enable theora)
$(use_enable tremor)
- $(use_enable truetype freetype)
$(use_enable twolame)
$(use_enable udev)
$(use_enable upnp)
@@ -420,7 +422,13 @@ src_configure() {
xdg_environment_reset # bug 608256
- if use truetype || use projectm ; then
+ if use truetype || use bidi; then
+ myeconfargs+=( --enable-freetype )
+ else
+ myeconfargs+=( --disable-freetype )
+ fi
+
+ if use truetype || use projectm; then
local dejavu="/usr/share/fonts/dejavu/"
myeconfargs+=(
--with-default-font=${dejavu}/DejaVuSans.ttf
