1 |
commit: 8ee3bcf1a81fec0c92980164afb4a71408dc3a65 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 26 23:11:41 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 27 09:02:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee3bcf1 |
7 |
|
8 |
media-video/vlc: Drop USE=bidi from REQUIRED_USE |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
media-video/vlc/vlc-3.0.9999.ebuild | 16 ++++++++++++---- |
13 |
media-video/vlc/vlc-9999.ebuild | 16 ++++++++++++---- |
14 |
2 files changed, 24 insertions(+), 8 deletions(-) |
15 |
|
16 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
17 |
index 248cb95f3cd..6c691145bec 100644 |
18 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
19 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
20 |
@@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus |
21 |
x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
22 |
" |
23 |
REQUIRED_USE=" |
24 |
- bidi? ( truetype ) |
25 |
chromecast? ( encode ) |
26 |
directx? ( ffmpeg ) |
27 |
fontconfig? ( truetype ) |
28 |
@@ -62,7 +61,11 @@ RDEPEND=" |
29 |
alsa? ( media-libs/alsa-lib:0 ) |
30 |
aom? ( media-libs/libaom:= ) |
31 |
archive? ( app-arch/libarchive:= ) |
32 |
- bidi? ( dev-libs/fribidi:0 ) |
33 |
+ bidi? ( |
34 |
+ dev-libs/fribidi:0 |
35 |
+ media-libs/freetype:2 |
36 |
+ virtual/ttf-fonts:0 |
37 |
+ ) |
38 |
bluray? ( media-libs/libbluray:0= ) |
39 |
cddb? ( media-libs/libcddb:0 ) |
40 |
chromaprint? ( media-libs/chromaprint:0= ) |
41 |
@@ -355,7 +358,6 @@ src_configure() { |
42 |
$(use_enable taglib) |
43 |
$(use_enable theora) |
44 |
$(use_enable tremor) |
45 |
- $(use_enable truetype freetype) |
46 |
$(use_enable twolame) |
47 |
$(use_enable udev) |
48 |
$(use_enable upnp) |
49 |
@@ -421,7 +423,13 @@ src_configure() { |
50 |
|
51 |
xdg_environment_reset # bug 608256 |
52 |
|
53 |
- if use truetype || use projectm ; then |
54 |
+ if use truetype || use bidi; then |
55 |
+ myeconfargs+=( --enable-freetype ) |
56 |
+ else |
57 |
+ myeconfargs+=( --disable-freetype ) |
58 |
+ fi |
59 |
+ |
60 |
+ if use truetype || use projectm; then |
61 |
local dejavu="/usr/share/fonts/dejavu/" |
62 |
myeconfargs+=( |
63 |
--with-default-font=${dejavu}/DejaVuSans.ttf |
64 |
|
65 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
66 |
index 0de960bb657..9fcb8c7bb6b 100644 |
67 |
--- a/media-video/vlc/vlc-9999.ebuild |
68 |
+++ b/media-video/vlc/vlc-9999.ebuild |
69 |
@@ -40,7 +40,6 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus |
70 |
x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse |
71 |
" |
72 |
REQUIRED_USE=" |
73 |
- bidi? ( truetype ) |
74 |
chromecast? ( encode ) |
75 |
directx? ( ffmpeg ) |
76 |
fontconfig? ( truetype ) |
77 |
@@ -62,7 +61,11 @@ RDEPEND=" |
78 |
alsa? ( media-libs/alsa-lib:0 ) |
79 |
aom? ( media-libs/libaom:= ) |
80 |
archive? ( app-arch/libarchive:= ) |
81 |
- bidi? ( dev-libs/fribidi:0 ) |
82 |
+ bidi? ( |
83 |
+ dev-libs/fribidi:0 |
84 |
+ media-libs/freetype:2 |
85 |
+ virtual/ttf-fonts:0 |
86 |
+ ) |
87 |
bluray? ( media-libs/libbluray:0= ) |
88 |
cddb? ( media-libs/libcddb:0 ) |
89 |
chromaprint? ( media-libs/chromaprint:0= ) |
90 |
@@ -354,7 +357,6 @@ src_configure() { |
91 |
$(use_enable taglib) |
92 |
$(use_enable theora) |
93 |
$(use_enable tremor) |
94 |
- $(use_enable truetype freetype) |
95 |
$(use_enable twolame) |
96 |
$(use_enable udev) |
97 |
$(use_enable upnp) |
98 |
@@ -420,7 +422,13 @@ src_configure() { |
99 |
|
100 |
xdg_environment_reset # bug 608256 |
101 |
|
102 |
- if use truetype || use projectm ; then |
103 |
+ if use truetype || use bidi; then |
104 |
+ myeconfargs+=( --enable-freetype ) |
105 |
+ else |
106 |
+ myeconfargs+=( --disable-freetype ) |
107 |
+ fi |
108 |
+ |
109 |
+ if use truetype || use projectm; then |
110 |
local dejavu="/usr/share/fonts/dejavu/" |
111 |
myeconfargs+=( |
112 |
--with-default-font=${dejavu}/DejaVuSans.ttf |