1 |
commit: 3a1d816d9bd8cc13bf203fd4076ec8059596e8ca |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 10 20:28:32 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 15 12:35:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1d816d |
7 |
|
8 |
media-video/vlc: Drop 2.2.8-r1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/647606 |
11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
12 |
|
13 |
media-video/vlc/Manifest | 1 - |
14 |
media-video/vlc/files/qt4-select.patch | 51 --- |
15 |
media-video/vlc/files/vlc-2.2.2-qt5widgets.patch | 13 - |
16 |
.../vlc/files/vlc-2.2.4-alsa-large-buffers.patch | 47 -- |
17 |
media-video/vlc/files/vlc-2.2.4-cxx0x.patch | 11 - |
18 |
media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch | 160 ------- |
19 |
media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | 45 -- |
20 |
.../vlc/files/vlc-2.2.6-decoder-lock-scope.patch | 34 -- |
21 |
.../vlc/files/vlc-2.2.8-libupnp-compat.patch | 28 -- |
22 |
media-video/vlc/metadata.xml | 15 - |
23 |
media-video/vlc/vlc-2.2.8-r1.ebuild | 480 --------------------- |
24 |
11 files changed, 885 deletions(-) |
25 |
|
26 |
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest |
27 |
index 82d849bd006..06f4d1b15d5 100644 |
28 |
--- a/media-video/vlc/Manifest |
29 |
+++ b/media-video/vlc/Manifest |
30 |
@@ -1,2 +1 @@ |
31 |
-DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a |
32 |
DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab |
33 |
|
34 |
diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch |
35 |
deleted file mode 100644 |
36 |
index fb1526a30a7..00000000000 |
37 |
--- a/media-video/vlc/files/qt4-select.patch |
38 |
+++ /dev/null |
39 |
@@ -1,51 +0,0 @@ |
40 |
-https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54 |
41 |
-For use until upstream ever accepts this patch or fixes it themsleves |
42 |
---- a/configure.ac |
43 |
-+++ b/configure.ac |
44 |
-@@ -3709,7 +3709,8 @@ |
45 |
- ]) |
46 |
- ]) |
47 |
- AS_IF([test "${enable_qt}" != "no"], [ |
48 |
-- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ |
49 |
-+ AS_IF([test "${enable_qt}" != "4"], [ |
50 |
-+ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ |
51 |
- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [ |
52 |
- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}]) |
53 |
- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11]) |
54 |
-@@ -3721,20 +3722,23 @@ |
55 |
- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
56 |
- AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
57 |
- AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
58 |
-+ enable_qt="5" |
59 |
-- ], [ |
60 |
-- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ |
61 |
-- AS_IF([test -n "${enable_qt}"],[ |
62 |
-- AC_MSG_ERROR([${QT_PKG_ERRORS}.]) |
63 |
-- ],[ |
64 |
-- AC_MSG_WARN([${QT_PKG_ERRORS}.]) |
65 |
-- ]) |
66 |
-- enable_qt="no" |
67 |
-+ ]) |
68 |
-+ ]) |
69 |
-+ AS_IF([test "${enable_qt}" != "5"], [ |
70 |
-+ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ |
71 |
-+ AS_IF([test -n "${enable_qt}"],[ |
72 |
-+ AC_MSG_ERROR([${QT_PKG_ERRORS}.]) |
73 |
-+ ],[ |
74 |
-+ AC_MSG_WARN([${QT_PKG_ERRORS}.]) |
75 |
- ]) |
76 |
-- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" |
77 |
-- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
78 |
-- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) |
79 |
-- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
80 |
-+ enable_qt="no" |
81 |
- ]) |
82 |
-+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" |
83 |
-+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
84 |
-+ AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) |
85 |
-+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
86 |
-+ ]) |
87 |
- ]) |
88 |
- AS_IF([test "${enable_qt}" != "no"], [ |
89 |
- VLC_ADD_PLUGIN([qt4]) |
90 |
- |
91 |
|
92 |
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch |
93 |
deleted file mode 100644 |
94 |
index a024d0032b6..00000000000 |
95 |
--- a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch |
96 |
+++ /dev/null |
97 |
@@ -1,13 +0,0 @@ |
98 |
---- vlc-2.2.2/configure.ac |
99 |
-+++ vlc-2.2.2/configure.ac |
100 |
-@@ -3754,10 +3754,6 @@ |
101 |
- AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) |
102 |
- ]) |
103 |
- |
104 |
-- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [ |
105 |
-- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"]) |
106 |
-- ]) |
107 |
-- |
108 |
- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)" |
109 |
- QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)" |
110 |
- AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) |
111 |
|
112 |
diff --git a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch |
113 |
deleted file mode 100644 |
114 |
index b5a9ff7267f..00000000000 |
115 |
--- a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch |
116 |
+++ /dev/null |
117 |
@@ -1,47 +0,0 @@ |
118 |
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=4e9fd53592d048baa8b57f30df15ab5806139d07;hp=2d1f99e9cb743bca12c6bdf32cc84a92d07fda8b;hb=47f74a83c161173b0d15e95dab8ceb7c97de51b4;hpb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a |
119 |
- |
120 |
-diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c |
121 |
-index 2d1f99e..4e9fd53 100644 |
122 |
---- a/modules/audio_output/alsa.c |
123 |
-+++ b/modules/audio_output/alsa.c |
124 |
-@@ -495,6 +495,15 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) |
125 |
- } |
126 |
- sys->rate = fmt->i_rate; |
127 |
- |
128 |
-+#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */ |
129 |
-+ param = AOUT_MIN_PREPARE_TIME; |
130 |
-+ val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL); |
131 |
-+ if (val) |
132 |
-+ { |
133 |
-+ msg_Err (aout, "cannot set period: %s", snd_strerror (val)); |
134 |
-+ goto error; |
135 |
-+ } |
136 |
-+#endif |
137 |
- /* Set buffer size */ |
138 |
- param = AOUT_MAX_ADVANCE_TIME; |
139 |
- val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, ¶m, NULL); |
140 |
-@@ -503,14 +512,22 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) |
141 |
- msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val)); |
142 |
- goto error; |
143 |
- } |
144 |
-- |
145 |
-- param = AOUT_MIN_PREPARE_TIME; |
146 |
-+#if 0 |
147 |
-+ val = snd_pcm_hw_params_get_buffer_time (hw, ¶m, NULL); |
148 |
-+ if (val) |
149 |
-+ { |
150 |
-+ msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val)); |
151 |
-+ param = AOUT_MIN_PREPARE_TIME; |
152 |
-+ } |
153 |
-+ else |
154 |
-+ param /= 2; |
155 |
- val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL); |
156 |
- if (val) |
157 |
- { |
158 |
- msg_Err (aout, "cannot set period: %s", snd_strerror (val)); |
159 |
- goto error; |
160 |
- } |
161 |
-+#endif |
162 |
- |
163 |
- /* Commit hardware parameters */ |
164 |
- val = snd_pcm_hw_params (pcm, hw); |
165 |
|
166 |
diff --git a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch |
167 |
deleted file mode 100644 |
168 |
index cb3d63522de..00000000000 |
169 |
--- a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch |
170 |
+++ /dev/null |
171 |
@@ -1,11 +0,0 @@ |
172 |
---- a/configure.ac 2016-09-21 07:10:58.885508665 +0200 |
173 |
-+++ b/configure.ac 2016-09-21 07:19:17.835725004 +0200 |
174 |
-@@ -3746,7 +3746,7 @@ |
175 |
- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ |
176 |
- PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [ |
177 |
- VLC_ADD_LIBS([qt4],[${QTX11_LIBS}]) |
178 |
-- VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11]) |
179 |
-+ VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11 -std=c++0x]) |
180 |
- PKG_CHECK_MODULES([XI], [xi], [ |
181 |
- VLC_ADD_LIBS([qt4], [${XI_LIBS}]) |
182 |
- VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI]) |
183 |
|
184 |
diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch |
185 |
deleted file mode 100644 |
186 |
index 3bc5954920d..00000000000 |
187 |
--- a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch |
188 |
+++ /dev/null |
189 |
@@ -1,160 +0,0 @@ |
190 |
-Index: vlc-2.2.4/configure.ac |
191 |
-=================================================================== |
192 |
---- vlc-2.2.4.orig/configure.ac |
193 |
-+++ vlc-2.2.4/configure.ac |
194 |
-@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec, |
195 |
- [ --enable-avcodec libavcodec codec (default enabled)]) |
196 |
- AS_IF([test "${enable_avcodec}" != "no"], [ |
197 |
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ |
198 |
-- PKG_CHECK_EXISTS([libavutil < 55],, [ |
199 |
-- AC_MSG_ERROR([libavutil versions 55 and later are not supported.]) |
200 |
-+ PKG_CHECK_EXISTS([libavutil < 56],, [ |
201 |
-+ AC_MSG_ERROR([libavutil versions 56 and later are not supported.]) |
202 |
- ]) |
203 |
- VLC_SAVE_FLAGS |
204 |
- CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" |
205 |
-Index: vlc-2.2.4/modules/codec/avcodec/audio.c |
206 |
-=================================================================== |
207 |
---- vlc-2.2.4.orig/modules/codec/avcodec/audio.c |
208 |
-+++ vlc-2.2.4/modules/codec/avcodec/audio.c |
209 |
-@@ -39,8 +39,6 @@ |
210 |
- #include <libavcodec/avcodec.h> |
211 |
- #include <libavutil/mem.h> |
212 |
- |
213 |
--#include <libavutil/audioconvert.h> |
214 |
-- |
215 |
- #include "avcodec.h" |
216 |
- |
217 |
- /***************************************************************************** |
218 |
-Index: vlc-2.2.4/modules/codec/avcodec/encoder.c |
219 |
-=================================================================== |
220 |
---- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c |
221 |
-+++ vlc-2.2.4/modules/codec/avcodec/encoder.c |
222 |
-@@ -41,7 +41,6 @@ |
223 |
- #include <vlc_cpu.h> |
224 |
- |
225 |
- #include <libavcodec/avcodec.h> |
226 |
--#include <libavutil/audioconvert.h> |
227 |
- |
228 |
- #include "avcodec.h" |
229 |
- #include "avcommon.h" |
230 |
-@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this ) |
231 |
- else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, |
232 |
- &psz_namecodec ) ) |
233 |
- { |
234 |
-- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE ) |
235 |
-+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE ) |
236 |
- return VLC_EGENERIC; /* handed chroma output */ |
237 |
- |
238 |
- i_cat = VIDEO_ES; |
239 |
-@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this ) |
240 |
- |
241 |
- if( p_codec->pix_fmts ) |
242 |
- { |
243 |
-- const enum PixelFormat *p = p_codec->pix_fmts; |
244 |
-+ const enum AVPixelFormat *p = p_codec->pix_fmts; |
245 |
- for( ; *p != -1; p++ ) |
246 |
- { |
247 |
- if( *p == p_context->pix_fmt ) break; |
248 |
-@@ -1017,7 +1016,7 @@ errmsg: |
249 |
- } |
250 |
- } |
251 |
- |
252 |
-- p_sys->frame = avcodec_alloc_frame(); |
253 |
-+ p_sys->frame = av_frame_alloc(); |
254 |
- if( !p_sys->frame ) |
255 |
- { |
256 |
- goto error; |
257 |
-@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t * |
258 |
- AVFrame *frame = NULL; |
259 |
- if( likely(p_pict) ) { |
260 |
- frame = p_sys->frame; |
261 |
-- avcodec_get_frame_defaults( frame ); |
262 |
-+ av_frame_unref( frame ); |
263 |
- for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) |
264 |
- { |
265 |
- p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels; |
266 |
-@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc |
267 |
- //How much we need to copy from new packet |
268 |
- const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; |
269 |
- |
270 |
-- avcodec_get_frame_defaults( p_sys->frame ); |
271 |
-+ av_frame_unref( p_sys->frame ); |
272 |
- p_sys->frame->format = p_sys->p_context->sample_fmt; |
273 |
- p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; |
274 |
- |
275 |
-@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t * |
276 |
- while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) || |
277 |
- ( p_sys->b_variable && p_aout_buf->i_nb_samples ) ) |
278 |
- { |
279 |
-- avcodec_get_frame_defaults( p_sys->frame ); |
280 |
-+ av_frame_unref( p_sys->frame ); |
281 |
- if( p_sys->b_variable ) |
282 |
- p_sys->frame->nb_samples = p_aout_buf->i_nb_samples; |
283 |
- else |
284 |
-Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c |
285 |
-=================================================================== |
286 |
---- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c |
287 |
-+++ vlc-2.2.4/modules/codec/avcodec/vaapi.c |
288 |
-@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod |
289 |
- return err; |
290 |
- |
291 |
- /* Only VLD supported */ |
292 |
-- p_va->pix_fmt = PIX_FMT_VAAPI_VLD; |
293 |
-+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD; |
294 |
- p_va->setup = Setup; |
295 |
- p_va->get = Get; |
296 |
- p_va->release = Release; |
297 |
-Index: vlc-2.2.4/modules/codec/avcodec/video.c |
298 |
-=================================================================== |
299 |
---- vlc-2.2.4.orig/modules/codec/avcodec/video.c |
300 |
-+++ vlc-2.2.4/modules/codec/avcodec/video.c |
301 |
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC |
302 |
- static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * ); |
303 |
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * ); |
304 |
- #endif |
305 |
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *, |
306 |
-- const enum PixelFormat * ); |
307 |
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *, |
308 |
-+ const enum AVPixelFormat * ); |
309 |
- |
310 |
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc ) |
311 |
- { |
312 |
-@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo |
313 |
- p_sys->p_codec = p_codec; |
314 |
- p_sys->i_codec_id = i_codec_id; |
315 |
- p_sys->psz_namecodec = psz_namecodec; |
316 |
-- p_sys->p_ff_pic = avcodec_alloc_frame(); |
317 |
-+ p_sys->p_ff_pic = av_frame_alloc(); |
318 |
- p_sys->b_delayed_open = true; |
319 |
- p_sys->p_va = NULL; |
320 |
- vlc_sem_init( &p_sys->sem_mt, 0 ); |
321 |
-@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo |
322 |
- if( ffmpeg_OpenCodec( p_dec ) < 0 ) |
323 |
- { |
324 |
- msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec ); |
325 |
-- avcodec_free_frame( &p_sys->p_ff_pic ); |
326 |
-+ av_frame_free( &p_sys->p_ff_pic ); |
327 |
- vlc_sem_destroy( &p_sys->sem_mt ); |
328 |
- free( p_sys ); |
329 |
- return VLC_EGENERIC; |
330 |
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec ) |
331 |
- wait_mt( p_sys ); |
332 |
- |
333 |
- if( p_sys->p_ff_pic ) |
334 |
-- avcodec_free_frame( &p_sys->p_ff_pic ); |
335 |
-+ av_frame_free( &p_sys->p_ff_pic ); |
336 |
- |
337 |
- if( p_sys->p_va ) |
338 |
- vlc_va_Delete( p_sys->p_va ); |
339 |
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru |
340 |
- } |
341 |
- #endif |
342 |
- |
343 |
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, |
344 |
-- const enum PixelFormat *pi_fmt ) |
345 |
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, |
346 |
-+ const enum AVPixelFormat *pi_fmt ) |
347 |
- { |
348 |
- decoder_t *p_dec = p_context->opaque; |
349 |
- decoder_sys_t *p_sys = p_dec->p_sys; |
350 |
|
351 |
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch |
352 |
deleted file mode 100644 |
353 |
index 218af58281f..00000000000 |
354 |
--- a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch |
355 |
+++ /dev/null |
356 |
@@ -1,45 +0,0 @@ |
357 |
-commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752 |
358 |
-Author: Rafaël Carré <funman@××××××××.org> |
359 |
-Date: Fri Feb 26 00:36:26 2016 +0000 |
360 |
- |
361 |
- Relax requirements for FFmpeg hwaccel |
362 |
- |
363 |
- It doesn't error out anymore since 5edd1f62ca1 |
364 |
- |
365 |
-Index: vlc-2.2.4/configure.ac |
366 |
-=================================================================== |
367 |
---- vlc-2.2.4.orig/configure.ac |
368 |
-+++ vlc-2.2.4/configure.ac |
369 |
-@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a " |
370 |
- case "${avfork}" in |
371 |
- ffmpeg) |
372 |
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ |
373 |
-- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.]) |
374 |
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [ |
375 |
-+ AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.]) |
376 |
-+ ]) |
377 |
- ]) |
378 |
- ;; |
379 |
- esac |
380 |
-@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"], |
381 |
- case "${avfork}" in |
382 |
- ffmpeg) |
383 |
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ |
384 |
-- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) |
385 |
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [ |
386 |
-+ AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.]) |
387 |
-+ ]) |
388 |
- ]) |
389 |
- ;; |
390 |
- esac |
391 |
-@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a " |
392 |
- libav) av_vdpau_ver="55.26.0" ;; |
393 |
- ffmpeg) av_vdpau_ver="55.42.100" |
394 |
- PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ |
395 |
-- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) |
396 |
-+ PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [ |
397 |
-+ AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.]) |
398 |
-+ ]) |
399 |
- ]) |
400 |
- ;; |
401 |
- esac |
402 |
|
403 |
diff --git a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch |
404 |
deleted file mode 100644 |
405 |
index 2e8064446d0..00000000000 |
406 |
--- a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch |
407 |
+++ /dev/null |
408 |
@@ -1,34 +0,0 @@ |
409 |
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9 |
410 |
- |
411 |
---- a/src/input/decoder.c |
412 |
-+++ b/src/input/decoder.c |
413 |
-@@ -1162,7 +1162,10 @@ |
414 |
- b_paused = p_owner->b_paused; |
415 |
- |
416 |
- if (!p_audio) |
417 |
-+ { |
418 |
-+ vlc_mutex_unlock( &p_owner->lock ); |
419 |
- break; |
420 |
-+ } |
421 |
- |
422 |
- /* */ |
423 |
- int i_rate = INPUT_RATE_DEFAULT; |
424 |
-@@ -1180,6 +1183,9 @@ |
425 |
- |
426 |
- if( unlikely(p_owner->b_paused != b_paused) ) |
427 |
- continue; /* race with input thread? retry... */ |
428 |
-+ |
429 |
-+ vlc_mutex_unlock( &p_owner->lock ); |
430 |
-+ |
431 |
- if( p_aout == NULL ) |
432 |
- b_reject = true; |
433 |
- |
434 |
-@@ -1199,7 +1205,6 @@ |
435 |
- |
436 |
- break; |
437 |
- } |
438 |
-- vlc_mutex_unlock( &p_owner->lock ); |
439 |
- } |
440 |
- |
441 |
- static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block ) |
442 |
- |
443 |
|
444 |
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch |
445 |
deleted file mode 100644 |
446 |
index 57b66685ede..00000000000 |
447 |
--- a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch |
448 |
+++ /dev/null |
449 |
@@ -1,28 +0,0 @@ |
450 |
-From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001 |
451 |
-From: Tristan Matthews <tmatth@××××××××.org> |
452 |
-Date: Wed, 29 Nov 2017 10:45:04 -0500 |
453 |
-Subject: [PATCH] upnp: don't clash with libupnp's own compat code |
454 |
- |
455 |
-Fixes build for upnp >= 1.6.23 and less than 1.8. |
456 |
- |
457 |
-Signed-off-by: Jean-Baptiste Kempf <jb@××××××××.org> |
458 |
---- |
459 |
- modules/services_discovery/upnp.cpp | 2 +- |
460 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
461 |
- |
462 |
-diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp |
463 |
-index bdd3c55ee5..82d43632f4 100644 |
464 |
---- a/modules/services_discovery/upnp.cpp |
465 |
-+++ b/modules/services_discovery/upnp.cpp |
466 |
-@@ -38,7 +38,7 @@ |
467 |
- #include <set> |
468 |
- #include <string> |
469 |
- |
470 |
--#if UPNP_VERSION < 10800 |
471 |
-+#if UPNP_VERSION < 10623 |
472 |
- /* |
473 |
- * Compat functions and typedefs for libupnp prior to 1.8 |
474 |
- */ |
475 |
--- |
476 |
-2.11.0 |
477 |
- |
478 |
|
479 |
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml |
480 |
index 1ce2f06bd57..170d86d98e4 100644 |
481 |
--- a/media-video/vlc/metadata.xml |
482 |
+++ b/media-video/vlc/metadata.xml |
483 |
@@ -9,27 +9,19 @@ |
484 |
<flag name="aom">Enable experimental support for AV1 codec</flag> |
485 |
<flag name="archive">Enable support for libarchive stream extractor</flag> |
486 |
<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag> |
487 |
- <flag name="atmo">Enable support for AtmoLight (homebrew Ambient Lighting Technology)</flag> |
488 |
- <flag name="audioqueue">Enable AudioQueue audio module for Mac OS X</flag> |
489 |
- <flag name="avcodec">Enable libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg</flag> |
490 |
- <flag name="avformat">Enable libformat support for reading and writing various media containers. libavformat is part of FFmpeg</flag> |
491 |
<flag name="bluray">Enable libbluray for Blu-ray disc support</flag> |
492 |
<flag name="chromaprint">Enable libchromaprint for Chromaprint based audio fingerprinter support</flag> |
493 |
<flag name="chromecast">Enable experimental support for Google Chromecast</flag> |
494 |
<flag name="dc1394">Enable IIDC cameras support</flag> |
495 |
<flag name="directx">Enable Win32 DirectX support</flag> |
496 |
<flag name="dvbpsi">Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg></flag> |
497 |
- <flag name="dxva2">Enable Win32 DxVA2 support</flag> |
498 |
<flag name="encode">Enable streaming-output support and videolan manager to control multiple streams from within one instance</flag> |
499 |
<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2</flag> |
500 |
<flag name="fdk">Enable the Fraunhofer AAC codec library</flag> |
501 |
<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis (with external sound fonts)</flag> |
502 |
<flag name="gcrypt">Enable cryptography support via libgcrypt</flag> |
503 |
<flag name="gme">Enable support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats</flag> |
504 |
- <flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related</flag> |
505 |
- <flag name="growl">Enable growl notification support (over UDP for remote access and native on OSX)</flag> |
506 |
<flag name="gstreamer">Enable GStreamer based decoding support (currently supports only video decoding)</flag> |
507 |
- <flag name="httpd">Enable a web based interface for vlc</flag> |
508 |
<flag name="kate">Adds support for Ogg Kate subtitles via libkate</flag> |
509 |
<flag name="kms">Enable kernel mode setting video output plugin via <pkg>x11-libs/libdrm</pkg></flag> |
510 |
<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins</flag> |
511 |
@@ -37,10 +29,7 @@ |
512 |
<flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag> |
513 |
<flag name="live">Enable live555 streaming media support (client support for rtsp)</flag> |
514 |
<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things</flag> |
515 |
- <flag name="macosx-dialog-provider">Enable Mac OS X dialog module</flag> |
516 |
- <flag name="macosx-eyetv">Enable Mac OS X EyeTV (TNT Tuner) module</flag> |
517 |
<flag name="macosx-notifications">Enable Mac OS X notifications module (formerly growl)</flag> |
518 |
- <flag name="macosx-quartztext">Enable Mac OS X quartz text module</flag> |
519 |
<flag name="macosx-qtkit">Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module</flag> |
520 |
<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag> |
521 |
<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag> |
522 |
@@ -61,17 +50,13 @@ |
523 |
<flag name="skins">Enable support for the skins2 interface</flag> |
524 |
<flag name="soxr">Enable SoX Resampler support via <pkg>media-libs/soxr</pkg></flag> |
525 |
<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag> |
526 |
- <flag name="swscale">Enable image scaling and conversion via libswscale (part of FFmpeg)</flag> |
527 |
<flag name="tremor">Enable tremor, a fixed-point version of the Ogg Vorbis decoder</flag> |
528 |
<flag name="twolame">Enable twolame support (MPEG Audio Layer 2 encoder)</flag> |
529 |
<flag name="upnp">Enable support for the Intel SDK stack based UPnP discovery module instead of CyberLink</flag> |
530 |
- <flag name="vcdx">Enable VCD with navigation via libvcdinfo (depends on cdio)</flag> |
531 |
- <flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC</flag> |
532 |
<flag name="vpx">Enable the decoder(s) from the WebM VP8 / VP9 Codec SDK</flag> |
533 |
<flag name="wma-fixed">Enable fixed point WMA decoder</flag> |
534 |
<flag name="X">Enable support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface</flag> |
535 |
<flag name="x265">Support X265 Encoder</flag> |
536 |
- <flag name="xcb">Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678</flag> |
537 |
<flag name="zeroconf">Enable support for zero-configuration networking via avahi</flag> |
538 |
<flag name="zvbi">Enable support for teletext subtitles via the zvbi library</flag> |
539 |
</use> |
540 |
|
541 |
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild |
542 |
deleted file mode 100644 |
543 |
index df48927b371..00000000000 |
544 |
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild |
545 |
+++ /dev/null |
546 |
@@ -1,480 +0,0 @@ |
547 |
-# Copyright 1999-2018 Gentoo Foundation |
548 |
-# Distributed under the terms of the GNU General Public License v2 |
549 |
- |
550 |
-EAPI=6 |
551 |
- |
552 |
-MY_PV="${PV/_/-}" |
553 |
-MY_PV="${MY_PV/-beta/-test}" |
554 |
-MY_P="${PN}-${MY_PV}" |
555 |
-if [[ ${PV} = *9999 ]] ; then |
556 |
- if [[ ${PV%.9999} != ${PV} ]] ; then |
557 |
- EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git" |
558 |
- else |
559 |
- EGIT_REPO_URI="https://git.videolan.org/git/vlc.git" |
560 |
- fi |
561 |
- SCM="git-r3" |
562 |
-else |
563 |
- if [[ ${MY_P} = ${P} ]] ; then |
564 |
- SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" |
565 |
- else |
566 |
- SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" |
567 |
- fi |
568 |
- KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd" |
569 |
-fi |
570 |
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} |
571 |
- |
572 |
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming" |
573 |
-HOMEPAGE="https://www.videolan.org/vlc/" |
574 |
- |
575 |
-LICENSE="LGPL-2.1 GPL-2" |
576 |
-SLOT="0/5-8" # vlc - vlccore |
577 |
- |
578 |
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda |
579 |
- cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2 |
580 |
- elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme |
581 |
- gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav |
582 |
- libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua |
583 |
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit |
584 |
- matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg |
585 |
- omxil opencv opengl optimisememory opus png postproc projectm pulseaudio |
586 |
- +qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout |
587 |
- sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype |
588 |
- twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X |
589 |
- x264 x265 +xcb xml xv zeroconf zvbi |
590 |
-" |
591 |
-REQUIRED_USE=" |
592 |
- aalib? ( X ) |
593 |
- bidi? ( truetype ) |
594 |
- cddb? ( cdda ) |
595 |
- dvb? ( dvbpsi ) |
596 |
- dxva2? ( avcodec ) |
597 |
- ffmpeg? ( avcodec avformat swscale ) |
598 |
- fontconfig? ( truetype ) |
599 |
- gnutls? ( gcrypt ) |
600 |
- httpd? ( lua ) |
601 |
- libcaca? ( X ) |
602 |
- libtar? ( skins ) |
603 |
- libtiger? ( kate ) |
604 |
- qt5? ( X ) |
605 |
- sdl? ( X ) |
606 |
- skins? ( qt5 truetype X xml ) |
607 |
- vaapi? ( avcodec X ) |
608 |
- vdpau? ( X ) |
609 |
- vlm? ( encode ) |
610 |
- xv? ( xcb ) |
611 |
-" |
612 |
-RDEPEND=" |
613 |
- dev-libs/libgpg-error:0 |
614 |
- net-dns/libidn:0 |
615 |
- sys-libs/zlib:0[minizip] |
616 |
- virtual/libintl:0 |
617 |
- a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) |
618 |
- aalib? ( media-libs/aalib:0 ) |
619 |
- alsa? ( >=media-libs/alsa-lib-1.0.24:0 ) |
620 |
- avcodec? ( |
621 |
- !libav? ( media-video/ffmpeg:0= ) |
622 |
- libav? ( media-video/libav:0= ) |
623 |
- ) |
624 |
- avformat? ( |
625 |
- !libav? ( media-video/ffmpeg:0= ) |
626 |
- libav? ( media-video/libav:0= ) |
627 |
- ) |
628 |
- bidi? ( dev-libs/fribidi:0 ) |
629 |
- bluray? ( >=media-libs/libbluray-0.3:0= ) |
630 |
- cddb? ( >=media-libs/libcddb-1.2:0 ) |
631 |
- chromaprint? ( >=media-libs/chromaprint-0.6:0 ) |
632 |
- dbus? ( >=sys-apps/dbus-1.6:0 ) |
633 |
- dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 ) |
634 |
- dts? ( >=media-libs/libdca-0.0.5:0 ) |
635 |
- dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= ) |
636 |
- dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 ) |
637 |
- elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 ) |
638 |
- faad? ( >=media-libs/faad2-2.6.1:0 ) |
639 |
- fdk? ( media-libs/fdk-aac:0 ) |
640 |
- flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 ) |
641 |
- fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 ) |
642 |
- fontconfig? ( media-libs/fontconfig:1.0 ) |
643 |
- gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= ) |
644 |
- gme? ( media-libs/game-music-emu:0 ) |
645 |
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 ) |
646 |
- gnutls? ( >=net-libs/gnutls-3.0.20:0 ) |
647 |
- gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) |
648 |
- ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 ) |
649 |
- jack? ( virtual/jack ) |
650 |
- jpeg? ( virtual/jpeg:0 ) |
651 |
- kate? ( >=media-libs/libkate-0.3:0 ) |
652 |
- libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 ) |
653 |
- libcaca? ( >=media-libs/libcaca-0.99_beta14:0 ) |
654 |
- libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 ) |
655 |
- libsamplerate? ( media-libs/libsamplerate:0 ) |
656 |
- libtar? ( >=dev-libs/libtar-1.2.11-r3:0 ) |
657 |
- libtiger? ( >=media-libs/libtiger-0.3.1:0 ) |
658 |
- linsys? ( >=media-libs/zvbi-0.2.28:0 ) |
659 |
- lirc? ( app-misc/lirc:0 ) |
660 |
- live? ( >=media-plugins/live-2011.12.23:0 ) |
661 |
- lua? ( >=dev-lang/lua-5.1:0 ) |
662 |
- matroska? ( >=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= ) |
663 |
- modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 ) |
664 |
- mp3? ( media-libs/libmad:0 ) |
665 |
- mpeg? ( >=media-libs/libmpeg2-0.3.2:0 ) |
666 |
- mtp? ( >=media-libs/libmtp-1:0 ) |
667 |
- musepack? ( >=media-sound/musepack-tools-444:0 ) |
668 |
- ncurses? ( sys-libs/ncurses:0=[unicode] ) |
669 |
- ogg? ( >=media-libs/libogg-1:0 ) |
670 |
- opencv? ( >media-libs/opencv-2:0= ) |
671 |
- opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 ) |
672 |
- opus? ( >=media-libs/opus-1.0.3:0 ) |
673 |
- png? ( media-libs/libpng:0= ) |
674 |
- postproc? ( |
675 |
- !libav? ( >=media-video/ffmpeg-2.2:0= ) |
676 |
- libav? ( media-libs/libpostproc:0= ) |
677 |
- ) |
678 |
- projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 ) |
679 |
- pulseaudio? ( >=media-sound/pulseaudio-1:0 ) |
680 |
- qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) |
681 |
- rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) |
682 |
- samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) |
683 |
- schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) |
684 |
- sdl? ( >=media-libs/libsdl-1.2.10:0 |
685 |
- sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) ) |
686 |
- sftp? ( net-libs/libssh2:0 ) |
687 |
- shout? ( >=media-libs/libshout-2.1:0 ) |
688 |
- sid? ( media-libs/libsidplay:2 ) |
689 |
- skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 ) |
690 |
- speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) |
691 |
- svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 ) |
692 |
- swscale? ( |
693 |
- !libav? ( media-video/ffmpeg:0= ) |
694 |
- libav? ( media-video/libav:0= ) |
695 |
- ) |
696 |
- taglib? ( >=media-libs/taglib-1.9:0 ) |
697 |
- theora? ( >=media-libs/libtheora-1.0_beta3:0 ) |
698 |
- tremor? ( media-libs/tremor:0 ) |
699 |
- truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 |
700 |
- !fontconfig? ( media-fonts/dejavu:0 ) ) |
701 |
- twolame? ( media-sound/twolame:0 ) |
702 |
- udev? ( >=virtual/udev-142:0 ) |
703 |
- upnp? ( net-libs/libupnp:= ) |
704 |
- v4l? ( media-libs/libv4l:0 ) |
705 |
- vaapi? ( |
706 |
- x11-libs/libva:0=[X,drm] |
707 |
- !libav? ( media-video/ffmpeg:0=[vaapi] ) |
708 |
- libav? ( media-video/libav:0=[vaapi] ) |
709 |
- ) |
710 |
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) |
711 |
- vdpau? ( |
712 |
- x11-libs/libvdpau:0 |
713 |
- !libav? ( media-video/ffmpeg:0= ) |
714 |
- libav? ( >=media-video/libav-10:0= ) |
715 |
- ) |
716 |
- vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |
717 |
- vorbis? ( media-libs/libvorbis:0 ) |
718 |
- vpx? ( media-libs/libvpx:0= ) |
719 |
- X? ( x11-libs/libX11:0 ) |
720 |
- x264? ( media-libs/x264:0= ) |
721 |
- x265? ( media-libs/x265:0= ) |
722 |
- xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 ) |
723 |
- xml? ( dev-libs/libxml2:2 ) |
724 |
- zeroconf? ( >=net-dns/avahi-0.6:0[dbus] ) |
725 |
- zvbi? ( media-libs/zvbi:0 ) |
726 |
-" |
727 |
-DEPEND="${RDEPEND} |
728 |
- app-arch/xz-utils:0 |
729 |
- >=sys-devel/gettext-0.18.3:* |
730 |
- virtual/pkgconfig:* |
731 |
- amd64? ( dev-lang/yasm:* ) |
732 |
- x86? ( dev-lang/yasm:* ) |
733 |
- xcb? ( x11-base/xorg-proto ) |
734 |
-" |
735 |
- |
736 |
-PATCHES=( |
737 |
- # Fix build system mistake. |
738 |
- "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch |
739 |
- |
740 |
- # Bug #541678 |
741 |
- "${FILESDIR}"/qt4-select.patch |
742 |
- |
743 |
- # Allow QT5.5 since Gentoo has a patched QTwidgets |
744 |
- "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch |
745 |
- |
746 |
- # Bug #575072 |
747 |
- "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch |
748 |
- "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch |
749 |
- |
750 |
- # Bug #589396 |
751 |
- "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch |
752 |
- |
753 |
- # Bug #594126, #629294 |
754 |
- "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch |
755 |
- "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch |
756 |
- |
757 |
- # Bug #593460 |
758 |
- "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch |
759 |
- |
760 |
- "${FILESDIR}"/${P}-libupnp-compat.patch |
761 |
- |
762 |
- # Bug 590164 |
763 |
- "${FILESDIR}"/${P}-freerdp-2.patch |
764 |
-) |
765 |
- |
766 |
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) |
767 |
- |
768 |
-S="${WORKDIR}/${MY_P}" |
769 |
- |
770 |
-src_prepare() { |
771 |
- default |
772 |
- |
773 |
- has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch |
774 |
- |
775 |
- # Bootstrap when we are on a git checkout. |
776 |
- if [[ ${PV} = *9999 ]] ; then |
777 |
- ./bootstrap |
778 |
- fi |
779 |
- |
780 |
- # Make it build with libtool 1.5 |
781 |
- rm -f m4/lt* m4/libtool.m4 || die |
782 |
- |
783 |
- # We are not in a real git checkout due to the absence of a .git directory. |
784 |
- touch src/revision.txt || die |
785 |
- |
786 |
- # Don't use --started-from-file when not using dbus. |
787 |
- if ! use dbus ; then |
788 |
- sed -i 's/ --started-from-file//' share/vlc.desktop.in || die |
789 |
- fi |
790 |
- |
791 |
- # Disable running of vlc-cache-gen, we do that in pkg_postinst |
792 |
- sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ |
793 |
- -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" |
794 |
- |
795 |
- eautoreconf |
796 |
- |
797 |
- # Disable automatic running of tests. |
798 |
- find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die |
799 |
- |
800 |
- # If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt |
801 |
- # version may be used. Setting QT_SELECT environment variable will enforce correct binaries. |
802 |
- if use qt5; then |
803 |
- export QT_SELECT=qt5 |
804 |
- fi |
805 |
-} |
806 |
- |
807 |
-src_configure() { |
808 |
- local myconf |
809 |
- |
810 |
- # Compatibility fix for Samba 4. |
811 |
- use samba && append-cppflags "-I/usr/include/samba-4.0" |
812 |
- |
813 |
- if use x86; then |
814 |
- # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 |
815 |
- append-cflags $(test-flags-CC -fno-stack-check) |
816 |
- # Bug 569774 |
817 |
- replace-flags -Os -O2 |
818 |
- fi |
819 |
- |
820 |
- # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... |
821 |
- append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" |
822 |
- |
823 |
- xdg_environment_reset # bug 608256 |
824 |
- |
825 |
- if use truetype || use projectm ; then |
826 |
- local dejavu="/usr/share/fonts/dejavu/" |
827 |
- myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \ |
828 |
- --with-default-font-family=Sans \ |
829 |
- --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf |
830 |
- --with-default-monospace-font-family=Monospace" |
831 |
- fi |
832 |
- |
833 |
- if use qt5 ; then |
834 |
- myconf+=" --enable-qt=5" |
835 |
- else |
836 |
- myconf+=" --disable-qt" |
837 |
- fi |
838 |
- |
839 |
- econf \ |
840 |
- ${myconf} \ |
841 |
- --enable-vlc \ |
842 |
- --docdir=/usr/share/doc/${PF} \ |
843 |
- --disable-dependency-tracking \ |
844 |
- --disable-optimizations \ |
845 |
- --disable-update-check \ |
846 |
- --enable-fast-install \ |
847 |
- --enable-screen \ |
848 |
- $(use_enable a52) \ |
849 |
- $(use_enable aalib aa) \ |
850 |
- $(use_enable alsa) \ |
851 |
- $(use_enable altivec) \ |
852 |
- $(use_enable atmo) \ |
853 |
- $(use_enable audioqueue) \ |
854 |
- $(use_enable avcodec) \ |
855 |
- $(use_enable avformat) \ |
856 |
- $(use_enable bidi fribidi) \ |
857 |
- $(use_enable bluray) \ |
858 |
- $(use_enable cdda vcd) \ |
859 |
- $(use_enable cddb libcddb) \ |
860 |
- $(use_enable chromaprint) \ |
861 |
- $(use_enable dbus) \ |
862 |
- $(use_enable directx) \ |
863 |
- $(use_enable dc1394) \ |
864 |
- $(use_enable debug) \ |
865 |
- $(use_enable dts dca) \ |
866 |
- $(use_enable dvbpsi) \ |
867 |
- $(use_enable dvd dvdread) $(use_enable dvd dvdnav) \ |
868 |
- $(use_enable dxva2) \ |
869 |
- $(use_enable encode sout) \ |
870 |
- $(use_enable faad) \ |
871 |
- $(use_enable fdk fdkaac) \ |
872 |
- $(use_enable flac) \ |
873 |
- $(use_enable fluidsynth) \ |
874 |
- $(use_enable fontconfig) \ |
875 |
- $(use_enable gcrypt libgcrypt) \ |
876 |
- $(use_enable gme) \ |
877 |
- $(use_enable gnome gnomevfs) \ |
878 |
- $(use_enable gnutls) \ |
879 |
- $(use_enable growl) \ |
880 |
- $(use_enable gstreamer gst-decode) \ |
881 |
- $(use_enable httpd) \ |
882 |
- $(use_enable ieee1394 dv1394) \ |
883 |
- $(use_enable jack) \ |
884 |
- $(use_enable jpeg) \ |
885 |
- $(use_enable kate) \ |
886 |
- $(use_enable libass) \ |
887 |
- $(use_enable libcaca caca) \ |
888 |
- $(use_enable libnotify notify) \ |
889 |
- $(use_enable libsamplerate samplerate) \ |
890 |
- $(use_enable libtar) \ |
891 |
- $(use_enable libtiger tiger) \ |
892 |
- $(use_enable linsys) \ |
893 |
- $(use_enable lirc) \ |
894 |
- $(use_enable live live555) \ |
895 |
- $(use_enable lua) \ |
896 |
- $(use_enable macosx-dialog-provider) \ |
897 |
- $(use_enable macosx-eyetv) \ |
898 |
- $(use_enable macosx-qtkit) \ |
899 |
- $(use_enable macosx-quartztext) \ |
900 |
- $(use_enable matroska mkv) \ |
901 |
- $(use_enable cpu_flags_x86_mmx mmx) \ |
902 |
- $(use_enable modplug mod) \ |
903 |
- $(use_enable mp3 mad) \ |
904 |
- $(use_enable mpeg libmpeg2) \ |
905 |
- $(use_enable mtp) \ |
906 |
- $(use_enable musepack mpc) \ |
907 |
- $(use_enable ncurses) \ |
908 |
- $(use_enable neon) \ |
909 |
- $(use_enable ogg) $(use_enable ogg mux_ogg) \ |
910 |
- $(use_enable omxil) \ |
911 |
- $(use_enable omxil omxil-vout) \ |
912 |
- $(use_enable opencv) \ |
913 |
- $(use_enable opengl glspectrum) \ |
914 |
- $(use_enable opus) \ |
915 |
- $(use_enable optimisememory optimize-memory) \ |
916 |
- $(use_enable png) \ |
917 |
- $(use_enable postproc) \ |
918 |
- $(use_enable projectm) \ |
919 |
- $(use_enable pulseaudio pulse) \ |
920 |
- $(use_enable rdp freerdp) \ |
921 |
- $(use_enable rtsp realrtsp) \ |
922 |
- $(use_enable run-as-root) \ |
923 |
- $(use_enable samba smbclient) \ |
924 |
- $(use_enable schroedinger) \ |
925 |
- $(use_enable sdl) \ |
926 |
- $(use_enable sdl-image) \ |
927 |
- $(use_enable sid) \ |
928 |
- $(use_enable sftp) \ |
929 |
- $(use_enable shout) \ |
930 |
- $(use_enable skins skins2) \ |
931 |
- $(use_enable speex) \ |
932 |
- $(use_enable cpu_flags_x86_sse sse) \ |
933 |
- $(use_enable svg) \ |
934 |
- $(use_enable svg svgdec) \ |
935 |
- $(use_enable swscale) \ |
936 |
- $(use_enable taglib) \ |
937 |
- $(use_enable theora) \ |
938 |
- $(use_enable tremor) \ |
939 |
- $(use_enable truetype freetype) \ |
940 |
- $(use_enable twolame) \ |
941 |
- $(use_enable udev) \ |
942 |
- $(use_enable upnp) \ |
943 |
- $(use_enable v4l v4l2) \ |
944 |
- $(use_enable vaapi libva) \ |
945 |
- $(use_enable vcdx) \ |
946 |
- $(use_enable vdpau) \ |
947 |
- $(use_enable vlm) \ |
948 |
- $(use_enable vnc) \ |
949 |
- $(use_enable vorbis) \ |
950 |
- $(use_enable vpx) \ |
951 |
- $(use_enable wma-fixed) \ |
952 |
- $(use_with X x) \ |
953 |
- $(use_enable x264) \ |
954 |
- $(use_enable x265) \ |
955 |
- $(use_enable xcb) \ |
956 |
- $(use_enable xml libxml2) \ |
957 |
- $(use_enable xv xvideo) \ |
958 |
- $(use_enable zeroconf bonjour) \ |
959 |
- $(use_enable zvbi) $(use_enable !zvbi telx) \ |
960 |
- --disable-asdcp \ |
961 |
- --disable-coverage \ |
962 |
- --disable-cprof \ |
963 |
- --disable-crystalhd \ |
964 |
- --disable-decklink \ |
965 |
- --disable-directfb \ |
966 |
- --disable-gles1 \ |
967 |
- --disable-gles2 \ |
968 |
- --disable-goom \ |
969 |
- --disable-kai \ |
970 |
- --disable-kva \ |
971 |
- --disable-maintainer-mode \ |
972 |
- --disable-merge-ffmpeg \ |
973 |
- --disable-mfx \ |
974 |
- --disable-mmal-codec \ |
975 |
- --disable-mmal-vout \ |
976 |
- --disable-opensles \ |
977 |
- --disable-oss \ |
978 |
- --disable-quicktime \ |
979 |
- --disable-rpi-omxil \ |
980 |
- --disable-shine \ |
981 |
- --disable-sndio \ |
982 |
- --disable-vda \ |
983 |
- --disable-vsxu \ |
984 |
- --disable-wasapi |
985 |
- |
986 |
- # ^ We don't have these disabled libraries in the Portage tree yet. |
987 |
- |
988 |
- # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. |
989 |
- # Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h. |
990 |
- # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file |
991 |
- sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die |
992 |
-} |
993 |
- |
994 |
-src_test() { |
995 |
- virtx emake check-TESTS |
996 |
-} |
997 |
- |
998 |
-src_install() { |
999 |
- default |
1000 |
- find "${D}" -name '*.la' -delete || die |
1001 |
-} |
1002 |
- |
1003 |
-pkg_postinst() { |
1004 |
- if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then |
1005 |
- einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" |
1006 |
- "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/" |
1007 |
- else |
1008 |
- ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" |
1009 |
- ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" |
1010 |
- ewarn "If you do not do it, vlc will take a long time to load." |
1011 |
- fi |
1012 |
- |
1013 |
- gnome2_icon_cache_update |
1014 |
- xdg_mimeinfo_database_update |
1015 |
- xdg_desktop_database_update |
1016 |
-} |
1017 |
- |
1018 |
-pkg_postrm() { |
1019 |
- if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then |
1020 |
- rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" |
1021 |
- fi |
1022 |
- |
1023 |
- gnome2_icon_cache_update |
1024 |
- xdg_mimeinfo_database_update |
1025 |
- xdg_desktop_database_update |
1026 |
-} |