diff options
| -rw-r--r-- | media-video/mplayer/Manifest | 2 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch | 360 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch | 19 | ||||
| -rw-r--r-- | media-video/mplayer/metadata.xml | 1 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.3.0-r6.ebuild | 609 |
5 files changed, 0 insertions, 991 deletions
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 522275d16bbe..4fd4e60d3630 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,6 +1,4 @@ -DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36cbe6bcf6f426c90c2c8c70123e8aed4d01faf52ee6b1fba3c49e11fa13185f81ae8582f90c901b90955a1f42b SHA512 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d -DIST mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081 diff --git a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch b/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch deleted file mode 100644 index f312203027a9..000000000000 --- a/media-video/mplayer/files/mplayer-1.3-ffmpeg4+mencoder.patch +++ /dev/null @@ -1,360 +0,0 @@ -r38001 | al | 2017-10-31 23:33:45 +0100 (Tue, 31 Oct 2017) | 37 lines - -ve_lavc,ae_lavc: Adjust to work with newest FFmpeg again - -This commit re-enables previously disabled lavc encoders. - -The lavc audio encoder had no problems by itself after -my last commit, but could not stay enabled because of -the coupling of the lavcopts option. - -Here follows a list of changes done to ve lavc - -* Explicitly use 16 as upper limit for vmax_b_frames - - The FF_MAX_B_FRAMES #define was removed from FFmpeg's API. - - It was removed because there is no global limit to the number of - b frames. While this is the most conservative change to address - the removal of the #define, it may not be optimal because we do - not allow for more than 16 b frames. - -* Options that now need to be passed to the encoder as AVOption - - lmin & lmax - - vrc_strategy - - vqsquish - - vqmod_amp & vqmod_freq - - vrc_eq - - vrc_buf_aggressivity - - vrc_init_cplx - - ibias & pbias - - border_mask - - naq - - gmc - - vme - -* Options that were dropped because they had no effect anymore - - sc_factor - - -Index: MPlayer-1.3.0/Makefile -=================================================================== ---- MPlayer-1.3.0.orig/Makefile -+++ MPlayer-1.3.0/Makefile -@@ -615,7 +615,9 @@ SRCS_MPLAYER = command.c - - #MEncoder - SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c --SRCS_MENCODER-$(FFMPEG) += libmpdemux/muxer_lavf.c -+SRCS_MENCODER-$(FFMPEG) += libmpcodecs/ae_lavc.c \ -+ libmpcodecs/ve_lavc.c \ -+ libmpdemux/muxer_lavf.c - SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c - SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c \ - libmpcodecs/native/rtjpegn.c -Index: MPlayer-1.3.0/cfg-mencoder.h -=================================================================== ---- MPlayer-1.3.0.orig/cfg-mencoder.h -+++ MPlayer-1.3.0/cfg-mencoder.h -@@ -52,7 +52,7 @@ const m_option_t ovc_conf[]={ - " nuv - nuppel video\n" - #endif - #ifdef CONFIG_FFMPEG --// " lavc - libavcodec codecs - best quality!\n"//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps -+ " lavc - libavcodec codecs - best quality!\n" - #endif - #ifdef CONFIG_WIN32DLL - " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n" -@@ -106,7 +106,7 @@ const m_option_t oac_conf[]={ - " mp3lame - cbr/abr/vbr MP3 using libmp3lame\n" - #endif - #ifdef CONFIG_FFMPEG --// " 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 -+ " lavc - FFmpeg audio encoder (MP2, AC3, ...)\n" - #endif - #ifdef CONFIG_TOOLAME - " toolame - Toolame MP2 audio encoder\n" -@@ -226,7 +226,7 @@ const m_option_t mencoder_opts[]={ - {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, - #endif - #ifdef CONFIG_FFMPEG -- //{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, //TODO: ve_lavc doesn't build after latest FFmpeg major bumps -+ {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, - #else - {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - #endif /* CONFIG_FFMPEG */ -Index: MPlayer-1.3.0/libmpcodecs/ve.c -=================================================================== ---- MPlayer-1.3.0.orig/libmpcodecs/ve.c -+++ MPlayer-1.3.0/libmpcodecs/ve.c -@@ -43,7 +43,7 @@ extern const vf_info_t ve_info_x264; - - static const vf_info_t * const encoder_list[] = { - #ifdef CONFIG_FFMPEG --// &ve_info_lavc,//TODO: ve_lavc is deactivated because it doesn't build after latest FFmpeg major bumps -+ &ve_info_lavc, - #endif - #ifdef CONFIG_WIN32DLL - &ve_info_vfw, -Index: MPlayer-1.3.0/libmpcodecs/ae.c -=================================================================== ---- MPlayer-1.3.0.orig/libmpcodecs/ae.c -+++ MPlayer-1.3.0/libmpcodecs/ae.c -@@ -59,7 +59,9 @@ audio_encoder_t *new_audio_encoder(muxer - break; - #endif - #ifdef CONFIG_FFMPEG -- //TODO: ACODEC_LAVC <-- has been removed here because it depends on ve_lavc which does not compile after latest FFmpeg major bumps -+ case ACODEC_LAVC: -+ ris = mpae_init_lavc(encoder); -+ break; - #endif - #ifdef CONFIG_MP3LAME - case ACODEC_VBRMP3: -Index: MPlayer-1.3.0/libmpcodecs/ve_lavc.c -=================================================================== ---- MPlayer-1.3.0.orig/libmpcodecs/ve_lavc.c -+++ MPlayer-1.3.0/libmpcodecs/ve_lavc.c -@@ -63,12 +63,9 @@ static int lavc_param_vbitrate = -1; - static int lavc_param_vrate_tolerance = 1000*8; - static int lavc_param_mb_decision = 0; /* default is realtime encoding */ - static int lavc_param_v4mv = 0; --static int lavc_param_vme = 4; - static float lavc_param_vqscale = -1; - static int lavc_param_vqmin = 2; - static int lavc_param_vqmax = 31; --static float lavc_param_lmin = 2; --static float lavc_param_lmax = 31; - static float lavc_param_mb_lmin = 2; - static float lavc_param_mb_lmax = 31; - static int lavc_param_vqdiff = 3; -@@ -81,22 +78,15 @@ static float lavc_param_vi_qoffset = 0.0 - static int lavc_param_vmax_b_frames = 0; - static int lavc_param_keyint = -1; - static int lavc_param_vpass = 0; --static int lavc_param_vrc_strategy = 0; - static int lavc_param_vb_strategy = 0; - static int lavc_param_packet_size= 0; - static int lavc_param_strict= -1; - static int lavc_param_data_partitioning= 0; - static int lavc_param_gray=0; --static float lavc_param_rc_qsquish=1.0; --static float lavc_param_rc_qmod_amp=0; --static int lavc_param_rc_qmod_freq=0; - static char *lavc_param_rc_override_string=NULL; --static char *lavc_param_rc_eq="tex^qComp"; - static int lavc_param_rc_buffer_size=0; --static float lavc_param_rc_buffer_aggressivity=1.0; - static int lavc_param_rc_max_rate=0; - static int lavc_param_rc_min_rate=0; --static float lavc_param_rc_initial_cplx=0; - static float lavc_param_rc_initial_buffer_occupancy=0.9; - static int lavc_param_mpeg_quant=0; - static int lavc_param_fdct=0; -@@ -108,8 +98,6 @@ static float lavc_param_dark_masking= 0. - static float lavc_param_temporal_cplx_masking= 0.0; - static float lavc_param_spatial_cplx_masking= 0.0; - static float lavc_param_p_masking= 0.0; --static float lavc_param_border_masking= 0.0; --static int lavc_param_normalize_aqp= 0; - static int lavc_param_interlaced_dct= 0; - static int lavc_param_prediction_method= FF_PRED_LEFT; - static int lavc_param_format= IMGFMT_YV12; -@@ -131,15 +119,12 @@ static int lavc_param_bit_exact = 0; - static int lavc_param_aic= 0; - static int lavc_param_aiv= 0; - static int lavc_param_umv= 0; --static int lavc_param_gmc= 0; - static int lavc_param_obmc= 0; - static int lavc_param_loop= 0; - static int lavc_param_last_pred= 0; - static int lavc_param_pre_me= 1; - static int lavc_param_me_subpel_quality= 8; - static int lavc_param_me_range= 0; --static int lavc_param_ibias= FF_DEFAULT_QUANT_BIAS; --static int lavc_param_pbias= FF_DEFAULT_QUANT_BIAS; - static int lavc_param_coder= 0; - static int lavc_param_context= 0; - static char *lavc_param_intra_matrix = NULL; -@@ -162,7 +147,6 @@ static int lavc_param_skip_exp=0; - static int lavc_param_skip_cmp=0; - static int lavc_param_brd_scale = 0; - static int lavc_param_bidir_refine = 0; --static int lavc_param_sc_factor = 1; - static int lavc_param_video_global_header= 0; - static int lavc_param_mv0_threshold = 256; - static int lavc_param_refs = 1; -@@ -190,21 +174,21 @@ const m_option_t lavcopts_conf[]={ - {"vhq", &lavc_param_mb_decision, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"mbd", &lavc_param_mb_decision, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, - {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -- {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, -+ {"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}, - {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL}, - {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, - {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, -- {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, -- {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, -+ {"lmin", "Please use o=lmin=<value>*QP2LAMBDA instead of lmin.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -+ {"lmax", "Please use o=lmax=<value>*QP2LAMBDA instead of lmax.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, - {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, - {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, - {"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, - {"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, - {"vb_qfactor", &lavc_param_vb_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, -- {"vmax_b_frames", &lavc_param_vmax_b_frames, CONF_TYPE_INT, CONF_RANGE, 0, FF_MAX_B_FRAMES, NULL}, -+ {"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. - {"vpass", &lavc_param_vpass, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, -- {"vrc_strategy", &lavc_param_vrc_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL}, -+ {"vrc_strategy", "Please use o=rc_strategy=<value> instead of vrc_strategy.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"vb_strategy", &lavc_param_vb_strategy, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, - {"vb_qoffset", &lavc_param_vb_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, - {"vlelim", "Please use o=luma_elim_threshold=<value> instead of vlelim.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -@@ -217,16 +201,16 @@ const m_option_t lavcopts_conf[]={ - {"mpeg_quant", &lavc_param_mpeg_quant, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"vi_qfactor", &lavc_param_vi_qfactor, CONF_TYPE_FLOAT, CONF_RANGE, -31.0, 31.0, NULL}, - {"vi_qoffset", &lavc_param_vi_qoffset, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 31.0, NULL}, -- {"vqsquish", &lavc_param_rc_qsquish, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, -- {"vqmod_amp", &lavc_param_rc_qmod_amp, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, -- {"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL}, -- {"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL}, -+ {"vqsquish", "Please use o=qsquish=<value> instead of vqsquish.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -+ {"vqmod_amp", "Please use o=rc_qmod_amp=<value> instead of vqmod_amp.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -+ {"vqmod_freq", "Please use o=rc_qmod_freq=<value> instead of vqmod_freq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -+ {"vrc_eq", "Please use o=rc_eq=<value> instead of vrc_eq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, - {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, MAX_BITRATE, NULL}, - {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, MAX_BITRATE, NULL}, -- {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, -- {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL}, -+ {"vrc_buf_aggressivity", "Please use o=rc_buf_aggressivity=<value> instead of vrc_buf_aggressivity.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -+ {"vrc_init_cplx", "Please use o=rc_init_cplx=<value> instead of vrc_init_cplx.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"vrc_init_occupancy", &lavc_param_rc_initial_buffer_occupancy, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, - {"vfdct", &lavc_param_fdct, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, - {"aspect", &lavc_param_aspect, CONF_TYPE_STRING, 0, 0, 0, NULL}, -@@ -235,7 +219,7 @@ const m_option_t lavcopts_conf[]={ - {"tcplx_mask", &lavc_param_temporal_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, - {"scplx_mask", &lavc_param_spatial_cplx_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, - {"p_mask", &lavc_param_p_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, -- {"naq", &lavc_param_normalize_aqp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -+ {"naq", "Please use o=mpv_flags=+naq instead of naq.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"dark_mask", &lavc_param_dark_masking, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL}, - {"ildct", &lavc_param_interlaced_dct, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"idct", &lavc_param_idct, CONF_TYPE_INT, CONF_RANGE, 0, 20, NULL}, -@@ -266,8 +250,8 @@ const m_option_t lavcopts_conf[]={ - {"aiv", &lavc_param_aiv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"obmc", &lavc_param_obmc, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"loop", &lavc_param_loop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_LOOP_FILTER, NULL}, -- {"ibias", &lavc_param_ibias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, -- {"pbias", &lavc_param_pbias, CONF_TYPE_INT, CONF_RANGE, -512, 512, NULL}, -+ {"ibias", "Please use o=ibias=<value> instead of ibias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -+ {"pbias", "Please use o=pbias=<value> instead of pbias.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"coder", &lavc_param_coder, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, - {"context", &lavc_param_context, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, - {"intra_matrix", &lavc_param_intra_matrix, CONF_TYPE_STRING, 0, 0, 0, NULL}, -@@ -280,9 +264,9 @@ const m_option_t lavcopts_conf[]={ - {"alt", &lavc_param_alt, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"ilme", &lavc_param_ilme, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_INTERLACED_ME, NULL}, - {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, AV_CODEC_FLAG_CLOSED_GOP, NULL}, -- {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL}, -+ {"gmc", "Please use o=gmc=<value> instead of gmc.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL}, -- {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, -+ {"border_mask", "Please use o=border_mask=<value> instead of border_mask.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"inter_threshold", "inter_threshold has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"sc_threshold", &lavc_param_sc_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000000, 1000000000, NULL}, - {"top", &lavc_param_top, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, -@@ -295,7 +279,7 @@ const m_option_t lavcopts_conf[]={ - {"skip_exp", &lavc_param_skip_exp, CONF_TYPE_INT, CONF_RANGE, 0, 1000000, NULL}, - {"brd_scale", &lavc_param_brd_scale, CONF_TYPE_INT, CONF_RANGE, 0, 10, NULL}, - {"bidir_refine", &lavc_param_bidir_refine, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL}, -- {"sc_factor", &lavc_param_sc_factor, CONF_TYPE_INT, CONF_RANGE, 1, INT_MAX, NULL}, -+ {"sc_factor", "sc_factor has no effect, please remove it.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"vglobal", &lavc_param_video_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, - {"aglobal", &lavc_param_audio_global_header, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, - {"mv0_threshold", &lavc_param_mv0_threshold, CONF_TYPE_INT, CONF_RANGE, 0, INT_MAX, NULL}, -@@ -351,8 +335,6 @@ static int config(struct vf_instance *vf - lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; - lavc_venc_context->qmin= lavc_param_vqmin; - lavc_venc_context->qmax= lavc_param_vqmax; -- lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); -- lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); - lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5); - lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5); - lavc_venc_context->max_qdiff= lavc_param_vqdiff; -@@ -360,17 +342,12 @@ static int config(struct vf_instance *vf - lavc_venc_context->qblur= lavc_param_vqblur; - lavc_venc_context->max_b_frames= lavc_param_vmax_b_frames; - lavc_venc_context->b_quant_factor= lavc_param_vb_qfactor; -- lavc_venc_context->rc_strategy= lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy= lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vb_qoffset + 0.5); - lavc_venc_context->rtp_payload_size= lavc_param_packet_size; - lavc_venc_context->strict_std_compliance= lavc_param_strict; - lavc_venc_context->i_quant_factor= lavc_param_vi_qfactor; - lavc_venc_context->i_quant_offset= (int)(FF_QP2LAMBDA * lavc_param_vi_qoffset + 0.5); -- lavc_venc_context->rc_qsquish= lavc_param_rc_qsquish; -- lavc_venc_context->rc_qmod_amp= lavc_param_rc_qmod_amp; -- lavc_venc_context->rc_qmod_freq= lavc_param_rc_qmod_freq; -- lavc_venc_context->rc_eq= lavc_param_rc_eq; - - mux_v->max_rate= - lavc_venc_context->rc_max_rate= lavc_param_rc_max_rate*1000; -@@ -382,8 +359,6 @@ static int config(struct vf_instance *vf - lavc_venc_context->rc_initial_buffer_occupancy= - lavc_venc_context->rc_buffer_size * - lavc_param_rc_initial_buffer_occupancy; -- lavc_venc_context->rc_buffer_aggressivity= lavc_param_rc_buffer_aggressivity; -- lavc_venc_context->rc_initial_cplx= lavc_param_rc_initial_cplx; - lavc_venc_context->debug= lavc_param_debug; - lavc_venc_context->last_predictor_count= lavc_param_last_pred; - lavc_venc_context->pre_me= lavc_param_pre_me; -@@ -391,8 +366,6 @@ static int config(struct vf_instance *vf - lavc_venc_context->pre_dia_size= lavc_param_pre_dia_size; - lavc_venc_context->me_subpel_quality= lavc_param_me_subpel_quality; - lavc_venc_context->me_range= lavc_param_me_range; -- lavc_venc_context->intra_quant_bias= lavc_param_ibias; -- lavc_venc_context->inter_quant_bias= lavc_param_pbias; - lavc_venc_context->coder_type= lavc_param_coder; - lavc_venc_context->context_model= lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; -@@ -479,7 +452,6 @@ static int config(struct vf_instance *vf - lavc_venc_context->spatial_cplx_masking= lavc_param_spatial_cplx_masking; - lavc_venc_context->p_masking= lavc_param_p_masking; - lavc_venc_context->dark_masking= lavc_param_dark_masking; -- lavc_venc_context->border_masking = lavc_param_border_masking; - - if (lavc_param_aspect != NULL) - { -@@ -552,20 +524,17 @@ static int config(struct vf_instance *vf - if (lavc_param_alt) - av_dict_set(&opts, "alternate_scan", "1", 0); - lavc_venc_context->flags|= lavc_param_ilme; -- lavc_venc_context->flags|= lavc_param_gmc; - #ifdef AV_CODEC_FLAG_CLOSED_GOP - lavc_venc_context->flags|= lavc_param_closed_gop; - #endif - lavc_venc_context->flags|= lavc_param_gray; - -- if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP; - if(lavc_param_interlaced_dct) lavc_venc_context->flags|= AV_CODEC_FLAG_INTERLACED_DCT; - lavc_venc_context->flags|= lavc_param_psnr; - lavc_venc_context->intra_dc_precision = lavc_param_dc_precision - 8; - lavc_venc_context->prediction_method= lavc_param_prediction_method; - lavc_venc_context->brd_scale = lavc_param_brd_scale; - lavc_venc_context->bidir_refine = lavc_param_bidir_refine; -- lavc_venc_context->scenechange_factor = lavc_param_sc_factor; - if((lavc_param_video_global_header&1) - /*|| (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))*/){ - lavc_venc_context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; -@@ -648,8 +617,6 @@ static int config(struct vf_instance *vf - } - } - -- lavc_venc_context->me_method = ME_ZERO+lavc_param_vme; -- - /* fixed qscale :p */ - if (lavc_param_vqscale >= 0.0) - { diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch deleted file mode 100644 index cfefb63deb94..000000000000 --- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch +++ /dev/null @@ -1,19 +0,0 @@ -r37932 | al | 2017-04-20 01:06:04 +0200 (Thu, 20 Apr 2017) | 6 lines - -vo_vdpau: Explicitly include header vdpau_x11.h - -The include from inside libavcodec/vdpau.h was removed in FFmpeg -commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 . - -Index: libvo/vo_vdpau.c -=================================================================== ---- a/libvo/vo_vdpau.c (revision 37931) -+++ b/libvo/vo_vdpau.c (revision 37932) -@@ -34,6 +34,7 @@ - - #include <stdio.h> - #include <strings.h> -+#include <vdpau/vdpau_x11.h> - - #include "config.h" - #include "sub/ass_mp.h" diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml index 5f4a3dfe1b75..11e093c1f064 100644 --- a/media-video/mplayer/metadata.xml +++ b/media-video/mplayer/metadata.xml @@ -20,7 +20,6 @@ <flag name="md5sum">Enables md5sum video output</flag> <flag name="mng">MNG input support</flag> <flag name="network">Enables network streaming support</flag> - <flag name="nut">Enables support for the NUT container format</flag> <flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag> <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag> <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag> diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild deleted file mode 100644 index cc6c4c2db4cd..000000000000 --- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild +++ /dev/null @@ -1,609 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" -ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" - -inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} - -IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray -bs2b cddb +cdio cdparanoia cpudetection debug dga -doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa -+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas -+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr -radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 -tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix -vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran" - -VIDEO_CARDS="mga" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -FONT_URI=" - mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 - mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 - mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 -" -if [[ ${PV} == *9999* ]]; then - RELEASE_URI="" -elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then - MY_P="MPlayer-${PV}" - S="${WORKDIR}/${MY_P}" - RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz" -else - RELEASE_URI="mirror://gentoo/${P}.tar.xz" -fi -SRC_URI="${RELEASE_URI} - https://dev.gentoo.org/~juippis/distfiles/tmp/mplayer-1.3-ffmpeg4.patch - !truetype? ( ${FONT_URI} )" - -DESCRIPTION="Media Player for Linux" -HOMEPAGE="http://www.mplayerhq.hu/" - -FONT_RDEPS=" - virtual/ttf-fonts - media-libs/fontconfig - >=media-libs/freetype-2.2.1:2 -" -X_RDEPS=" - x11-libs/libXext - x11-libs/libXxf86vm -" -# Rar: althrought -gpl version is nice, it cant do most functions normal rars can -# nemesi? ( net-libs/libnemesi ) -# mplayer relies on private APIs in giflib that have been removed: -# https://sourceforge.net/p/giflib/bugs/132/ -RDEPEND+=" - sys-libs/ncurses:0= - app-arch/bzip2 - sys-libs/zlib - >=media-video/ffmpeg-3.0:0=[vdpau?] - a52? ( media-libs/a52dec ) - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - bidi? ( dev-libs/fribidi ) - bluray? ( >=media-libs/libbluray-0.2.1:= ) - bs2b? ( media-libs/libbs2b ) - cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia ) - cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) - dga? ( x11-libs/libXxf86dga ) - dts? ( media-libs/libdca ) - dv? ( media-libs/libdv ) - dvd? ( >=media-libs/libdvdread-4.1.3:0= ) - dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= ) - encode? ( - !twolame? ( toolame? ( media-sound/toolame ) ) - twolame? ( media-sound/twolame ) - faac? ( media-libs/faac ) - mp3? ( media-sound/lame ) - x264? ( >=media-libs/x264-0.0.20100423:= ) - xvid? ( media-libs/xvid ) - ) - enca? ( app-i18n/enca ) - faad? ( media-libs/faad2 ) - ggi? ( media-libs/libggi media-libs/libggiwmh ) - gsm? ( media-sound/gsm ) - iconv? ( virtual/libiconv ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - ladspa? ( media-libs/ladspa-sdk ) - libass? ( >=media-libs/libass-0.9.10:= ) - libcaca? ( media-libs/libcaca ) - libmpeg2? ( media-libs/libmpeg2 ) - lirc? ( app-misc/lirc ) - live? ( media-plugins/live ) - lzo? ( >=dev-libs/lzo-2 ) - mad? ( media-libs/libmad ) - mng? ( media-libs/libmng:= ) - mp3? ( media-sound/mpg123 ) - nas? ( media-libs/nas ) - nut? ( >=media-libs/libnut-661 ) - openal? ( media-libs/openal ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng:0= ) - pnm? ( media-libs/netpbm ) - pulseaudio? ( media-sound/pulseaudio ) - rar? ( - || ( - app-arch/unrar - app-arch/rar - ) - ) - rtmp? ( media-video/rtmpdump ) - samba? ( net-fs/samba ) - sdl? ( media-libs/libsdl ) - speex? ( media-libs/speex ) - theora? ( media-libs/libtheora[encode?] ) - tremor? ( media-libs/tremor ) - truetype? ( ${FONT_RDEPS} ) - vdpau? ( x11-libs/libvdpau ) - vorbis? ( !tremor? ( media-libs/libvorbis ) ) - X? ( ${X_RDEPS} ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv ) -" - -ASM_DEP="dev-lang/yasm" -DEPEND="${RDEPEND} - virtual/pkgconfig - dga? ( x11-base/xorg-proto ) - dvb? ( virtual/linuxtv-dvb-headers ) - X? ( x11-base/xorg-proto ) - xinerama? ( x11-base/xorg-proto ) - xscreensaver? ( x11-base/xorg-proto ) - amd64? ( ${ASM_DEP} ) - doc? ( - dev-libs/libxslt app-text/docbook-xml-dtd - app-text/docbook-xsl-stylesheets - ) - x86? ( ${ASM_DEP} ) - x86-fbsd? ( ${ASM_DEP} ) -" -RDEPEND+=" - selinux? ( sec-policy/selinux-mplayer ) -" - -SLOT="0" -LICENSE="GPL-2" -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux" -fi - -# faac codecs are nonfree -# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio -# dvd navigation requires dvd read support -# ass and freetype font require iconv and ass requires freetype fonts -# unicode transformations are usefull only with iconv -# radio requires oss or alsa backend -REQUIRED_USE=" - dga? ( X ) - dvdnav? ( dvd ) - enca? ( iconv ) - ggi? ( X ) - libass? ( truetype ) - opengl? ( X ) - osdmenu? ( X ) - truetype? ( iconv ) - vdpau? ( X ) - vidix? ( X ) - xinerama? ( X ) - xscreensaver? ( X ) - xv? ( X )" -RESTRICT="faac? ( bindist )" - -PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" ) - -pkg_setup() { - if [[ ${PV} == *9999* ]]; then - elog - elog "This is a live ebuild which installs the latest from upstream's" - elog "subversion repository, and is unsupported by Gentoo." - elog "Everything but bugs in the ebuild itself will be ignored." - elog - fi - - if use cpudetection; then - ewarn - ewarn "You've enabled the cpudetection flag. This feature is" - ewarn "included mainly for people who want to use the same" - ewarn "binary on another system with a different CPU architecture." - ewarn "MPlayer will already detect your CPU settings by default at" - ewarn "buildtime; this flag is used for runtime detection." - ewarn "You won't need this turned on if you are only building" - ewarn "mplayer for this system. Also, if your compile fails, try" - ewarn "disabling this use flag." - fi -} - -src_unpack() { - if [[ ${PV} = *9999* ]]; then - subversion_src_unpack - cd "${WORKDIR}" - rm -rf "${WORKDIR}/${P}/ffmpeg/" - ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack ) - else - unpack ${A} - fi - - if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then - cd "${S}" - cp "${FILESDIR}/dump_ffmpeg.sh" . || die - chmod +x dump_ffmpeg.sh - ./dump_ffmpeg.sh || die - fi - - if ! use truetype; then - unpack font-arial-iso-8859-1.tar.bz2 \ - font-arial-iso-8859-2.tar.bz2 \ - font-arial-cp1250.tar.bz2 - fi -} - -src_prepare() { - default - - local svf=snapshot_version - if [[ ${PV} = *9999* ]]; then - # Set SVN version manually - subversion_wc_info - printf "${ESVN_WC_REVISION}" > $svf - else - eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 - eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch - has_version '>media-video/ffmpeg-3.5' && eapply "${DISTDIR}"/${PN}-1.3-ffmpeg4.patch "${FILESDIR}"/${PN}-1.3-ffmpeg4+mencoder.patch - fi - if [ ! -f VERSION ] ; then - [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" - local sv=$(<$svf) - printf "SVN-r${sv} (Gentoo)" > VERSION - fi - - # fix path to bash executable in configure scripts - sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die - - # Use sane default for >=virtual/udev-197 - sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die -} - -src_configure() { - local myconf="" - local uses i - - # set LINGUAS - [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}" - [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968 - - # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable - # compilation in almost every situation. The reason for this is - # because if --enable is used, it will force the build of that option, - # regardless of whether the dependency is available or not. - - ################### - #Optional features# - ################### - # disable svga since we don't want it - # disable arts since we don't have kde3 - # always disable internal ass - # disable opus and ilbc since it only controls support in internal - # ffmpeg which we do not use - myconf+=" - --disable-svga --disable-svgalib_helper - --disable-ass-internal - --disable-arts - --disable-directfb - --disable-kai - --disable-libopus - --disable-libilbc - --disable-xvmc - $(use_enable network networking) - $(use_enable joystick) - " - uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild - myconf+=" --disable-nemesi" # nemesi automagic disable - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use bidi || myconf+=" --disable-fribidi" - use ipv6 || myconf+=" --disable-inet6" - use libass || myconf+=" --disable-ass" - use nut || myconf+=" --disable-libnut" - use rar || myconf+=" --disable-unrarexec" - use samba || myconf+=" --disable-smb" - use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir" - - # libcdio support: prefer libcdio over cdparanoia - # don't check for cddb w/cdio - if use cdio; then - myconf+=" --disable-cdparanoia" - else - myconf+=" --disable-libcdio" - use cdparanoia || myconf+=" --disable-cdparanoia" - use cddb || myconf+=" --disable-cddb" - fi - - ################################ - # DVD read, navigation support # - ################################ - # - # dvdread - accessing a DVD - # dvdnav - navigation of menus - use dvd || myconf+=" --disable-dvdread" - use dvdnav || myconf+=" --disable-dvdnav" - - ############# - # Subtitles # - ############# - # - # SRT/ASS/SSA (subtitles) requires freetype support - # freetype support requires iconv - # iconv optionally can use unicode - use truetype || myconf+=" --disable-freetype" - use iconv || myconf+=" --disable-iconv --charset=noconv" - use iconv && use unicode && myconf+=" --charset=UTF-8" - - ##################################### - # DVB / Video4Linux / Radio support # - ##################################### - myconf+=" --disable-tv-bsdbt848" - # broken upstream, won't work with recent kernels - myconf+=" --disable-ivtv" - # gone since linux-headers-2.6.38 - myconf+=" --disable-tv-v4l1" - if { use dvb || use v4l || use pvr || use radio; }; then - use dvb || myconf+=" --disable-dvb" - use pvr || myconf+=" --disable-pvr" - use v4l || myconf+=" --disable-tv-v4l2" - if use radio && { use dvb || use v4l; }; then - myconf+=" - --enable-radio - $(use_enable encode radio-capture) - " - else - myconf+=" - --disable-radio-v4l2 - --disable-radio-bsdbt848 - " - fi - else - myconf+=" - --disable-tv - --disable-tv-v4l2 - --disable-radio - --disable-radio-v4l2 - --disable-radio-bsdbt848 - --disable-dvb - --disable-v4l2 - --disable-pvr" - fi - - ########## - # Codecs # - ########## - myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support - myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 - myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/ - use dts || myconf+=" --disable-libdca" - if ! use mp3; then - myconf+=" - --disable-mp3lame - --disable-mpg123 - " - fi - uses="a52 bs2b dv gsm lzo rtmp vorbis" - for i in ${uses}; do - use ${i} || myconf+=" --disable-lib${i}" - done - - uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - # Pulls an outdated libopenjpeg, ffmpeg provides better support for it - myconf+=" --disable-libopenjpeg" - - # Encoding - uses="faac x264 xvid toolame twolame" - if use encode; then - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - else - myconf+=" --disable-mencoder" - for i in ${uses}; do - myconf+=" --disable-${i}" - use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled." - done - fi - - ################# - # Binary codecs # - ################# - myconf+=" --disable-qtx --disable-real --disable-win32dll" - - ################ - # Video Output # - ################ - uses="md5sum sdl yuv4mpeg" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use aalib || myconf+=" --disable-aa" - use fbcon || myconf+=" --disable-fbdev" - use libcaca || myconf+=" --disable-caca" - use zoran || myconf+=" --disable-zr" - - if ! use kernel_linux || ! use video_cards_mga; then - myconf+=" --disable-mga --disable-xmga" - fi - - myconf+=" - --disable-3dfx - --disable-tdfxvid - --disable-tdfxfb - " - - # sun card, disable by default, see bug #258729 - myconf+=" --disable-xvr100" - - ################ - # Audio Output # - ################ - myconf+=" --disable-esd" - uses="alsa jack ladspa nas openal" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use pulseaudio || myconf+=" --disable-pulse" - if ! use radio; then - use oss || myconf+=" --disable-ossaudio" - fi - - #################### - # Advanced Options # - #################### - # Platform specific flags, hardcoded on amd64 (see below) - use cpudetection && myconf+=" --enable-runtime-cpudetection" - - uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3" - for i in ${uses}; do - myconf+=" $(use_enable cpu_flags_x86_${i} ${i})" - done - - uses="altivec shm" - for i in ${uses}; do - myconf+=" $(use_enable ${i})" - done - - use debug && myconf+=" --enable-debug=3" - - if use x86 && gcc-specs-pie; then - filter-flags -fPIC -fPIE - append-ldflags -nopie - fi - - ########################### - # X enabled configuration # - ########################### - myconf+=" --disable-gui" - myconf+=" --disable-vesa" - uses="ggi vdpau xinerama xv" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use dga || myconf+=" --disable-dga1 --disable-dga2" - use opengl || myconf+=" --disable-gl" - use osdmenu && myconf+=" --enable-menu" - use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" - use xscreensaver || myconf+=" --disable-xss" - use X || myconf+=" --disable-x11" - - ############################ - # OSX (aqua) configuration # - ############################ - if use aqua; then - myconf+=" - --enable-macosx-finder - --enable-macosx-bundle - " - fi - - ./configure \ - --cc="$(tc-getCC)" \ - --host-cc="$(tc-getBUILD_CC)" \ - --prefix="${EPREFIX}/usr" \ - --bindir="${EPREFIX}/usr/bin" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --confdir="${EPREFIX}/etc/mplayer" \ - --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \ - --mandir="${EPREFIX}/usr/share/man" \ - --disable-ffmpeg_a \ - ${myconf} || die -} - -src_compile() { - default - - # Build only user-requested docs if they're available. - if use doc ; then - # select available languages from $LINGUAS - local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN" - local BUILT_DOCS="" - for i in ${LINGUAS} ; do - has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}" - done - if [[ -z $BUILT_DOCS ]]; then - emake -j1 html-chunked - else - for i in ${BUILT_DOCS}; do - emake -j1 html-chunked-${i} - done - fi - fi -} - -src_install() { - local i - - emake \ - DESTDIR="${D}" \ - INSTALLSTRIP="" \ - install - - dodoc AUTHORS Changelog Copyright README etc/codecs.conf - - docinto tech/ - dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} - docinto TOOLS/ - dodoc -r TOOLS/* - docinto tech/mirrors/ - dodoc DOCS/tech/mirrors/* - - if use doc; then - docinto html/ - dohtml -r "${S}"/DOCS/HTML/* - fi - - if ! use truetype; then - dodir /usr/share/mplayer/fonts - # Do this generic, as the mplayer people like to change the structure - # of their zips ... - for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do - cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts" - done - # Fix the font symlink ... - rm -rf "${ED}/usr/share/mplayer/font" - dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font - fi - - insinto /etc/mplayer - newins "${S}/etc/example.conf" mplayer.conf - cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ -# Config options can be section specific, global -# options should go in the default section -[default] -_EOF_ - doins "${S}/etc/input.conf" - if use osdmenu; then - doins "${S}/etc/menu.conf" - fi - - if use truetype; then - cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ -fontconfig=1 -subfont-osd-scale=4 -subfont-text-scale=3 -_EOF_ - fi - - # bug 256203 - if use rar; then - cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ -unrarexec=${EPREFIX}/usr/bin/unrar -_EOF_ - fi - - dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf - newbin "${S}/TOOLS/midentify.sh" midentify -} - -pkg_preinst() { - [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \ - rm -rf "${EROOT}/usr/share/mplayer/Skin/default" -} - -pkg_postrm() { - # Cleanup stale symlinks - [ -L "${EROOT}/usr/share/mplayer/font" -a \ - ! -e "${EROOT}/usr/share/mplayer/font" ] && \ - rm -f "${EROOT}/usr/share/mplayer/font" - - [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \ - ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \ - rm -f "${EROOT}/usr/share/mplayer/subfont.ttf" -} |