1 |
commit: 73773fe46c95dabdf14ce72e5d2c21c3f52b424b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 18 16:34:00 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 18 16:50:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73773fe4 |
7 |
|
8 |
media-video/mplayer: Drop 1.3.0-r6 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-video/mplayer/Manifest | 2 - |
14 |
.../files/mplayer-1.3-ffmpeg4+mencoder.patch | 360 ------------ |
15 |
.../mplayer/files/mplayer-1.3-vdpau-x11.patch | 19 - |
16 |
media-video/mplayer/metadata.xml | 1 - |
17 |
media-video/mplayer/mplayer-1.3.0-r6.ebuild | 609 --------------------- |
18 |
5 files changed, 991 deletions(-) |
19 |
|
20 |
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest |
21 |
index 522275d16bb..4fd4e60d363 100644 |
22 |
--- a/media-video/mplayer/Manifest |
23 |
+++ b/media-video/mplayer/Manifest |
24 |
@@ -1,6 +1,4 @@ |
25 |
-DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae |
26 |
DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36cbe6bcf6f426c90c2c8c70123e8aed4d01faf52ee6b1fba3c49e11fa13185f81ae8582f90c901b90955a1f42b SHA512 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 |
27 |
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 |
28 |
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 |
29 |
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d |
30 |
-DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081 |
31 |
|
32 |
diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch |
33 |
deleted file mode 100644 |
34 |
index f312203027a..00000000000 |
35 |
--- a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch |
36 |
+++ /dev/null |
37 |
@@ -1,360 +0,0 @@ |
38 |
-r38001 | al | 2017-10-31 23:33:45 +0100 (Tue, 31 Oct 2017) | 37 lines |
39 |
- |
40 |
-ve_lavc,ae_lavc: Adjust to work with newest FFmpeg again |
41 |
- |
42 |
-This commit re-enables previously disabled lavc encoders. |
43 |
- |
44 |
-The lavc audio encoder had no problems by itself after |
45 |
-my last commit, but could not stay enabled because of |
46 |
-the coupling of the lavcopts option. |
47 |
- |
48 |
-Here follows a list of changes done to ve lavc |
49 |
- |
50 |
-* Explicitly use 16 as upper limit for vmax_b_frames |
51 |
- |
52 |
- The FF_MAX_B_FRAMES #define was removed from FFmpeg's API. |
53 |
- |
54 |
- It was removed because there is no global limit to the number of |
55 |
- b frames. While this is the most conservative change to address |
56 |
- the removal of the #define, it may not be optimal because we do |
57 |
- not allow for more than 16 b frames. |
58 |
- |
59 |
-* Options that now need to be passed to the encoder as AVOption |
60 |
- - lmin & lmax |
61 |
- - vrc_strategy |
62 |
- - vqsquish |
63 |
- - vqmod_amp & vqmod_freq |
64 |
- - vrc_eq |
65 |
- - vrc_buf_aggressivity |
66 |
- - vrc_init_cplx |
67 |
- - ibias & pbias |
68 |
- - border_mask |
69 |
- - naq |
70 |
- - gmc |
71 |
- - vme |
72 |
- |
73 |
-* Options that were dropped because they had no effect anymore |
74 |
- - sc_factor |
75 |
- |
76 |
- |
77 |
-Index: MPlayer-1.3.0/Makefile |
78 |
-=================================================================== |
79 |
---- MPlayer-1.3.0.orig/Makefile |
80 |
-+++ MPlayer-1.3.0/Makefile |
81 |
-@@ -615,7 +615,9 @@ SRCS_MPLAYER = command.c |
82 |
- |
83 |
- #MEncoder |
84 |
- SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c |
85 |
--SRCS_MENCODER-$(FFMPEG) += libmpdemux/muxer_lavf.c |
86 |
-+SRCS_MENCODER-$(FFMPEG) += libmpcodecs/ae_lavc.c \ |
87 |
-+ libmpcodecs/ve_lavc.c \ |
88 |
-+ libmpdemux/muxer_lavf.c |
89 |
- SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c |
90 |
- SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \ |
91 |
- libmpcodecs/native/rtjpegn.c |
92 |
-Index: MPlayer-1.3.0/cfg-mencoder.h |
93 |
-=================================================================== |
94 |
---- MPlayer-1.3.0.orig/cfg-mencoder.h |
95 |
-+++ MPlayer-1.3.0/cfg-mencoder.h |
96 |
-@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={ |
97 |
- " nuv - nuppel video\n" |
98 |
- #endif |
99 |
- #ifdef CONFIG_FFMPEG |
100 |
--// " lavc - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps |
101 |
-+ " lavc - libavcodec codecs - best quality!\n" |
102 |
- #endif |
103 |
- #ifdef CONFIG_WIN32DLL |
104 |
- " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n" |
105 |
-@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={ |
106 |
- " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n" |
107 |
- #endif |
108 |
- #ifdef CONFIG_FFMPEG |
109 |
--// " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n"//TODO: ae_lavc was deactivated because it depends on ve_lavc which does not compile after latest FFmpeg major bumps |
110 |
-+ " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n" |
111 |
- #endif |
112 |
- #ifdef CONFIG_TOOLAME |
113 |
- " toolame - Toolame MP2 audio encoder\n" |
114 |
-@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={ |
115 |
- {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, |
116 |
- #endif |
117 |
- #ifdef CONFIG_FFMPEG |
118 |
-- //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps |
119 |
-+ {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, |
120 |
- #else |
121 |
- {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, |
122 |
- #endif /* CONFIG_FFMPEG */ |
123 |
-Index: MPlayer-1.3.0/libmpcodecs/ve.c |
124 |
-=================================================================== |
125 |
---- MPlayer-1.3.0.orig/libmpcodecs/ve.c |
126 |
-+++ MPlayer-1.3.0/libmpcodecs/ve.c |
127 |
-@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264; |
128 |
- |
129 |
- static const vf_info_t * const encoder_list[] = { |
130 |
- #ifdef CONFIG_FFMPEG |
131 |
--// &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps |
132 |
-+ &ve_info_lavc, |
133 |
- #endif |
134 |
- #ifdef CONFIG_WIN32DLL |
135 |
- &ve_info_vfw, |
136 |
-Index: MPlayer-1.3.0/libmpcodecs/ae.c |
137 |
-=================================================================== |
138 |
---- MPlayer-1.3.0.orig/libmpcodecs/ae.c |
139 |
-+++ MPlayer-1.3.0/libmpcodecs/ae.c |
140 |
-@@ -59,7 +59,9 @@ audio_encoder_t *new_audio_encoder(muxer |
141 |
- break; |
142 |
- #endif |
143 |
- #ifdef CONFIG_FFMPEG |
144 |
-- //TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps |
145 |
-+ case ACODEC_LAVC: |
146 |
-+ ris = mpae_init_lavc(encoder); |
147 |
-+ break; |
148 |
- #endif |
149 |
- #ifdef CONFIG_MP3LAME |
150 |
- case ACODEC_VBRMP3: |
151 |
-Index: MPlayer-1.3.0/libmpcodecs/ve_lavc.c |
152 |
-=================================================================== |
153 |
---- MPlayer-1.3.0.orig/libmpcodecs/ve_lavc.c |
154 |
-+++ MPlayer-1.3.0/libmpcodecs/ve_lavc.c |
155 |
-@@ -63,12 +63,9 @@ static int lavc_param_vbitrate = -1; |
156 |
- static int lavc_param_vrate_tolerance = 1000*8; |
157 |
- static int lavc_param_mb_decision = 0; /* default is realtime encoding */ |
158 |
- static int lavc_param_v4mv = 0; |
159 |
--static int lavc_param_vme = 4; |
160 |
- static float lavc_param_vqscale = -1; |
161 |
- static int lavc_param_vqmin = 2; |
162 |
- static int lavc_param_vqmax = 31; |
163 |
--static float lavc_param_lmin = 2; |
164 |
--static float lavc_param_lmax = 31; |
165 |
- static float lavc_param_mb_lmin = 2; |
166 |
- static float lavc_param_mb_lmax = 31; |
167 |
- static int lavc_param_vqdiff = 3; |
168 |
-@@ -81,22 +78,15 @@ static float lavc_param_vi_qoffset = 0.0 |
169 |
- static int lavc_param_vmax_b_frames = 0; |
170 |
- static int lavc_param_keyint = -1; |
171 |
- static int lavc_param_vpass = 0; |
172 |
--static int lavc_param_vrc_strategy = 0; |
173 |
- static int lavc_param_vb_strategy = 0; |
174 |
- static int lavc_param_packet_size= 0; |
175 |
- static int lavc_param_strict= -1; |
176 |
- static int lavc_param_data_partitioning= 0; |
177 |
- static int lavc_param_gray=0; |
178 |
--static float lavc_param_rc_qsquish=1.0; |
179 |
--static float lavc_param_rc_qmod_amp=0; |
180 |
--static int lavc_param_rc_qmod_freq=0; |
181 |
- static char *lavc_param_rc_override_string=NULL; |
182 |
--static char *lavc_param_rc_eq="tex^qComp"; |
183 |
- static int lavc_param_rc_buffer_size=0; |
184 |
--static float lavc_param_rc_buffer_aggressivity=1.0; |
185 |
- static int lavc_param_rc_max_rate=0; |
186 |
- static int lavc_param_rc_min_rate=0; |
187 |
--static float lavc_param_rc_initial_cplx=0; |
188 |
- static float lavc_param_rc_initial_buffer_occupancy=0.9; |
189 |
- static int lavc_param_mpeg_quant=0; |
190 |
- static int lavc_param_fdct=0; |
191 |
-@@ -108,8 +98,6 @@ static float lavc_param_dark_masking= 0. |
192 |
- static float lavc_param_temporal_cplx_masking= 0.0; |
193 |
- static float lavc_param_spatial_cplx_masking= 0.0; |
194 |
- static float lavc_param_p_masking= 0.0; |
195 |
--static float lavc_param_border_masking= 0.0; |
196 |
--static int lavc_param_normalize_aqp= 0; |
197 |
- static int lavc_param_interlaced_dct= 0; |
198 |
- static int lavc_param_prediction_method= FF_PRED_LEFT; |
199 |
- static int lavc_param_format= IMGFMT_YV12; |
200 |
-@@ -131,15 +119,12 @@ static int lavc_param_bit_exact = 0; |
201 |
- static int lavc_param_aic= 0; |
202 |
- static int lavc_param_aiv= 0; |
203 |
- static int lavc_param_umv= 0; |
204 |
--static int lavc_param_gmc= 0; |
205 |
- static int lavc_param_obmc= 0; |
206 |
- static int lavc_param_loop= 0; |
207 |
- static int lavc_param_last_pred= 0; |
208 |
- static int lavc_param_pre_me= 1; |
209 |
- static int lavc_param_me_subpel_quality= 8; |
210 |
- static int lavc_param_me_range= 0; |
211 |
--static int lavc_param_ibias= FF_DEFAULT_QUANT_BIAS; |
212 |
--static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS; |
213 |
- static int lavc_param_coder= 0; |
214 |
- static int lavc_param_context= 0; |
215 |
- static char *lavc_param_intra_matrix = NULL; |
216 |
-@@ -162,7 +147,6 @@ static int lavc_param_skip_exp=0; |
217 |
- static int lavc_param_skip_cmp=0; |
218 |
- static int lavc_param_brd_scale = 0; |
219 |
- static int lavc_param_bidir_refine = 0; |
220 |
--static int lavc_param_sc_factor = 1; |
221 |
- static int lavc_param_video_global_header= 0; |
222 |
- static int lavc_param_mv0_threshold = 256; |
223 |
- static int lavc_param_refs = 1; |
224 |
-@@ -190,21 +174,21 @@ const m_option_t lavcopts_conf[]={ |
225 |
- {"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
226 |
- {"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, |
227 |
- {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
228 |
-- {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, |
229 |
-+ {"vme", "vme has no effect, please use the corresponding codec specific option (see FFmpeg documentation) instead of vme.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
230 |
- {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL}, |
231 |
- {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, |
232 |
- {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, |
233 |
-- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
234 |
-- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
235 |
-+ {"lmin", "Please use o=lmin=<value>*QP2LAMBDA instead of lmin.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
236 |
-+ {"lmax", "Please use o=lmax=<value>*QP2LAMBDA instead of lmax.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
237 |
- {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
238 |
- {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
239 |
- {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, |
240 |
- {"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, |
241 |
- {"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, |
242 |
- {"vb_qfactor", &lavc_param_vb_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, |
243 |
-- {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, FF_MAX_B_FRAMES, NULL}, |
244 |
-+ {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, 16, NULL}, // FF_MAX_B_FRAMES was removed from FFmpeg. We still use its value here, so we probably limit ourselves in some cases. |
245 |
- {"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, |
246 |
-- {"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, |
247 |
-+ {"vrc_strategy", "Please use o=rc_strategy=<value> instead of vrc_strategy.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
248 |
- {"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, |
249 |
- {"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, |
250 |
- {"vlelim", "Please use o=luma_elim_threshold=<value> instead of vlelim.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
251 |
-@@ -217,16 +201,16 @@ const m_option_t lavcopts_conf[]={ |
252 |
- {"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
253 |
- {"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, |
254 |
- {"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, |
255 |
-- {"vqsquish", &lavc_param_rc_qsquish, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, |
256 |
-- {"vqmod_amp", &lavc_param_rc_qmod_amp, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, |
257 |
-- {"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL}, |
258 |
-- {"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
259 |
-+ {"vqsquish", "Please use o=qsquish=<value> instead of vqsquish.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
260 |
-+ {"vqmod_amp", "Please use o=rc_qmod_amp=<value> instead of vqmod_amp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
261 |
-+ {"vqmod_freq", "Please use o=rc_qmod_freq=<value> instead of vqmod_freq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
262 |
-+ {"vrc_eq", "Please use o=rc_eq=<value> instead of vrc_eq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
263 |
- {"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
264 |
- {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, |
265 |
- {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, |
266 |
- {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, MAX_BITRATE, NULL}, |
267 |
-- {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, |
268 |
-- {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL}, |
269 |
-+ {"vrc_buf_aggressivity", "Please use o=rc_buf_aggressivity=<value> instead of vrc_buf_aggressivity.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
270 |
-+ {"vrc_init_cplx", "Please use o=rc_init_cplx=<value> instead of vrc_init_cplx.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
271 |
- {"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, |
272 |
- {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, |
273 |
- {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
274 |
-@@ -235,7 +219,7 @@ const m_option_t lavcopts_conf[]={ |
275 |
- {"tcplx_mask", &lavc_param_temporal_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, |
276 |
- {"scplx_mask", &lavc_param_spatial_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, |
277 |
- {"p_mask", &lavc_param_p_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, |
278 |
-- {"naq", &lavc_param_normalize_aqp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
279 |
-+ {"naq", "Please use o=mpv_flags=+naq instead of naq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
280 |
- {"dark_mask", &lavc_param_dark_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, |
281 |
- {"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
282 |
- {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, |
283 |
-@@ -266,8 +250,8 @@ const m_option_t lavcopts_conf[]={ |
284 |
- {"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
285 |
- {"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
286 |
- {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL}, |
287 |
-- {"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, |
288 |
-- {"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, |
289 |
-+ {"ibias", "Please use o=ibias=<value> instead of ibias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
290 |
-+ {"pbias", "Please use o=pbias=<value> instead of pbias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
291 |
- {"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, |
292 |
- {"context", &lavc_param_context, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, |
293 |
- {"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
294 |
-@@ -280,9 +264,9 @@ const m_option_t lavcopts_conf[]={ |
295 |
- {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
296 |
- {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL}, |
297 |
- {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL}, |
298 |
-- {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL}, |
299 |
-+ {"gmc", "Please use o=gmc=<value> instead of gmc.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
300 |
- {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL}, |
301 |
-- {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, |
302 |
-+ {"border_mask", "Please use o=border_mask=<value> instead of border_mask.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
303 |
- {"inter_threshold", "inter_threshold has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
304 |
- {"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000000, 1000000000, NULL}, |
305 |
- {"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, |
306 |
-@@ -295,7 +279,7 @@ const m_option_t lavcopts_conf[]={ |
307 |
- {"skip_exp", &lavc_param_skip_exp, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL}, |
308 |
- {"brd_scale", &lavc_param_brd_scale, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, |
309 |
- {"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, |
310 |
-- {"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL}, |
311 |
-+ {"sc_factor", "sc_factor has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
312 |
- {"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, |
313 |
- {"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, |
314 |
- {"mv0_threshold", &lavc_param_mv0_threshold, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, |
315 |
-@@ -351,8 +335,6 @@ static int config(struct vf_instance *vf |
316 |
- lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; |
317 |
- lavc_venc_context->qmin= lavc_param_vqmin; |
318 |
- lavc_venc_context->qmax= lavc_param_vqmax; |
319 |
-- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); |
320 |
-- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); |
321 |
- lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5); |
322 |
- lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5); |
323 |
- lavc_venc_context->max_qdiff= lavc_param_vqdiff; |
324 |
-@@ -360,17 +342,12 @@ static int config(struct vf_instance *vf |
325 |
- lavc_venc_context->qblur= lavc_param_vqblur; |
326 |
- lavc_venc_context->max_b_frames= lavc_param_vmax_b_frames; |
327 |
- lavc_venc_context->b_quant_factor= lavc_param_vb_qfactor; |
328 |
-- lavc_venc_context->rc_strategy= lavc_param_vrc_strategy; |
329 |
- lavc_venc_context->b_frame_strategy= lavc_param_vb_strategy; |
330 |
- lavc_venc_context->b_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vb_qoffset + 0.5); |
331 |
- lavc_venc_context->rtp_payload_size= lavc_param_packet_size; |
332 |
- lavc_venc_context->strict_std_compliance= lavc_param_strict; |
333 |
- lavc_venc_context->i_quant_factor= lavc_param_vi_qfactor; |
334 |
- lavc_venc_context->i_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vi_qoffset + 0.5); |
335 |
-- lavc_venc_context->rc_qsquish= lavc_param_rc_qsquish; |
336 |
-- lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp; |
337 |
-- lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq; |
338 |
-- lavc_venc_context->rc_eq= lavc_param_rc_eq; |
339 |
- |
340 |
- mux_v->max_rate= |
341 |
- lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000; |
342 |
-@@ -382,8 +359,6 @@ static int config(struct vf_instance *vf |
343 |
- lavc_venc_context->rc_initial_buffer_occupancy= |
344 |
- lavc_venc_context->rc_buffer_size * |
345 |
- lavc_param_rc_initial_buffer_occupancy; |
346 |
-- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; |
347 |
-- lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx; |
348 |
- lavc_venc_context->debug= lavc_param_debug; |
349 |
- lavc_venc_context->last_predictor_count= lavc_param_last_pred; |
350 |
- lavc_venc_context->pre_me= lavc_param_pre_me; |
351 |
-@@ -391,8 +366,6 @@ static int config(struct vf_instance *vf |
352 |
- lavc_venc_context->pre_dia_size= lavc_param_pre_dia_size; |
353 |
- lavc_venc_context->me_subpel_quality= lavc_param_me_subpel_quality; |
354 |
- lavc_venc_context->me_range= lavc_param_me_range; |
355 |
-- lavc_venc_context->intra_quant_bias= lavc_param_ibias; |
356 |
-- lavc_venc_context->inter_quant_bias= lavc_param_pbias; |
357 |
- lavc_venc_context->coder_type= lavc_param_coder; |
358 |
- lavc_venc_context->context_model= lavc_param_context; |
359 |
- lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; |
360 |
-@@ -479,7 +452,6 @@ static int config(struct vf_instance *vf |
361 |
- lavc_venc_context->spatial_cplx_masking= lavc_param_spatial_cplx_masking; |
362 |
- lavc_venc_context->p_masking= lavc_param_p_masking; |
363 |
- lavc_venc_context->dark_masking= lavc_param_dark_masking; |
364 |
-- lavc_venc_context->border_masking = lavc_param_border_masking; |
365 |
- |
366 |
- if (lavc_param_aspect != NULL) |
367 |
- { |
368 |
-@@ -552,20 +524,17 @@ static int config(struct vf_instance *vf |
369 |
- if (lavc_param_alt) |
370 |
- av_dict_set(&opts, "alternate_scan", "1", 0); |
371 |
- lavc_venc_context->flags|= lavc_param_ilme; |
372 |
-- lavc_venc_context->flags|= lavc_param_gmc; |
373 |
- #ifdef AV_CODEC_FLAG_CLOSED_GOP |
374 |
- lavc_venc_context->flags|= lavc_param_closed_gop; |
375 |
- #endif |
376 |
- lavc_venc_context->flags|= lavc_param_gray; |
377 |
- |
378 |
-- if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP; |
379 |
- if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT; |
380 |
- lavc_venc_context->flags|= lavc_param_psnr; |
381 |
- lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8; |
382 |
- lavc_venc_context->prediction_method= lavc_param_prediction_method; |
383 |
- lavc_venc_context->brd_scale = lavc_param_brd_scale; |
384 |
- lavc_venc_context->bidir_refine = lavc_param_bidir_refine; |
385 |
-- lavc_venc_context->scenechange_factor = lavc_param_sc_factor; |
386 |
- if((lavc_param_video_global_header&1) |
387 |
- /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){ |
388 |
- lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; |
389 |
-@@ -648,8 +617,6 @@ static int config(struct vf_instance *vf |
390 |
- } |
391 |
- } |
392 |
- |
393 |
-- lavc_venc_context->me_method = ME_ZERO+lavc_param_vme; |
394 |
-- |
395 |
- /* fixed qscale :p */ |
396 |
- if (lavc_param_vqscale >= 0.0) |
397 |
- { |
398 |
|
399 |
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch |
400 |
deleted file mode 100644 |
401 |
index cfefb63deb9..00000000000 |
402 |
--- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch |
403 |
+++ /dev/null |
404 |
@@ -1,19 +0,0 @@ |
405 |
-r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines |
406 |
- |
407 |
-vo_vdpau: Explicitly include header vdpau_x11.h |
408 |
- |
409 |
-The include from inside libavcodec/vdpau.h was removed in FFmpeg |
410 |
-commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 . |
411 |
- |
412 |
-Index: libvo/vo_vdpau.c |
413 |
-=================================================================== |
414 |
---- a/libvo/vo_vdpau.c (revision 37931) |
415 |
-+++ b/libvo/vo_vdpau.c (revision 37932) |
416 |
-@@ -34,6 +34,7 @@ |
417 |
- |
418 |
- #include <stdio.h> |
419 |
- #include <strings.h> |
420 |
-+#include <vdpau/vdpau_x11.h> |
421 |
- |
422 |
- #include "config.h" |
423 |
- #include "sub/ass_mp.h" |
424 |
|
425 |
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml |
426 |
index 5f4a3dfe1b7..11e093c1f06 100644 |
427 |
--- a/media-video/mplayer/metadata.xml |
428 |
+++ b/media-video/mplayer/metadata.xml |
429 |
@@ -20,7 +20,6 @@ |
430 |
<flag name="md5sum">Enables md5sum video output</flag> |
431 |
<flag name="mng">MNG input support</flag> |
432 |
<flag name="network">Enables network streaming support</flag> |
433 |
- <flag name="nut">Enables support for the NUT container format</flag> |
434 |
<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag> |
435 |
<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag> |
436 |
<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag> |
437 |
|
438 |
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild |
439 |
deleted file mode 100644 |
440 |
index cc6c4c2db4c..00000000000 |
441 |
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild |
442 |
+++ /dev/null |
443 |
@@ -1,609 +0,0 @@ |
444 |
-# Copyright 1999-2021 Gentoo Authors |
445 |
-# Distributed under the terms of the GNU General Public License v2 |
446 |
- |
447 |
-EAPI=6 |
448 |
- |
449 |
-EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" |
450 |
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" |
451 |
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" |
452 |
- |
453 |
-inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} |
454 |
- |
455 |
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray |
456 |
-bs2b cddb +cdio cdparanoia cpudetection debug dga |
457 |
-doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon |
458 |
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
459 |
-+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas |
460 |
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr |
461 |
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 |
462 |
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix |
463 |
-vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran" |
464 |
- |
465 |
-VIDEO_CARDS="mga" |
466 |
-for x in ${VIDEO_CARDS}; do |
467 |
- IUSE+=" video_cards_${x}" |
468 |
-done |
469 |
- |
470 |
-FONT_URI=" |
471 |
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 |
472 |
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 |
473 |
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 |
474 |
-" |
475 |
-if [[ ${PV} == *9999* ]]; then |
476 |
- RELEASE_URI="" |
477 |
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then |
478 |
- MY_P="MPlayer-${PV}" |
479 |
- S="${WORKDIR}/${MY_P}" |
480 |
- RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz" |
481 |
-else |
482 |
- RELEASE_URI="mirror://gentoo/${P}.tar.xz" |
483 |
-fi |
484 |
-SRC_URI="${RELEASE_URI} |
485 |
- https://dev.gentoo.org/~juippis/distfiles/tmp/mplayer-1.3-ffmpeg4.patch |
486 |
- !truetype? ( ${FONT_URI} )" |
487 |
- |
488 |
-DESCRIPTION="Media Player for Linux" |
489 |
-HOMEPAGE="http://www.mplayerhq.hu/" |
490 |
- |
491 |
-FONT_RDEPS=" |
492 |
- virtual/ttf-fonts |
493 |
- media-libs/fontconfig |
494 |
- >=media-libs/freetype-2.2.1:2 |
495 |
-" |
496 |
-X_RDEPS=" |
497 |
- x11-libs/libXext |
498 |
- x11-libs/libXxf86vm |
499 |
-" |
500 |
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can |
501 |
-# nemesi? ( net-libs/libnemesi ) |
502 |
-# mplayer relies on private APIs in giflib that have been removed: |
503 |
-# https://sourceforge.net/p/giflib/bugs/132/ |
504 |
-RDEPEND+=" |
505 |
- sys-libs/ncurses:0= |
506 |
- app-arch/bzip2 |
507 |
- sys-libs/zlib |
508 |
- >=media-video/ffmpeg-3.0:0=[vdpau?] |
509 |
- a52? ( media-libs/a52dec ) |
510 |
- aalib? ( media-libs/aalib ) |
511 |
- alsa? ( media-libs/alsa-lib ) |
512 |
- bidi? ( dev-libs/fribidi ) |
513 |
- bluray? ( >=media-libs/libbluray-0.2.1:= ) |
514 |
- bs2b? ( media-libs/libbs2b ) |
515 |
- cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) |
516 |
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) |
517 |
- dga? ( x11-libs/libXxf86dga ) |
518 |
- dts? ( media-libs/libdca ) |
519 |
- dv? ( media-libs/libdv ) |
520 |
- dvd? ( >=media-libs/libdvdread-4.1.3:0= ) |
521 |
- dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) |
522 |
- encode? ( |
523 |
- !twolame? ( toolame? ( media-sound/toolame ) ) |
524 |
- twolame? ( media-sound/twolame ) |
525 |
- faac? ( media-libs/faac ) |
526 |
- mp3? ( media-sound/lame ) |
527 |
- x264? ( >=media-libs/x264-0.0.20100423:= ) |
528 |
- xvid? ( media-libs/xvid ) |
529 |
- ) |
530 |
- enca? ( app-i18n/enca ) |
531 |
- faad? ( media-libs/faad2 ) |
532 |
- ggi? ( media-libs/libggi media-libs/libggiwmh ) |
533 |
- gsm? ( media-sound/gsm ) |
534 |
- iconv? ( virtual/libiconv ) |
535 |
- jack? ( virtual/jack ) |
536 |
- jpeg? ( virtual/jpeg:0 ) |
537 |
- ladspa? ( media-libs/ladspa-sdk ) |
538 |
- libass? ( >=media-libs/libass-0.9.10:= ) |
539 |
- libcaca? ( media-libs/libcaca ) |
540 |
- libmpeg2? ( media-libs/libmpeg2 ) |
541 |
- lirc? ( app-misc/lirc ) |
542 |
- live? ( media-plugins/live ) |
543 |
- lzo? ( >=dev-libs/lzo-2 ) |
544 |
- mad? ( media-libs/libmad ) |
545 |
- mng? ( media-libs/libmng:= ) |
546 |
- mp3? ( media-sound/mpg123 ) |
547 |
- nas? ( media-libs/nas ) |
548 |
- nut? ( >=media-libs/libnut-661 ) |
549 |
- openal? ( media-libs/openal ) |
550 |
- opengl? ( virtual/opengl ) |
551 |
- png? ( media-libs/libpng:0= ) |
552 |
- pnm? ( media-libs/netpbm ) |
553 |
- pulseaudio? ( media-sound/pulseaudio ) |
554 |
- rar? ( |
555 |
- || ( |
556 |
- app-arch/unrar |
557 |
- app-arch/rar |
558 |
- ) |
559 |
- ) |
560 |
- rtmp? ( media-video/rtmpdump ) |
561 |
- samba? ( net-fs/samba ) |
562 |
- sdl? ( media-libs/libsdl ) |
563 |
- speex? ( media-libs/speex ) |
564 |
- theora? ( media-libs/libtheora[encode?] ) |
565 |
- tremor? ( media-libs/tremor ) |
566 |
- truetype? ( ${FONT_RDEPS} ) |
567 |
- vdpau? ( x11-libs/libvdpau ) |
568 |
- vorbis? ( !tremor? ( media-libs/libvorbis ) ) |
569 |
- X? ( ${X_RDEPS} ) |
570 |
- xinerama? ( x11-libs/libXinerama ) |
571 |
- xscreensaver? ( x11-libs/libXScrnSaver ) |
572 |
- xv? ( x11-libs/libXv ) |
573 |
-" |
574 |
- |
575 |
-ASM_DEP="dev-lang/yasm" |
576 |
-DEPEND="${RDEPEND} |
577 |
- virtual/pkgconfig |
578 |
- dga? ( x11-base/xorg-proto ) |
579 |
- dvb? ( virtual/linuxtv-dvb-headers ) |
580 |
- X? ( x11-base/xorg-proto ) |
581 |
- xinerama? ( x11-base/xorg-proto ) |
582 |
- xscreensaver? ( x11-base/xorg-proto ) |
583 |
- amd64? ( ${ASM_DEP} ) |
584 |
- doc? ( |
585 |
- dev-libs/libxslt app-text/docbook-xml-dtd |
586 |
- app-text/docbook-xsl-stylesheets |
587 |
- ) |
588 |
- x86? ( ${ASM_DEP} ) |
589 |
- x86-fbsd? ( ${ASM_DEP} ) |
590 |
-" |
591 |
-RDEPEND+=" |
592 |
- selinux? ( sec-policy/selinux-mplayer ) |
593 |
-" |
594 |
- |
595 |
-SLOT="0" |
596 |
-LICENSE="GPL-2" |
597 |
-if [[ ${PV} != *9999* ]]; then |
598 |
- KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux" |
599 |
-fi |
600 |
- |
601 |
-# faac codecs are nonfree |
602 |
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio |
603 |
-# dvd navigation requires dvd read support |
604 |
-# ass and freetype font require iconv and ass requires freetype fonts |
605 |
-# unicode transformations are usefull only with iconv |
606 |
-# radio requires oss or alsa backend |
607 |
-REQUIRED_USE=" |
608 |
- dga? ( X ) |
609 |
- dvdnav? ( dvd ) |
610 |
- enca? ( iconv ) |
611 |
- ggi? ( X ) |
612 |
- libass? ( truetype ) |
613 |
- opengl? ( X ) |
614 |
- osdmenu? ( X ) |
615 |
- truetype? ( iconv ) |
616 |
- vdpau? ( X ) |
617 |
- vidix? ( X ) |
618 |
- xinerama? ( X ) |
619 |
- xscreensaver? ( X ) |
620 |
- xv? ( X )" |
621 |
-RESTRICT="faac? ( bindist )" |
622 |
- |
623 |
-PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" ) |
624 |
- |
625 |
-pkg_setup() { |
626 |
- if [[ ${PV} == *9999* ]]; then |
627 |
- elog |
628 |
- elog "This is a live ebuild which installs the latest from upstream's" |
629 |
- elog "subversion repository, and is unsupported by Gentoo." |
630 |
- elog "Everything but bugs in the ebuild itself will be ignored." |
631 |
- elog |
632 |
- fi |
633 |
- |
634 |
- if use cpudetection; then |
635 |
- ewarn |
636 |
- ewarn "You've enabled the cpudetection flag. This feature is" |
637 |
- ewarn "included mainly for people who want to use the same" |
638 |
- ewarn "binary on another system with a different CPU architecture." |
639 |
- ewarn "MPlayer will already detect your CPU settings by default at" |
640 |
- ewarn "buildtime; this flag is used for runtime detection." |
641 |
- ewarn "You won't need this turned on if you are only building" |
642 |
- ewarn "mplayer for this system. Also, if your compile fails, try" |
643 |
- ewarn "disabling this use flag." |
644 |
- fi |
645 |
-} |
646 |
- |
647 |
-src_unpack() { |
648 |
- if [[ ${PV} = *9999* ]]; then |
649 |
- subversion_src_unpack |
650 |
- cd "${WORKDIR}" |
651 |
- rm -rf "${WORKDIR}/${P}/ffmpeg/" |
652 |
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack ) |
653 |
- else |
654 |
- unpack ${A} |
655 |
- fi |
656 |
- |
657 |
- if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then |
658 |
- cd "${S}" |
659 |
- cp "${FILESDIR}/dump_ffmpeg.sh" . || die |
660 |
- chmod +x dump_ffmpeg.sh |
661 |
- ./dump_ffmpeg.sh || die |
662 |
- fi |
663 |
- |
664 |
- if ! use truetype; then |
665 |
- unpack font-arial-iso-8859-1.tar.bz2 \ |
666 |
- font-arial-iso-8859-2.tar.bz2 \ |
667 |
- font-arial-cp1250.tar.bz2 |
668 |
- fi |
669 |
-} |
670 |
- |
671 |
-src_prepare() { |
672 |
- default |
673 |
- |
674 |
- local svf=snapshot_version |
675 |
- if [[ ${PV} = *9999* ]]; then |
676 |
- # Set SVN version manually |
677 |
- subversion_wc_info |
678 |
- printf "${ESVN_WC_REVISION}" > $svf |
679 |
- else |
680 |
- eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 |
681 |
- eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch |
682 |
- has_version '>media-video/ffmpeg-3.5' && eapply "${DISTDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch |
683 |
- fi |
684 |
- if [ ! -f VERSION ] ; then |
685 |
- [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" |
686 |
- local sv=$(<$svf) |
687 |
- printf "SVN-r${sv} (Gentoo)" > VERSION |
688 |
- fi |
689 |
- |
690 |
- # fix path to bash executable in configure scripts |
691 |
- sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die |
692 |
- |
693 |
- # Use sane default for >=virtual/udev-197 |
694 |
- sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die |
695 |
-} |
696 |
- |
697 |
-src_configure() { |
698 |
- local myconf="" |
699 |
- local uses i |
700 |
- |
701 |
- # set LINGUAS |
702 |
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}" |
703 |
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968 |
704 |
- |
705 |
- # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable |
706 |
- # compilation in almost every situation. The reason for this is |
707 |
- # because if --enable is used, it will force the build of that option, |
708 |
- # regardless of whether the dependency is available or not. |
709 |
- |
710 |
- ################### |
711 |
- #Optional features# |
712 |
- ################### |
713 |
- # disable svga since we don't want it |
714 |
- # disable arts since we don't have kde3 |
715 |
- # always disable internal ass |
716 |
- # disable opus and ilbc since it only controls support in internal |
717 |
- # ffmpeg which we do not use |
718 |
- myconf+=" |
719 |
- --disable-svga --disable-svgalib_helper |
720 |
- --disable-ass-internal |
721 |
- --disable-arts |
722 |
- --disable-directfb |
723 |
- --disable-kai |
724 |
- --disable-libopus |
725 |
- --disable-libilbc |
726 |
- --disable-xvmc |
727 |
- $(use_enable network networking) |
728 |
- $(use_enable joystick) |
729 |
- " |
730 |
- uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild |
731 |
- myconf+=" --disable-nemesi" # nemesi automagic disable |
732 |
- for i in ${uses}; do |
733 |
- use ${i} || myconf+=" --disable-${i}" |
734 |
- done |
735 |
- use bidi || myconf+=" --disable-fribidi" |
736 |
- use ipv6 || myconf+=" --disable-inet6" |
737 |
- use libass || myconf+=" --disable-ass" |
738 |
- use nut || myconf+=" --disable-libnut" |
739 |
- use rar || myconf+=" --disable-unrarexec" |
740 |
- use samba || myconf+=" --disable-smb" |
741 |
- use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir" |
742 |
- |
743 |
- # libcdio support: prefer libcdio over cdparanoia |
744 |
- # don't check for cddb w/cdio |
745 |
- if use cdio; then |
746 |
- myconf+=" --disable-cdparanoia" |
747 |
- else |
748 |
- myconf+=" --disable-libcdio" |
749 |
- use cdparanoia || myconf+=" --disable-cdparanoia" |
750 |
- use cddb || myconf+=" --disable-cddb" |
751 |
- fi |
752 |
- |
753 |
- ################################ |
754 |
- # DVD read, navigation support # |
755 |
- ################################ |
756 |
- # |
757 |
- # dvdread - accessing a DVD |
758 |
- # dvdnav - navigation of menus |
759 |
- use dvd || myconf+=" --disable-dvdread" |
760 |
- use dvdnav || myconf+=" --disable-dvdnav" |
761 |
- |
762 |
- ############# |
763 |
- # Subtitles # |
764 |
- ############# |
765 |
- # |
766 |
- # SRT/ASS/SSA (subtitles) requires freetype support |
767 |
- # freetype support requires iconv |
768 |
- # iconv optionally can use unicode |
769 |
- use truetype || myconf+=" --disable-freetype" |
770 |
- use iconv || myconf+=" --disable-iconv --charset=noconv" |
771 |
- use iconv && use unicode && myconf+=" --charset=UTF-8" |
772 |
- |
773 |
- ##################################### |
774 |
- # DVB / Video4Linux / Radio support # |
775 |
- ##################################### |
776 |
- myconf+=" --disable-tv-bsdbt848" |
777 |
- # broken upstream, won't work with recent kernels |
778 |
- myconf+=" --disable-ivtv" |
779 |
- # gone since linux-headers-2.6.38 |
780 |
- myconf+=" --disable-tv-v4l1" |
781 |
- if { use dvb || use v4l || use pvr || use radio; }; then |
782 |
- use dvb || myconf+=" --disable-dvb" |
783 |
- use pvr || myconf+=" --disable-pvr" |
784 |
- use v4l || myconf+=" --disable-tv-v4l2" |
785 |
- if use radio && { use dvb || use v4l; }; then |
786 |
- myconf+=" |
787 |
- --enable-radio |
788 |
- $(use_enable encode radio-capture) |
789 |
- " |
790 |
- else |
791 |
- myconf+=" |
792 |
- --disable-radio-v4l2 |
793 |
- --disable-radio-bsdbt848 |
794 |
- " |
795 |
- fi |
796 |
- else |
797 |
- myconf+=" |
798 |
- --disable-tv |
799 |
- --disable-tv-v4l2 |
800 |
- --disable-radio |
801 |
- --disable-radio-v4l2 |
802 |
- --disable-radio-bsdbt848 |
803 |
- --disable-dvb |
804 |
- --disable-v4l2 |
805 |
- --disable-pvr" |
806 |
- fi |
807 |
- |
808 |
- ########## |
809 |
- # Codecs # |
810 |
- ########## |
811 |
- myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support |
812 |
- myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 |
813 |
- myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/ |
814 |
- use dts || myconf+=" --disable-libdca" |
815 |
- if ! use mp3; then |
816 |
- myconf+=" |
817 |
- --disable-mp3lame |
818 |
- --disable-mpg123 |
819 |
- " |
820 |
- fi |
821 |
- uses="a52 bs2b dv gsm lzo rtmp vorbis" |
822 |
- for i in ${uses}; do |
823 |
- use ${i} || myconf+=" --disable-lib${i}" |
824 |
- done |
825 |
- |
826 |
- uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" |
827 |
- for i in ${uses}; do |
828 |
- use ${i} || myconf+=" --disable-${i}" |
829 |
- done |
830 |
- # Pulls an outdated libopenjpeg, ffmpeg provides better support for it |
831 |
- myconf+=" --disable-libopenjpeg" |
832 |
- |
833 |
- # Encoding |
834 |
- uses="faac x264 xvid toolame twolame" |
835 |
- if use encode; then |
836 |
- for i in ${uses}; do |
837 |
- use ${i} || myconf+=" --disable-${i}" |
838 |
- done |
839 |
- else |
840 |
- myconf+=" --disable-mencoder" |
841 |
- for i in ${uses}; do |
842 |
- myconf+=" --disable-${i}" |
843 |
- use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled." |
844 |
- done |
845 |
- fi |
846 |
- |
847 |
- ################# |
848 |
- # Binary codecs # |
849 |
- ################# |
850 |
- myconf+=" --disable-qtx --disable-real --disable-win32dll" |
851 |
- |
852 |
- ################ |
853 |
- # Video Output # |
854 |
- ################ |
855 |
- uses="md5sum sdl yuv4mpeg" |
856 |
- for i in ${uses}; do |
857 |
- use ${i} || myconf+=" --disable-${i}" |
858 |
- done |
859 |
- use aalib || myconf+=" --disable-aa" |
860 |
- use fbcon || myconf+=" --disable-fbdev" |
861 |
- use libcaca || myconf+=" --disable-caca" |
862 |
- use zoran || myconf+=" --disable-zr" |
863 |
- |
864 |
- if ! use kernel_linux || ! use video_cards_mga; then |
865 |
- myconf+=" --disable-mga --disable-xmga" |
866 |
- fi |
867 |
- |
868 |
- myconf+=" |
869 |
- --disable-3dfx |
870 |
- --disable-tdfxvid |
871 |
- --disable-tdfxfb |
872 |
- " |
873 |
- |
874 |
- # sun card, disable by default, see bug #258729 |
875 |
- myconf+=" --disable-xvr100" |
876 |
- |
877 |
- ################ |
878 |
- # Audio Output # |
879 |
- ################ |
880 |
- myconf+=" --disable-esd" |
881 |
- uses="alsa jack ladspa nas openal" |
882 |
- for i in ${uses}; do |
883 |
- use ${i} || myconf+=" --disable-${i}" |
884 |
- done |
885 |
- use pulseaudio || myconf+=" --disable-pulse" |
886 |
- if ! use radio; then |
887 |
- use oss || myconf+=" --disable-ossaudio" |
888 |
- fi |
889 |
- |
890 |
- #################### |
891 |
- # Advanced Options # |
892 |
- #################### |
893 |
- # Platform specific flags, hardcoded on amd64 (see below) |
894 |
- use cpudetection && myconf+=" --enable-runtime-cpudetection" |
895 |
- |
896 |
- uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3" |
897 |
- for i in ${uses}; do |
898 |
- myconf+=" $(use_enable cpu_flags_x86_${i} ${i})" |
899 |
- done |
900 |
- |
901 |
- uses="altivec shm" |
902 |
- for i in ${uses}; do |
903 |
- myconf+=" $(use_enable ${i})" |
904 |
- done |
905 |
- |
906 |
- use debug && myconf+=" --enable-debug=3" |
907 |
- |
908 |
- if use x86 && gcc-specs-pie; then |
909 |
- filter-flags -fPIC -fPIE |
910 |
- append-ldflags -nopie |
911 |
- fi |
912 |
- |
913 |
- ########################### |
914 |
- # X enabled configuration # |
915 |
- ########################### |
916 |
- myconf+=" --disable-gui" |
917 |
- myconf+=" --disable-vesa" |
918 |
- uses="ggi vdpau xinerama xv" |
919 |
- for i in ${uses}; do |
920 |
- use ${i} || myconf+=" --disable-${i}" |
921 |
- done |
922 |
- use dga || myconf+=" --disable-dga1 --disable-dga2" |
923 |
- use opengl || myconf+=" --disable-gl" |
924 |
- use osdmenu && myconf+=" --enable-menu" |
925 |
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" |
926 |
- use xscreensaver || myconf+=" --disable-xss" |
927 |
- use X || myconf+=" --disable-x11" |
928 |
- |
929 |
- ############################ |
930 |
- # OSX (aqua) configuration # |
931 |
- ############################ |
932 |
- if use aqua; then |
933 |
- myconf+=" |
934 |
- --enable-macosx-finder |
935 |
- --enable-macosx-bundle |
936 |
- " |
937 |
- fi |
938 |
- |
939 |
- ./configure \ |
940 |
- --cc="$(tc-getCC)" \ |
941 |
- --host-cc="$(tc-getBUILD_CC)" \ |
942 |
- --prefix="${EPREFIX}/usr" \ |
943 |
- --bindir="${EPREFIX}/usr/bin" \ |
944 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
945 |
- --confdir="${EPREFIX}/etc/mplayer" \ |
946 |
- --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \ |
947 |
- --mandir="${EPREFIX}/usr/share/man" \ |
948 |
- --disable-ffmpeg_a \ |
949 |
- ${myconf} || die |
950 |
-} |
951 |
- |
952 |
-src_compile() { |
953 |
- default |
954 |
- |
955 |
- # Build only user-requested docs if they're available. |
956 |
- if use doc ; then |
957 |
- # select available languages from $LINGUAS |
958 |
- local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN" |
959 |
- local BUILT_DOCS="" |
960 |
- for i in ${LINGUAS} ; do |
961 |
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" |
962 |
- done |
963 |
- if [[ -z $BUILT_DOCS ]]; then |
964 |
- emake -j1 html-chunked |
965 |
- else |
966 |
- for i in ${BUILT_DOCS}; do |
967 |
- emake -j1 html-chunked-${i} |
968 |
- done |
969 |
- fi |
970 |
- fi |
971 |
-} |
972 |
- |
973 |
-src_install() { |
974 |
- local i |
975 |
- |
976 |
- emake \ |
977 |
- DESTDIR="${D}" \ |
978 |
- INSTALLSTRIP="" \ |
979 |
- install |
980 |
- |
981 |
- dodoc AUTHORS Changelog Copyright README etc/codecs.conf |
982 |
- |
983 |
- docinto tech/ |
984 |
- dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} |
985 |
- docinto TOOLS/ |
986 |
- dodoc -r TOOLS/* |
987 |
- docinto tech/mirrors/ |
988 |
- dodoc DOCS/tech/mirrors/* |
989 |
- |
990 |
- if use doc; then |
991 |
- docinto html/ |
992 |
- dohtml -r "${S}"/DOCS/HTML/* |
993 |
- fi |
994 |
- |
995 |
- if ! use truetype; then |
996 |
- dodir /usr/share/mplayer/fonts |
997 |
- # Do this generic, as the mplayer people like to change the structure |
998 |
- # of their zips ... |
999 |
- for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do |
1000 |
- cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts" |
1001 |
- done |
1002 |
- # Fix the font symlink ... |
1003 |
- rm -rf "${ED}/usr/share/mplayer/font" |
1004 |
- dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font |
1005 |
- fi |
1006 |
- |
1007 |
- insinto /etc/mplayer |
1008 |
- newins "${S}/etc/example.conf" mplayer.conf |
1009 |
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
1010 |
-# Config options can be section specific, global |
1011 |
-# options should go in the default section |
1012 |
-[default] |
1013 |
-_EOF_ |
1014 |
- doins "${S}/etc/input.conf" |
1015 |
- if use osdmenu; then |
1016 |
- doins "${S}/etc/menu.conf" |
1017 |
- fi |
1018 |
- |
1019 |
- if use truetype; then |
1020 |
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
1021 |
-fontconfig=1 |
1022 |
-subfont-osd-scale=4 |
1023 |
-subfont-text-scale=3 |
1024 |
-_EOF_ |
1025 |
- fi |
1026 |
- |
1027 |
- # bug 256203 |
1028 |
- if use rar; then |
1029 |
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ |
1030 |
-unrarexec=${EPREFIX}/usr/bin/unrar |
1031 |
-_EOF_ |
1032 |
- fi |
1033 |
- |
1034 |
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf |
1035 |
- newbin "${S}/TOOLS/midentify.sh" midentify |
1036 |
-} |
1037 |
- |
1038 |
-pkg_preinst() { |
1039 |
- [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \ |
1040 |
- rm -rf "${EROOT}/usr/share/mplayer/Skin/default" |
1041 |
-} |
1042 |
- |
1043 |
-pkg_postrm() { |
1044 |
- # Cleanup stale symlinks |
1045 |
- [ -L "${EROOT}/usr/share/mplayer/font" -a \ |
1046 |
- ! -e "${EROOT}/usr/share/mplayer/font" ] && \ |
1047 |
- rm -f "${EROOT}/usr/share/mplayer/font" |
1048 |
- |
1049 |
- [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \ |
1050 |
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \ |
1051 |
- rm -f "${EROOT}/usr/share/mplayer/subfont.ttf" |
1052 |
-} |