1 |
commit: c4b826011ae34c1484d1318f544c2084937f3bfb |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 13 22:31:52 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 13 23:38:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b82601 |
7 |
|
8 |
media-video/vlc: Add USE=wayland |
9 |
|
10 |
Closes: https://bugs.gentoo.org/647550 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
media-video/vlc/{vlc-3.0.9999.ebuild => vlc-3.0.0-r1.ebuild} | 9 +++++++-- |
14 |
media-video/vlc/vlc-3.0.9999.ebuild | 9 +++++++-- |
15 |
media-video/vlc/vlc-9999.ebuild | 9 +++++++-- |
16 |
3 files changed, 21 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild |
19 |
similarity index 98% |
20 |
copy from media-video/vlc/vlc-3.0.9999.ebuild |
21 |
copy to media-video/vlc/vlc-3.0.0-r1.ebuild |
22 |
index 33dbcb0762f..cfa90090ae4 100644 |
23 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
24 |
+++ b/media-video/vlc/vlc-3.0.0-r1.ebuild |
25 |
@@ -39,7 +39,7 @@ IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb |
26 |
png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba |
27 |
schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg |
28 |
+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau |
29 |
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
30 |
+ vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
31 |
" |
32 |
REQUIRED_USE=" |
33 |
aalib? ( X ) |
34 |
@@ -202,7 +202,7 @@ RDEPEND=" |
35 |
upnp? ( net-libs/libupnp:= ) |
36 |
v4l? ( media-libs/libv4l:0 ) |
37 |
vaapi? ( |
38 |
- x11-libs/libva:0=[X,drm] |
39 |
+ x11-libs/libva:0=[drm,wayland?,X?] |
40 |
!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) |
41 |
libav? ( media-video/libav:0=[vaapi] ) |
42 |
) |
43 |
@@ -215,6 +215,10 @@ RDEPEND=" |
44 |
vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
45 |
vorbis? ( media-libs/libvorbis:0 ) |
46 |
vpx? ( media-libs/libvpx:0= ) |
47 |
+ wayland? ( |
48 |
+ dev-libs/wayland |
49 |
+ dev-libs/wayland-protocols |
50 |
+ ) |
51 |
X? ( x11-libs/libX11:0 ) |
52 |
x264? ( media-libs/x264:0= ) |
53 |
x265? ( media-libs/x265:0= ) |
54 |
@@ -411,6 +415,7 @@ src_configure() { |
55 |
$(use_enable vnc) \ |
56 |
$(use_enable vorbis) \ |
57 |
$(use_enable vpx) \ |
58 |
+ $(use_enable wayland) \ |
59 |
$(use_enable wma-fixed) \ |
60 |
$(use_with X x) \ |
61 |
$(use_enable x264) \ |
62 |
|
63 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
64 |
index 33dbcb0762f..cfa90090ae4 100644 |
65 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
66 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
67 |
@@ -39,7 +39,7 @@ IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb |
68 |
png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba |
69 |
schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg |
70 |
+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau |
71 |
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
72 |
+ vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
73 |
" |
74 |
REQUIRED_USE=" |
75 |
aalib? ( X ) |
76 |
@@ -202,7 +202,7 @@ RDEPEND=" |
77 |
upnp? ( net-libs/libupnp:= ) |
78 |
v4l? ( media-libs/libv4l:0 ) |
79 |
vaapi? ( |
80 |
- x11-libs/libva:0=[X,drm] |
81 |
+ x11-libs/libva:0=[drm,wayland?,X?] |
82 |
!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) |
83 |
libav? ( media-video/libav:0=[vaapi] ) |
84 |
) |
85 |
@@ -215,6 +215,10 @@ RDEPEND=" |
86 |
vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
87 |
vorbis? ( media-libs/libvorbis:0 ) |
88 |
vpx? ( media-libs/libvpx:0= ) |
89 |
+ wayland? ( |
90 |
+ dev-libs/wayland |
91 |
+ dev-libs/wayland-protocols |
92 |
+ ) |
93 |
X? ( x11-libs/libX11:0 ) |
94 |
x264? ( media-libs/x264:0= ) |
95 |
x265? ( media-libs/x265:0= ) |
96 |
@@ -411,6 +415,7 @@ src_configure() { |
97 |
$(use_enable vnc) \ |
98 |
$(use_enable vorbis) \ |
99 |
$(use_enable vpx) \ |
100 |
+ $(use_enable wayland) \ |
101 |
$(use_enable wma-fixed) \ |
102 |
$(use_with X x) \ |
103 |
$(use_enable x264) \ |
104 |
|
105 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
106 |
index 8378697e060..1c55868e90a 100644 |
107 |
--- a/media-video/vlc/vlc-9999.ebuild |
108 |
+++ b/media-video/vlc/vlc-9999.ebuild |
109 |
@@ -39,7 +39,7 @@ IUSE="a52 aalib alsa altivec aom archive +avcodec +avformat bidi bluray cddb |
110 |
png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba |
111 |
schroedinger sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg |
112 |
+swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau |
113 |
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
114 |
+ vlm vnc vorbis vpx wayland wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi |
115 |
" |
116 |
REQUIRED_USE=" |
117 |
aalib? ( X ) |
118 |
@@ -202,7 +202,7 @@ RDEPEND=" |
119 |
upnp? ( net-libs/libupnp:= ) |
120 |
v4l? ( media-libs/libv4l:0 ) |
121 |
vaapi? ( |
122 |
- x11-libs/libva:0=[X,drm] |
123 |
+ x11-libs/libva:0=[drm,wayland?,X?] |
124 |
!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi] ) |
125 |
libav? ( media-video/libav:0=[vaapi] ) |
126 |
) |
127 |
@@ -215,6 +215,10 @@ RDEPEND=" |
128 |
vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
129 |
vorbis? ( media-libs/libvorbis:0 ) |
130 |
vpx? ( media-libs/libvpx:0= ) |
131 |
+ wayland? ( |
132 |
+ dev-libs/wayland |
133 |
+ dev-libs/wayland-protocols |
134 |
+ ) |
135 |
X? ( x11-libs/libX11:0 ) |
136 |
x264? ( media-libs/x264:0= ) |
137 |
x265? ( media-libs/x265:0= ) |
138 |
@@ -411,6 +415,7 @@ src_configure() { |
139 |
$(use_enable vnc) \ |
140 |
$(use_enable vorbis) \ |
141 |
$(use_enable vpx) \ |
142 |
+ $(use_enable wayland) \ |
143 |
$(use_enable wma-fixed) \ |
144 |
$(use_with X x) \ |
145 |
$(use_enable x264) \ |