diff options
13 files changed, 0 insertions, 4143 deletions
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index bb818f3cb48f..7c8b970bc589 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -3,7 +3,4 @@ DIST MPlayer-1.2.tar.xz 13019196 SHA256 ffe7f6f10adf2920707e8d6c04f0d3ed34c307ef DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee -DIST mplayer-1.2_pre20130729.tar.xz 5358436 SHA256 9928cd6d0d765eb38f2824c501b94e5b6e0a2ec6e39a0c788654c5508c9eb9ab SHA512 e76ae7a1aeca9e853edf5403f3e3ae60dace980076a12160c501e18d019184af08256829f8e657b9fdbf549126bf518cf5dbe2860eda906e6fcd3ccc44a5f5a5 WHIRLPOOL b4007e4a00fd8b0b2d75a6d375f3b334b3251ea8dd677a5c1d562e4997fbbee81981bbbde9a88a61dc83bfc2d3e5dac6f93e7ff882088ba8b0c3df7c2cd9a6bd -DIST mplayer-1.2_pre20141011.tar.xz 5357084 SHA256 5657720f44602e5fef04b215ce4116014d08934772cf9011038327b9e413d14d SHA512 9d7497b9ca0ea6f260251f410020b40be8cd9baa95e06d6f6d3d8e299a87ae3a56d8451bd078ca4077de38f7e8907da1763e3dbd21357769e282f91241f650da WHIRLPOOL 39903730b0d9eb8ea17730f282a1ba70c923ffa3f5c31a9ad9b8d56cc5e7bef75531159f06ded141e08581171df4016e8486892067bad2c82086d4c6147731b4 DIST mplayer-1.2_pre20150214.tar.xz 5240936 SHA256 1b252ad20a77bc1ade022deaeb5e13f88422f9c1a9eeee646334107a35e8bdd3 SHA512 9cfa28ce6d8ec6c9d070e4573744d788dde9df63c24525667a0144c436bbb9336f01f3a4b9a5d22114decd7772151d3c0a7d6a902d2528092e374572d5d793e4 WHIRLPOOL bb05b6712b0e0e9db475e4845c7dde728722a7ec7ed442a33d0f5af43f2922c2883bc71916a0f4006bfd3ec29e165903c6e46668afb6e0c9832791be725d81d7 -DIST mplayer-1.2_pre20150730.tar.xz 5251124 SHA256 b21380a29031165fbd583e2153c200c8e55b18d4104ed8b362db0423dc8f0002 SHA512 807642960b334c00763816e1564577e635f5ea8b42a3eb9684905502a9adb82350d1a4ca42089b1db4178340a3342d9340bd855db562532fe8a6097a3d09bc65 WHIRLPOOL c0279c736a65b8e0a36f39279e54a8e91e875b2f799cd4982b6f1d55156c5355e72f553dc6f78c75548909dd3d37d8fd7237c3729a6687a685ef8124ae99afbf diff --git a/media-video/mplayer/files/mplayer-1.2_pre20130729-compat.patch b/media-video/mplayer/files/mplayer-1.2_pre20130729-compat.patch deleted file mode 100644 index c26b6d20b51c..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20130729-compat.patch +++ /dev/null @@ -1,62 +0,0 @@ -Allow it to build against FFmpeg 1.2.1 and libav 9.8 - -Index: mplayer-1.2_pre20130729/fmt-conversion.c -=================================================================== ---- mplayer-1.2_pre20130729.orig/fmt-conversion.c -+++ mplayer-1.2_pre20130729/fmt-conversion.c -@@ -64,8 +64,10 @@ static const struct { - { IMGFMT_RGB64LE, AV_PIX_FMT_RGBA64LE }, - { IMGFMT_RGB64BE, AV_PIX_FMT_RGBA64BE }, - #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */ -+#if ( LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,10,0) ) && ( LIBAVUTIL_VERSION_MICRO < 100 || LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,25,100) ) - { IMGFMT_XYZ12LE, AV_PIX_FMT_XYZ12LE }, - { IMGFMT_XYZ12BE, AV_PIX_FMT_XYZ12BE }, -+#endif - { IMGFMT_422A, AV_PIX_FMT_YUVA422P }, - { IMGFMT_444A, AV_PIX_FMT_YUVA444P }, - { IMGFMT_GBR24P, AV_PIX_FMT_GBRP }, -Index: mplayer-1.2_pre20130729/libmpdemux/demux_lavf.c -=================================================================== ---- mplayer-1.2_pre20130729.orig/libmpdemux/demux_lavf.c -+++ mplayer-1.2_pre20130729/libmpdemux/demux_lavf.c -@@ -443,7 +443,9 @@ static void handle_stream(demuxer_t *dem - type = 'm'; - else if (codec->codec_id == AV_CODEC_ID_SSA - #if LIBAVUTIL_VERSION_MICRO >= 100 -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,3,100) - || codec->codec_id == AV_CODEC_ID_ASS -+#endif - #endif /* LIBAVUTIL_VERSION_MICRO >= 100 */ - ) - type = 'a'; -Index: mplayer-1.2_pre20130729/libmpdemux/mp_taglists.c -=================================================================== ---- mplayer-1.2_pre20130729.orig/libmpdemux/mp_taglists.c -+++ mplayer-1.2_pre20130729/libmpdemux/mp_taglists.c -@@ -31,8 +31,10 @@ static const struct AVCodecTag mp_wav_ta - { AV_CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x') }, - #if LIBAVUTIL_VERSION_MICRO >= 100 - { AV_CODEC_ID_ADPCM_AFC, MKTAG('A', 'F', 'C', ' ') }, -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,8,100) - { AV_CODEC_ID_ADPCM_DTK, MKTAG('D', 'T', 'K', ' ') }, - #endif -+#endif - { AV_CODEC_ID_ADPCM_IMA_APC, MKTAG('A', 'P', 'C', 'A') }, - { AV_CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A') }, - { AV_CODEC_ID_ADPCM_EA_R1, MKTAG('E', 'A', 'R', '1') }, -Index: mplayer-1.2_pre20130729/libmpcodecs/ve_lavc.c -=================================================================== ---- mplayer-1.2_pre20130729.orig/libmpcodecs/ve_lavc.c -+++ mplayer-1.2_pre20130729/libmpcodecs/ve_lavc.c -@@ -579,7 +579,11 @@ static int config(struct vf_instance *vf - lavc_venc_context->level = lavc_param_level; - - if(lavc_param_avopt){ -+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,7,0) - if(av_dict_parse_string(&opts, lavc_param_avopt, "=", ",", 0) < 0){ -+#else -+ if(parse_avopts(lavc_venc_context, lavc_param_avopt) < 0){ -+#endif - mp_msg(MSGT_MENCODER,MSGL_ERR, "Your options /%s/ look like gibberish to me pal\n", lavc_param_avopt); - return 0; - } diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-alloc.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-alloc.patch deleted file mode 100644 index 72ad5ee86a87..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-alloc.patch +++ /dev/null @@ -1,58 +0,0 @@ -r37445 | rtogni | 2015-08-08 22:25:14 +0200 (Sat, 08 Aug 2015) | 3 lines - -Replace deprecated avcodec_alloc_frame() with av_frame_alloc() - -Index: libmpcodecs/vf_mcdeint.c -=================================================================== ---- libmpcodecs/vf_mcdeint.c (revision 37444) -+++ libmpcodecs/vf_mcdeint.c (revision 37445) -@@ -251,7 +251,7 @@ - av_dict_free(&opts); - - } -- vf->priv->frame= avcodec_alloc_frame(); -+ vf->priv->frame= av_frame_alloc(); - - vf->priv->outbuf_size= width*height*10; - vf->priv->outbuf= malloc(vf->priv->outbuf_size); -Index: libmpcodecs/vf_lavc.c -=================================================================== ---- libmpcodecs/vf_lavc.c (revision 37444) -+++ libmpcodecs/vf_lavc.c (revision 37445) -@@ -144,7 +144,7 @@ - } - - vf->priv->context=avcodec_alloc_context3(vf->priv->codec); -- vf->priv->pic = avcodec_alloc_frame(); -+ vf->priv->pic = av_frame_alloc(); - - // TODO: parse args -> - if(args) sscanf(args, "%d:%f", &p_quality, &p_fps); -Index: libmpcodecs/ve_lavc.c -=================================================================== ---- libmpcodecs/ve_lavc.c (revision 37444) -+++ libmpcodecs/ve_lavc.c (revision 37445) -@@ -987,7 +987,7 @@ - return 0; - } - -- vf->priv->pic = avcodec_alloc_frame(); -+ vf->priv->pic = av_frame_alloc(); - vf->priv->context = avcodec_alloc_context3(vf->priv->codec); - vf->priv->context->codec_id = vf->priv->codec->id; - -Index: libmpcodecs/vf_uspp.c -=================================================================== ---- libmpcodecs/vf_uspp.c (revision 37444) -+++ libmpcodecs/vf_uspp.c (revision 37445) -@@ -244,8 +244,8 @@ - av_dict_free(&opts); - assert(avctx_enc->codec); - } -- vf->priv->frame= avcodec_alloc_frame(); -- vf->priv->frame_dec= avcodec_alloc_frame(); -+ vf->priv->frame= av_frame_alloc(); -+ vf->priv->frame_dec= av_frame_alloc(); - - vf->priv->outbuf_size= (width + BLOCK)*(height + BLOCK)*10; - vf->priv->outbuf= malloc(vf->priv->outbuf_size); diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-av_fmt.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-av_fmt.patch deleted file mode 100644 index 07e34f7ff052..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-av_fmt.patch +++ /dev/null @@ -1,432 +0,0 @@ -r37443 | reimar | 2015-08-01 09:44:07 +0200 (Sat, 01 Aug 2015) | 1 line - -Add AV_ prefix to all PIX_FMT constants used. - - -Index: libvo/mga_template.c -=================================================================== ---- libvo/mga_template.c (revision 37442) -+++ libvo/mga_template.c (revision 37443) -@@ -74,7 +74,7 @@ - int dst_stride[4] = { bespitch, bespitch }; - uint8_t *dst[4]; - -- av_image_fill_pointers(dst, PIX_FMT_NV12, mga_vid_config.src_height, -+ av_image_fill_pointers(dst, AV_PIX_FMT_NV12, mga_vid_config.src_height, - vid_data, dst_stride); - - sws_scale(sws_ctx, image, stride, y, height, dst, dst_stride); -@@ -419,8 +419,8 @@ - } - } - if (mga_vid_config.card_type == MGA_G200) { -- sws_ctx = sws_getContext(width, height, PIX_FMT_YUV420P, -- width, height, PIX_FMT_NV12, -+ sws_ctx = sws_getContext(width, height, AV_PIX_FMT_YUV420P, -+ width, height, AV_PIX_FMT_NV12, - SWS_BILINEAR, NULL, NULL, NULL); - if (!sws_ctx) { - mp_msg(MSGT_VO, MSGL_FATAL, -Index: libmpcodecs/vf_lavfi.c -=================================================================== ---- libmpcodecs/vf_lavfi.c (revision 37442) -+++ libmpcodecs/vf_lavfi.c (revision 37443) -@@ -107,7 +107,7 @@ - if (vf->next->query_format(vf->next, ifmt) > 0) - sup[nsup++] = all->formats[i]; - } -- sup[nsup++] = PIX_FMT_NONE; -+ sup[nsup++] = AV_PIX_FMT_NONE; - avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(sup)); - av_free(sup); - return 0; -@@ -186,7 +186,7 @@ - static int mpsrc_query_formats(AVFilterContext *ctx) - { - struct mpsrc_priv *c = ctx->priv; -- enum AVPixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, PIX_FMT_NONE }; -+ enum AVPixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, AV_PIX_FMT_NONE }; - avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts)); - return 0; - } -Index: libmpcodecs/vd_ffmpeg.c -=================================================================== ---- libmpcodecs/vd_ffmpeg.c (revision 37442) -+++ libmpcodecs/vd_ffmpeg.c (revision 37443) -@@ -191,7 +191,7 @@ - #if CONFIG_XVMC - case IMGFMT_XVMC_IDCT_MPEG2: - case IMGFMT_XVMC_MOCO_MPEG2: -- if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; -+ if(avctx->pix_fmt == AV_PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; - #endif - } - return CONTROL_FALSE; -@@ -289,7 +289,7 @@ - sh_video_t *sh = avctx->opaque; - vd_ffmpeg_ctx *ctx = sh->context; - int imgfmt; -- if (fmt == PIX_FMT_NONE) -+ if (fmt == AV_PIX_FMT_NONE) - return; - ctx->use_hwaccel = fmt == AV_PIX_FMT_VDPAU; - imgfmt = pixfmt2imgfmt2(fmt, avctx->codec_id); -@@ -1127,7 +1127,7 @@ - for (i = 0; fmt[i] != AV_PIX_FMT_NONE; i++) - if (fmt[i] == ctx->pix_fmt) return ctx->pix_fmt; - -- for(i=0;fmt[i]!=PIX_FMT_NONE;i++){ -+ for(i=0;fmt[i]!=AV_PIX_FMT_NONE;i++){ - // it is incorrect of FFmpeg to even offer these, filter them out - if(!(avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) && - (fmt[i] == AV_PIX_FMT_VDPAU_MPEG1 || fmt[i] == AV_PIX_FMT_VDPAU_MPEG2)) -@@ -1140,7 +1140,7 @@ - } - } - selected_format = fmt[i]; -- if (selected_format == PIX_FMT_NONE) { -+ if (selected_format == AV_PIX_FMT_NONE) { - selected_format = avcodec_default_get_format(avctx, fmt); - update_configuration(sh, selected_format, 1); - } -Index: libmpcodecs/vf_screenshot.c -=================================================================== ---- libmpcodecs/vf_screenshot.c (revision 37442) -+++ libmpcodecs/vf_screenshot.c (revision 37443) -@@ -78,7 +78,7 @@ - av_fast_malloc(&vf->priv->outbuffer, &vf->priv->outbuffer_size, d_width * d_height * 3 * 2); - if (!vf->priv->avctx) { - vf->priv->avctx = avcodec_alloc_context3(NULL); -- vf->priv->avctx->pix_fmt = PIX_FMT_RGB24; -+ vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24; - vf->priv->avctx->width = d_width; - vf->priv->avctx->height = d_height; - vf->priv->avctx->compression_level = 0; -Index: libmpcodecs/ve_lavc.c -=================================================================== ---- libmpcodecs/ve_lavc.c (revision 37442) -+++ libmpcodecs/ve_lavc.c (revision 37443) -@@ -587,7 +587,7 @@ - - mux_v->imgfmt = lavc_param_format; - lavc_venc_context->pix_fmt = imgfmt2pixfmt(lavc_param_format); -- if (lavc_venc_context->pix_fmt == PIX_FMT_NONE) -+ if (lavc_venc_context->pix_fmt == AV_PIX_FMT_NONE) - return 0; - - if(!stats_file) { -Index: libmpcodecs/vf_zrmjpeg.c -=================================================================== ---- libmpcodecs/vf_zrmjpeg.c (revision 37442) -+++ libmpcodecs/vf_zrmjpeg.c (revision 37443) -@@ -495,7 +495,7 @@ - j->s->avctx->dct_algo = FF_DCT_AUTO; - j->s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x - // indicate we 'decode' to jpeg 4:2:2 -- j->s->avctx->pix_fmt = PIX_FMT_YUVJ422P; -+ j->s->avctx->pix_fmt = AV_PIX_FMT_YUVJ422P; - - j->s->avctx->thread_count = 1; - -Index: libmpcodecs/vf_mcdeint.c -=================================================================== ---- libmpcodecs/vf_mcdeint.c (revision 37442) -+++ libmpcodecs/vf_mcdeint.c (revision 37443) -@@ -225,7 +225,7 @@ - avctx_enc->time_base= (AVRational){1,25}; // meaningless - avctx_enc->gop_size = 300; - avctx_enc->max_b_frames= 0; -- avctx_enc->pix_fmt = PIX_FMT_YUV420P; -+ avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P; - avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY; - avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - avctx_enc->global_quality= 1; -Index: libmpcodecs/vf_scale.c -=================================================================== ---- libmpcodecs/vf_scale.c (revision 37442) -+++ libmpcodecs/vf_scale.c (revision 37443) -@@ -220,7 +220,7 @@ - return 0; - } - sfmt = imgfmt2pixfmt(outfmt); -- if (outfmt == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8; -+ if (outfmt == IMGFMT_BGR8) sfmt = AV_PIX_FMT_PAL8; - dfmt = imgfmt2pixfmt(best); - - vo_flags=vf->next->query_format(vf->next,best); -@@ -544,7 +544,7 @@ - // supported Input formats: YV12, I420, IYUV, YUY2, UYVY, BGR32, BGR24, BGR16, BGR15, RGB32, RGB24, Y8, Y800 - - static int query_format(struct vf_instance *vf, unsigned int fmt){ -- if (!IMGFMT_IS_HWACCEL(fmt) && imgfmt2pixfmt(fmt) != PIX_FMT_NONE) { -+ if (!IMGFMT_IS_HWACCEL(fmt) && imgfmt2pixfmt(fmt) != AV_PIX_FMT_NONE) { - unsigned int best=find_best_out(vf, fmt); - int flags; - if(!best) return 0; // no matching out-fmt -@@ -646,7 +646,7 @@ - - dfmt = imgfmt2pixfmt(dstFormat); - sfmt = imgfmt2pixfmt(srcFormat); -- if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8; -+ if (srcFormat == IMGFMT_RGB8 || srcFormat == IMGFMT_BGR8) sfmt = AV_PIX_FMT_PAL8; - sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam); - - return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags, srcFilterParam, dstFilterParam, NULL); -Index: libmpcodecs/vf_sab.c -=================================================================== ---- libmpcodecs/vf_sab.c (revision 37442) -+++ libmpcodecs/vf_sab.c (revision 37443) -@@ -105,7 +105,7 @@ - swsF.lumH= swsF.lumV= vec; - swsF.chrH= swsF.chrV= NULL; - f->preFilterContext= sws_getContext( -- width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_POINT, &swsF, NULL, NULL); -+ width, height, AV_PIX_FMT_GRAY8, width, height, AV_PIX_FMT_GRAY8, SWS_POINT, &swsF, NULL, NULL); - - sws_freeVec(vec); - vec = sws_getGaussianVec(f->strength, 5.0); -Index: libmpcodecs/vf_smartblur.c -=================================================================== ---- libmpcodecs/vf_smartblur.c (revision 37442) -+++ libmpcodecs/vf_smartblur.c (revision 37443) -@@ -89,7 +89,7 @@ - swsF.lumH= swsF.lumV= vec; - swsF.chrH= swsF.chrV= NULL; - f->filterContext= sws_getContext( -- width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL); -+ width, height, AV_PIX_FMT_GRAY8, width, height, AV_PIX_FMT_GRAY8, SWS_BICUBIC, &swsF, NULL, NULL); - - sws_freeVec(vec); - -Index: libmpcodecs/vf_uspp.c -=================================================================== ---- libmpcodecs/vf_uspp.c (revision 37442) -+++ libmpcodecs/vf_uspp.c (revision 37443) -@@ -234,7 +234,7 @@ - avctx_enc->time_base= (AVRational){1,25}; // meaningless - avctx_enc->gop_size = 300; - avctx_enc->max_b_frames= 0; -- avctx_enc->pix_fmt = PIX_FMT_YUV420P; -+ avctx_enc->pix_fmt = AV_PIX_FMT_YUV420P; - avctx_enc->flags = CODEC_FLAG_QSCALE | CODEC_FLAG_LOW_DELAY; - avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - avctx_enc->global_quality= 123; -Index: libmpcodecs/vf_halfpack.c -=================================================================== ---- libmpcodecs/vf_halfpack.c (revision 37442) -+++ libmpcodecs/vf_halfpack.c (revision 37443) -@@ -198,8 +198,8 @@ - sws_freeContext(vf->priv->ctx); - // get unscaled 422p -> yuy2 conversion - vf->priv->ctx = -- sws_getContext(width, height / 2, PIX_FMT_YUV422P, -- width, height / 2, PIX_FMT_YUYV422, -+ sws_getContext(width, height / 2, AV_PIX_FMT_YUV422P, -+ width, height / 2, AV_PIX_FMT_YUYV422, - SWS_POINT | SWS_PRINT_INFO, - NULL, NULL, NULL); - } -Index: libmpcodecs/vf_lavc.c -=================================================================== ---- libmpcodecs/vf_lavc.c (revision 37442) -+++ libmpcodecs/vf_lavc.c (revision 37443) -@@ -161,7 +161,7 @@ - lavc_venc_context.time_base.num = 1000*1001; - lavc_venc_context.time_base.den = (p_fps<1.0) ? 1000*1001*25 : (p_fps * lavc_venc_context.time_base.num); - lavc_venc_context.gop_size = 0; // I-only -- lavc_venc_context.pix_fmt= PIX_FMT_YUV420P; -+ lavc_venc_context.pix_fmt= AV_PIX_FMT_YUV420P; - - return 1; - } -Index: gui/util/bitmap.c -=================================================================== ---- gui/util/bitmap.c (revision 37442) -+++ gui/util/bitmap.c (revision 37443) -@@ -134,19 +134,19 @@ - memset(img, 0, sizeof(*img)); - - switch (avctx->pix_fmt) { -- case PIX_FMT_GRAY8: -+ case AV_PIX_FMT_GRAY8: - img->Bpp = 8; - break; - -- case PIX_FMT_GRAY16BE: -+ case AV_PIX_FMT_GRAY16BE: - img->Bpp = 16; - break; - -- case PIX_FMT_RGB24: -+ case AV_PIX_FMT_RGB24: - img->Bpp = 24; - break; - -- case PIX_FMT_RGBA: -+ case AV_PIX_FMT_RGBA: - img->Bpp = 32; - break; - -Index: gui/win32/skinload.c -=================================================================== ---- gui/win32/skinload.c (revision 37442) -+++ gui/win32/skinload.c (revision 37443) -@@ -185,12 +185,12 @@ - int src_stride[4] = { 4 * bmp.Width, 0, 0, 0 }; - uint8_t *dst[4] = { NULL, NULL, NULL, NULL }; - int dst_stride[4]; -- enum AVPixelFormat out_pix_fmt = PIX_FMT_NONE; -+ enum AVPixelFormat out_pix_fmt = AV_PIX_FMT_NONE; - struct SwsContext *sws; -- if (skin->desktopbpp == 16) out_pix_fmt = PIX_FMT_RGB555; -- else if (skin->desktopbpp == 24) out_pix_fmt = PIX_FMT_RGB24; -+ if (skin->desktopbpp == 16) out_pix_fmt = AV_PIX_FMT_RGB555; -+ else if (skin->desktopbpp == 24) out_pix_fmt = AV_PIX_FMT_RGB24; - av_image_fill_linesizes(dst_stride, out_pix_fmt, bmp.Width); -- sws = sws_getContext(bmp.Width, bmp.Height, PIX_FMT_RGB32, -+ sws = sws_getContext(bmp.Width, bmp.Height, AV_PIX_FMT_RGB32, - bmp.Width, bmp.Height, out_pix_fmt, - SWS_POINT, NULL, NULL, NULL); - bf->data = malloc(bf->size); -Index: gui/wm/ws.c -=================================================================== ---- gui/wm/ws.c (revision 37442) -+++ gui/wm/ws.c (revision 37443) -@@ -79,7 +79,7 @@ - static int wsUseXShm = True; - static int wsUseXShape = True; - --static enum AVPixelFormat out_pix_fmt = PIX_FMT_NONE; -+static enum AVPixelFormat out_pix_fmt = AV_PIX_FMT_NONE; - - /* --- */ - -@@ -275,21 +275,21 @@ - #endif - - if (wsScreenDepth == 32 && wsRedMask == 0xff0000 && wsGreenMask == 0x00ff00 && wsBlueMask == 0x0000ff) -- out_pix_fmt = PIX_FMT_RGB32; -+ out_pix_fmt = AV_PIX_FMT_RGB32; - else if (wsScreenDepth == 32 && wsRedMask == 0x0000ff && wsGreenMask == 0x00ff00 && wsBlueMask == 0xff0000) -- out_pix_fmt = PIX_FMT_BGR32; -+ out_pix_fmt = AV_PIX_FMT_BGR32; - else if (wsScreenDepth == 24 && wsRedMask == 0xff0000 && wsGreenMask == 0x00ff00 && wsBlueMask == 0x0000ff) -- out_pix_fmt = PIX_FMT_RGB24; -+ out_pix_fmt = AV_PIX_FMT_RGB24; - else if (wsScreenDepth == 24 && wsRedMask == 0x0000ff && wsGreenMask == 0x00ff00 && wsBlueMask == 0xff0000) -- out_pix_fmt = PIX_FMT_BGR24; -+ out_pix_fmt = AV_PIX_FMT_BGR24; - else if (wsScreenDepth == 16 && wsRedMask == 0xf800 && wsGreenMask == 0x7e0 && wsBlueMask == 0x1f) -- out_pix_fmt = PIX_FMT_RGB565; -+ out_pix_fmt = AV_PIX_FMT_RGB565; - else if (wsScreenDepth == 16 && wsRedMask == 0x1f && wsGreenMask == 0x7e0 && wsBlueMask == 0xf800) -- out_pix_fmt = PIX_FMT_BGR565; -+ out_pix_fmt = AV_PIX_FMT_BGR565; - else if (wsScreenDepth == 15 && wsRedMask == 0x7c00 && wsGreenMask == 0x3e0 && wsBlueMask == 0x1f) -- out_pix_fmt = PIX_FMT_RGB555; -+ out_pix_fmt = AV_PIX_FMT_RGB555; - else if (wsScreenDepth == 15 && wsRedMask == 0x1f && wsGreenMask == 0x3e0 && wsBlueMask == 0x7c00) -- out_pix_fmt = PIX_FMT_BGR555; -+ out_pix_fmt = AV_PIX_FMT_BGR555; - } - - void wsDone(void) -@@ -1049,29 +1049,29 @@ - int color = 0; - - switch (out_pix_fmt) { -- case PIX_FMT_RGB32: -- case PIX_FMT_RGB24: -+ case AV_PIX_FMT_RGB32: -+ case AV_PIX_FMT_RGB24: - color = (r << 16) + (g << 8) + b; - break; - -- case PIX_FMT_BGR32: -- case PIX_FMT_BGR24: -+ case AV_PIX_FMT_BGR32: -+ case AV_PIX_FMT_BGR24: - color = (b << 16) + (g << 8) + r; - break; - -- case PIX_FMT_RGB565: -+ case AV_PIX_FMT_RGB565: - color = pack_rgb16(r, g, b); - break; - -- case PIX_FMT_BGR565: -+ case AV_PIX_FMT_BGR565: - color = pack_rgb16(b, g, r); - break; - -- case PIX_FMT_RGB555: -+ case AV_PIX_FMT_RGB555: - color = pack_rgb15(r, g, b); - break; - -- case PIX_FMT_BGR555: -+ case AV_PIX_FMT_BGR555: - color = pack_rgb15(b, g, r); - break; - -@@ -1367,7 +1367,7 @@ - int dst_stride[4]; - int i; - -- sws_ctx = sws_getCachedContext(sws_ctx, win->xImage->width, win->xImage->height, PIX_FMT_RGB32, -+ sws_ctx = sws_getCachedContext(sws_ctx, win->xImage->width, win->xImage->height, AV_PIX_FMT_RGB32, - win->xImage->width, win->xImage->height, out_pix_fmt, - SWS_POINT, NULL, NULL, NULL); - av_image_fill_linesizes(dst_stride, out_pix_fmt, win->xImage->width); -Index: sub/spudec.c -=================================================================== ---- sub/spudec.c (revision 37442) -+++ sub/spudec.c (revision 37443) -@@ -891,7 +891,7 @@ - oldvar = spu_gaussvar; - } - -- ctx=sws_getContext(sw, sh, PIX_FMT_GRAY8, dw, dh, PIX_FMT_GRAY8, SWS_GAUSS, &filter, NULL, NULL); -+ ctx=sws_getContext(sw, sh, AV_PIX_FMT_GRAY8, dw, dh, AV_PIX_FMT_GRAY8, SWS_GAUSS, &filter, NULL, NULL); - sws_scale(ctx,&s1,&ss,0,sh,&d1,&ds); - for (i=ss*sh-1; i>=0; i--) s2[i] = -s2[i]; - sws_scale(ctx,&s2,&ss,0,sh,&d2,&ds); -Index: fmt-conversion.c -=================================================================== ---- fmt-conversion.c (revision 37442) -+++ fmt-conversion.c (revision 37443) -@@ -155,7 +155,7 @@ - if (conversion_map[i].fmt == fmt) - break; - pix_fmt = conversion_map[i].pix_fmt; -- if (pix_fmt == PIX_FMT_NONE) -+ if (pix_fmt == AV_PIX_FMT_NONE) - mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported format %s\n", vo_format_name(fmt)); - return pix_fmt; - } -@@ -164,7 +164,7 @@ - { - int i; - int fmt; -- for (i = 0; conversion_map[i].pix_fmt != PIX_FMT_NONE; i++) -+ for (i = 0; conversion_map[i].pix_fmt != AV_PIX_FMT_NONE; i++) - if (conversion_map[i].pix_fmt == pix_fmt) - break; - fmt = conversion_map[i].fmt; -Index: libmpdemux/demux_lavf.c -=================================================================== ---- libmpdemux/demux_lavf.c (revision 37442) -+++ libmpdemux/demux_lavf.c (revision 37443) -@@ -364,10 +364,10 @@ - - if (codec->codec_id == AV_CODEC_ID_RAWVIDEO) { - switch (codec->pix_fmt) { -- case PIX_FMT_RGB24: -+ case AV_PIX_FMT_RGB24: - codec->codec_tag= MKTAG(24, 'B', 'G', 'R'); - break; -- case PIX_FMT_BGR24: -+ case AV_PIX_FMT_BGR24: - codec->codec_tag= MKTAG(24, 'R', 'G', 'B'); - break; - } diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-frame.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-frame.patch deleted file mode 100644 index 48c46c73db08..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-frame.patch +++ /dev/null @@ -1,17 +0,0 @@ -r37465 | rtogni | 2015-08-28 21:37:24 +0200 (Fri, 28 Aug 2015) | 3 lines - -Use av_frame_free() instead of av_freep() to free AVFrame - -Index: libmpcodecs/vd_ffmpeg.c -=================================================================== ---- libmpcodecs/vd_ffmpeg.c (revision 37464) -+++ libmpcodecs/vd_ffmpeg.c (revision 37465) -@@ -539,7 +539,7 @@ - } - - av_freep(&avctx); -- av_freep(&ctx->pic); -+ av_frame_free(&ctx->pic); - free(ctx); - } - diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-get_buffer.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-get_buffer.patch deleted file mode 100644 index 156fca5497a7..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-get_buffer.patch +++ /dev/null @@ -1,325 +0,0 @@ -r37476 | rtogni | 2015-09-05 18:20:27 +0200 (Sat, 05 Sep 2015) | 5 lines - -Replace deprecated get_buffer, buffer_hints, and others - -This is needed to compile with latest FFmpeg - - -Index: libmpcodecs/vd_ffmpeg.c -=================================================================== ---- libmpcodecs/vd_ffmpeg.c (revision 37475) -+++ libmpcodecs/vd_ffmpeg.c (revision 37476) -@@ -40,6 +40,7 @@ - #if CONFIG_VDPAU - #include "libavcodec/vdpau.h" - #endif -+#include "libavutil/pixdesc.h" - - static const vd_info_t info = { - "FFmpeg's libavcodec codec family", -@@ -95,8 +96,11 @@ - - #include "m_option.h" - --static int get_buffer(AVCodecContext *avctx, AVFrame *pic); -+static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference); -+static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame); -+static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags); - static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -+static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic); - static void draw_slice(struct AVCodecContext *s, const AVFrame *src, int offset[4], - int y, int type, int height); - -@@ -269,16 +273,10 @@ - if (lavc_param_vismv || (lavc_param_debug & (FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP))) { - ctx->do_slices = ctx->do_dr1 = 0; - } - if(ctx->do_dr1){ -- avctx->flags |= CODEC_FLAG_EMU_EDGE; -- avctx-> reget_buffer = -- avctx-> get_buffer = get_buffer; -- avctx->release_buffer = release_buffer; -+ avctx->get_buffer2 = get_buffer2; - } else if (lavc_codec->capabilities & CODEC_CAP_DR1) { -- avctx->flags &= ~CODEC_FLAG_EMU_EDGE; -- avctx-> reget_buffer = avcodec_default_reget_buffer; -- avctx-> get_buffer = avcodec_default_get_buffer; -- avctx->release_buffer = avcodec_default_release_buffer; -+ avctx->get_buffer2 = avcodec_default_get_buffer2; - } - avctx->slice_flags = 0; - } -@@ -309,9 +304,7 @@ - if (IMGFMT_IS_HWACCEL(imgfmt)) { - ctx->do_dr1 = 1; - ctx->nonref_dr = 0; -- avctx->get_buffer = get_buffer; -- avctx->release_buffer = release_buffer; -- avctx->reget_buffer = get_buffer; -+ avctx->get_buffer2 = get_buffer2; - mp_msg(MSGT_DECVIDEO, MSGL_V, IMGFMT_IS_XVMC(imgfmt) ? - MSGTR_MPCODECS_XVMCAcceleratedMPEG2 : - "[VD_FFMPEG] VDPAU accelerated decoding\n"); -@@ -384,7 +377,6 @@ - #endif - avctx->flags2|= lavc_param_fast; - avctx->codec_tag= sh->format; -- avctx->stream_codec_tag= sh->video.fccHandler; - avctx->idct_algo= lavc_param_idct_algo; - avctx->error_concealment= lavc_param_error_concealment; - avctx->debug= lavc_param_debug; -@@ -668,7 +660,7 @@ - return 0; - } - --static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ -+static int get_buffer(AVCodecContext *avctx, AVFrame *pic, int isreference){ - sh_video_t *sh = avctx->opaque; - vd_ffmpeg_ctx *ctx = sh->context; - mp_image_t *mpi=NULL; -@@ -677,27 +669,12 @@ - int width = FFMAX(avctx->width, -(-avctx->coded_width >> avctx->lowres)); - int height= FFMAX(avctx->height, -(-avctx->coded_height >> avctx->lowres)); - // special case to handle reget_buffer -- if (pic->opaque && pic->data[0] && (!pic->buffer_hints || pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE)) -+ if (pic->opaque && pic->data[0]) - return 0; - avcodec_align_dimensions(avctx, &width, &height); - //printf("get_buffer %d %d %d\n", pic->reference, ctx->ip_count, ctx->b_count); - -- if (pic->buffer_hints) { -- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Buffer hints: %u\n", pic->buffer_hints); -- type = MP_IMGTYPE_TEMP; -- if (pic->buffer_hints & FF_BUFFER_HINTS_READABLE) -- flags |= MP_IMGFLAG_READABLE; -- if (pic->buffer_hints & FF_BUFFER_HINTS_PRESERVE || -- pic->buffer_hints & FF_BUFFER_HINTS_REUSABLE) { -- ctx->ip_count++; -- type = MP_IMGTYPE_IP; -- flags |= MP_IMGFLAG_PRESERVE; -- } -- flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? -- MP_IMGFLAG_DRAW_CALLBACK:0; -- mp_msg(MSGT_DECVIDEO, MSGL_DBG2, type == MP_IMGTYPE_IP ? "using IP\n" : "using TEMP\n"); -- } else { -- if(!pic->reference){ -+ if(!isreference){ - ctx->b_count++; - flags|=(avctx->skip_idct<=AVDISCARD_DEFAULT && avctx->skip_frame<=AVDISCARD_DEFAULT && ctx->do_slices) ? - MP_IMGFLAG_DRAW_CALLBACK:0; -@@ -711,11 +688,10 @@ - }else{ - type= MP_IMGTYPE_IP; - } -- } - - if (ctx->nonref_dr) { - if (flags & MP_IMGFLAG_PRESERVE) -- return avcodec_default_get_buffer(avctx, pic); -+ return mpcodec_default_get_buffer(avctx, pic); - // Use NUMBERED since for e.g. TEMP vos assume there will - // be no other frames between the get_image and matching put_image. - type = MP_IMGTYPE_NUMBERED; -@@ -722,7 +698,6 @@ - } - - if(init_vo(sh, avctx->pix_fmt, 1) < 0){ -- avctx->release_buffer= avcodec_default_release_buffer; - goto disable_dr1; - } - -@@ -822,7 +797,6 @@ - else - printf("."); - #endif -- pic->type= FF_BUFFER_TYPE_USER; - return 0; - - disable_dr1: -@@ -829,13 +803,11 @@ - ctx->do_dr1 = 0; - // For frame-multithreading these contexts aren't - // the same and must both be updated. -- ctx->avctx->get_buffer = -- avctx->get_buffer = avcodec_default_get_buffer; -- ctx->avctx->reget_buffer = -- avctx->reget_buffer = avcodec_default_reget_buffer; -+ ctx->avctx->get_buffer2 = -+ avctx->get_buffer2 = avcodec_default_get_buffer2; - if (pic->data[0]) -- release_buffer(avctx, pic); -- return avctx->get_buffer(avctx, pic); -+ mpcodec_default_release_buffer(avctx, pic); -+ return avctx->get_buffer2(avctx, pic,0); - } - - static void release_buffer(struct AVCodecContext *avctx, AVFrame *pic){ -@@ -843,8 +815,8 @@ - sh_video_t *sh = avctx->opaque; - vd_ffmpeg_ctx *ctx = sh->context; - int i; -- if (pic->type != FF_BUFFER_TYPE_USER) { -- avcodec_default_release_buffer(avctx, pic); -+ if (pic->opaque == NULL) { -+ mpcodec_default_release_buffer(avctx, pic); - return; - } - -@@ -954,7 +926,7 @@ - // even when we do dr we might actually get a buffer we had - // FFmpeg allocate - this mostly happens with nonref_dr. - // Ensure we treat it correctly. -- dr1= ctx->do_dr1 && pic->type == FF_BUFFER_TYPE_USER; -+ dr1= ctx->do_dr1 && pic->opaque != NULL; - if(ret<0) mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error while decoding frame!\n"); - //printf("repeat: %d\n", pic->repeat_pict); - //-- vstats generation -@@ -1128,3 +1100,148 @@ - set_format_params(avctx, selected_format); - return selected_format; - } -+ -+ -+/* -+ FFWrapper -+*/ -+static int mpcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame) -+{ -+ return avcodec_default_get_buffer2(avctx, frame, 0); -+} -+ -+static void mpcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) -+{ -+ av_frame_unref(pic); -+} -+ -+typedef struct CompatReleaseBufPriv { -+ AVCodecContext avctx; -+ AVFrame frame; -+ uint8_t avframe_padding[1024]; // hack to allow linking to a avutil with larger AVFrame -+} CompatReleaseBufPriv; -+ -+static void compat_free_buffer(void *opaque, uint8_t *data) -+{ -+ CompatReleaseBufPriv *priv = opaque; -+ release_buffer(&priv->avctx, &priv->frame); -+ av_freep(&priv); -+} -+ -+static void compat_release_buffer(void *opaque, uint8_t *data) -+{ -+ AVBufferRef *buf = opaque; -+ av_buffer_unref(&buf); -+} -+ -+static int get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags) -+{ -+ /* -+ * Wrap an old get_buffer()-allocated buffer in a bunch of AVBuffers. -+ * We wrap each plane in its own AVBuffer. Each of those has a reference to -+ * a dummy AVBuffer as its private data, unreffing it on free. -+ * When all the planes are freed, the dummy buffer's free callback calls -+ * release_buffer(). -+ */ -+ CompatReleaseBufPriv *priv = NULL; -+ AVBufferRef *dummy_buf = NULL; -+ int planes, i, ret; -+ -+ ret = get_buffer(avctx, frame, flags & AV_GET_BUFFER_FLAG_REF); -+ if (ret < 0) -+ return ret; -+ -+ /* return if the buffers are already set up -+ * this would happen e.g. when a custom get_buffer() calls -+ * avcodec_default_get_buffer -+ */ -+ if (frame->buf[0]) -+ goto end0; -+ -+ priv = av_mallocz(sizeof(*priv)); -+ if (!priv) { -+ ret = AVERROR(ENOMEM); -+ goto fail; -+ } -+ priv->avctx = *avctx; -+ priv->frame = *frame; -+ -+ dummy_buf = av_buffer_create(NULL, 0, compat_free_buffer, priv, 0); -+ if (!dummy_buf) { -+ ret = AVERROR(ENOMEM); -+ goto fail; -+ } -+ -+#define WRAP_PLANE(ref_out, data, data_size) \ -+do { \ -+ AVBufferRef *dummy_ref = av_buffer_ref(dummy_buf); \ -+ if (!dummy_ref) { \ -+ ret = AVERROR(ENOMEM); \ -+ goto fail; \ -+ } \ -+ ref_out = av_buffer_create(data, data_size, compat_release_buffer, \ -+ dummy_ref, 0); \ -+ if (!ref_out) { \ -+ av_buffer_unref(&dummy_ref); \ -+ av_frame_unref(frame); \ -+ ret = AVERROR(ENOMEM); \ -+ goto fail; \ -+ } \ -+} while (0) -+ -+ if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { -+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); -+ -+ planes = av_pix_fmt_count_planes(frame->format); -+ /* workaround for AVHWAccel plane count of 0, buf[0] is used as -+ check for allocated buffers: make libavcodec happy */ -+ if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) -+ planes = 1; -+ if (!desc || planes <= 0) { -+ ret = AVERROR(EINVAL); -+ goto fail; -+ } -+ -+ for (i = 0; i < planes; i++) { -+ int v_shift = (i == 1 || i == 2) ? desc->log2_chroma_h : 0; -+ int plane_size = (frame->height >> v_shift) * frame->linesize[i]; -+ -+ WRAP_PLANE(frame->buf[i], frame->data[i], plane_size); -+ } -+ } else { -+ int planar = av_sample_fmt_is_planar(frame->format); -+ planes = planar ? avctx->channels : 1; -+ -+ if (planes > FF_ARRAY_ELEMS(frame->buf)) { -+ frame->nb_extended_buf = planes - FF_ARRAY_ELEMS(frame->buf); -+ frame->extended_buf = av_malloc_array(sizeof(*frame->extended_buf), -+ frame->nb_extended_buf); -+ if (!frame->extended_buf) { -+ ret = AVERROR(ENOMEM); -+ goto fail; -+ } -+ } -+ -+ for (i = 0; i < FFMIN(planes, FF_ARRAY_ELEMS(frame->buf)); i++) -+ WRAP_PLANE(frame->buf[i], frame->extended_data[i], frame->linesize[0]); -+ -+ for (i = 0; i < frame->nb_extended_buf; i++) -+ WRAP_PLANE(frame->extended_buf[i], -+ frame->extended_data[i + FF_ARRAY_ELEMS(frame->buf)], -+ frame->linesize[0]); -+ } -+ -+ av_buffer_unref(&dummy_buf); -+ -+end0: -+ frame->width = avctx->width; -+ frame->height = avctx->height; -+ -+ return 0; -+ -+fail: -+ release_buffer(avctx, frame); -+ av_freep(&priv); -+ av_buffer_unref(&dummy_buf); -+ return ret; -+} diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch deleted file mode 100644 index e101ee769ec7..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-pkt_destruct.patch +++ /dev/null @@ -1,25 +0,0 @@ -r37450 | rtogni | 2015-08-17 23:17:16 +0200 (Mon, 17 Aug 2015) | 3 lines - -Stop using deprecatet AVPacket.destruct - -Index: libmpdemux/demux_lavf.c -=================================================================== ---- libmpdemux/demux_lavf.c (revision 37449) -+++ libmpdemux/demux_lavf.c (revision 37450) -@@ -682,16 +682,9 @@ - return 1; - } - -- if(pkt.destruct == av_destruct_packet && !CONFIG_MEMALIGN_HACK){ -- dp=new_demux_packet(0); -- dp->len=pkt.size; -- dp->buffer=pkt.data; -- pkt.destruct= NULL; -- }else{ - dp=new_demux_packet(pkt.size); - memcpy(dp->buffer, pkt.data, pkt.size); - av_free_packet(&pkt); -- } - - if(pkt.pts != AV_NOPTS_VALUE){ - dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); diff --git a/media-video/mplayer/files/mplayer-1.2_pre20150730-rev.patch b/media-video/mplayer/files/mplayer-1.2_pre20150730-rev.patch deleted file mode 100644 index 903e2a7763e8..000000000000 --- a/media-video/mplayer/files/mplayer-1.2_pre20150730-rev.patch +++ /dev/null @@ -1,46 +0,0 @@ -r37448 | rtogni | 2015-08-14 21:44:21 +0200 (Fri, 14 Aug 2015) | 5 lines - -Replace deprecated av_reverse with a local copy - -Patch by Andreas Cadhalpun andreas.cadhalpun (at) googlemail - - -Index: libmpcodecs/dec_teletext.c -=================================================================== ---- libmpcodecs/dec_teletext.c (revision 37447) -+++ libmpcodecs/dec_teletext.c (revision 37448) -@@ -403,6 +403,25 @@ - { 0x00, LATIN, "English"}, - }; - -+static const uint8_t reverse[256] = { -+0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, -+0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, -+0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4, -+0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC, -+0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2, -+0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA, -+0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6, -+0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE, -+0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1, -+0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9, -+0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5, -+0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD, -+0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3, -+0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB, -+0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7, -+0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF, -+}; -+ - /** - * \brief 24/18 Hamming code decoding - * \param data bytes with hamming code (array must be at least 3 bytes long) -@@ -1554,7 +1573,7 @@ - /* Reverse bit order, skipping the first two bytes (field parity, line - offset and framing code). */ - for (i = 0; i < sizeof(data); i++) -- data[i] = av_reverse[buf[2 + i]]; -+ data[i] = reverse[buf[2 + i]]; - - vbi_decode_line(priv, data); - if (priv->cache_reset) diff --git a/media-video/mplayer/mplayer-1.2.ebuild b/media-video/mplayer/mplayer-1.2.ebuild deleted file mode 100644 index 3289e6b212af..000000000000 --- a/media-video/mplayer/mplayer-1.2.ebuild +++ /dev/null @@ -1,639 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" -ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" - -inherit toolchain-funcs eutils flag-o-matic multilib base ${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 -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k 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 vdpau vidix -vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran" - -VIDEO_CARDS="s3virge mga tdfx" -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} - !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 ) -RDEPEND+=" - sys-libs/ncurses:0= - app-arch/bzip2 - sys-libs/zlib - >=media-video/ffmpeg-2.6: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 ) - cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) - dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) - dts? ( media-libs/libdca ) - dv? ( media-libs/libdv ) - dvb? ( virtual/linuxtv-dvb-headers ) - dvd? ( >=media-libs/libdvdread-4.1.3 ) - dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) - 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 ) - gif? ( media-libs/giflib ) - gsm? ( media-sound/gsm ) - iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) - ladspa? ( media-libs/ladspa-sdk ) - libass? ( >=media-libs/libass-0.9.10:=[enca?] ) - 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} ) - xanim? ( media-video/xanim ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) -" - -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" -ASM_DEP="dev-lang/yasm" -DEPEND="${RDEPEND} - virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -else - KEYWORDS="" -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 -# xvmc requires xvideo support -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 ) - xvmc? ( xv )" -RESTRICT="faac? ( bindist )" - -PATCHES=( - # Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241 - "${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.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 - - if has_version 'media-video/libav' ; then - ewarn "Please note that upstream uses media-video/ffmpeg." - ewarn "media-video/libav should be fine in theory but if you" - ewarn "experience any problem, try to move to media-video/ffmpeg." - 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() { - local svf=snapshot_version - if [[ ${PV} = *9999* ]]; then - # Set SVN version manually - subversion_wc_info - printf "${ESVN_WC_REVISION}" > $svf - 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 - - base_src_prepare - - # Use sane default for >=virtual/udev-197 - sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die - - if has_version '>=media-video/ffmpeg-2.9'; then - epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch" - epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch" - epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch" - fi -} - -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-kai - --disable-libopus - --disable-libilbc - $(use_enable network networking) - $(use_enable joystick) - " - uses="bl bluray enca ftp rtc" # 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 - 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 gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use jpeg2k || 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="directfb md5sum sdl" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use aalib || myconf+=" --disable-aa" - use fbcon || myconf+=" --disable-fbdev" - use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb" - 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 - - if use video_cards_tdfx; then - myconf+=" - $(use_enable video_cards_tdfx tdfxvid) - $(use_enable fbcon tdfxfb) - " - else - myconf+=" - --disable-3dfx - --disable-tdfxvid - --disable-tdfxfb - " - fi - - # 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" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi - - ############################ - # 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() { - base_src_compile - # 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" -} diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild deleted file mode 100644 index 3950484015bd..000000000000 --- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild +++ /dev/null @@ -1,633 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" -ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" - -inherit toolchain-funcs eutils flag-o-matic multilib base ${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 -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k 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 vdpau vidix -vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran" - -VIDEO_CARDS="s3virge mga tdfx" -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} - !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 ) -RDEPEND+=" - sys-libs/ncurses:0= - app-arch/bzip2 - sys-libs/zlib - || ( >=media-video/ffmpeg-1.2.1:0 >=media-video/libav-9.8 ) - 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 ) - cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) - dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) - dts? ( media-libs/libdca ) - dv? ( media-libs/libdv ) - dvb? ( virtual/linuxtv-dvb-headers ) - dvd? ( >=media-libs/libdvdread-4.1.3 ) - dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) - 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 ) - gif? ( media-libs/giflib ) - gsm? ( media-sound/gsm ) - iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) - ladspa? ( media-libs/ladspa-sdk ) - libass? ( >=media-libs/libass-0.9.10:=[enca?] ) - 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 ) - 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} ) - xanim? ( media-video/xanim ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) -" - -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" -ASM_DEP="dev-lang/yasm" -DEPEND="${RDEPEND} - virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - 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 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -else - KEYWORDS="alpha hppa ppc ppc64" -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 -# xvmc requires xvideo support -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 ) - xvmc? ( xv )" -RESTRICT="faac? ( bindist )" - -PATCHES=( "${FILESDIR}/${P}-compat.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 - - if has_version 'media-video/libav' ; then - ewarn "Please note that upstream uses media-video/ffmpeg." - ewarn "media-video/libav should be fine in theory but if you" - ewarn "experience any problem, try to move to media-video/ffmpeg." - 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}" -a "${PV%_pre*}" = "${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() { - local svf=snapshot_version - if [[ ${PV} = *9999* ]]; then - # Set SVN version manually - subversion_wc_info - printf "${ESVN_WC_REVISION}" > $svf - 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 - - base_src_prepare - - # 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-kai - --disable-libopus - --disable-libilbc - $(use_enable network networking) - $(use_enable joystick) - " - uses="bl bluray enca ftp rtc" # 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 external libdvdcss, dvdread and dvdnav - myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal" - 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 - 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 gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use jpeg2k || 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="directfb md5sum sdl" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use aalib || myconf+=" --disable-aa" - use fbcon || myconf+=" --disable-fbdev" - use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb" - 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 - - if use video_cards_tdfx; then - myconf+=" - $(use_enable video_cards_tdfx tdfxvid) - $(use_enable fbcon tdfxfb) - " - else - myconf+=" - --disable-3dfx - --disable-tdfxvid - --disable-tdfxfb - " - fi - - # 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" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi - - ############################ - # 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() { - base_src_compile - # 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" -} diff --git a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild deleted file mode 100644 index 73ef7307cfac..000000000000 --- a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild +++ /dev/null @@ -1,631 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" -ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" - -inherit toolchain-funcs eutils flag-o-matic multilib base ${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 -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k 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 vdpau vidix -vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran" - -VIDEO_CARDS="s3virge mga tdfx" -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} - !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 ) -RDEPEND+=" - sys-libs/ncurses:0= - app-arch/bzip2 - sys-libs/zlib - >=media-video/ffmpeg-2.0:0 - 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 ) - cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) - dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) - dts? ( media-libs/libdca ) - dv? ( media-libs/libdv ) - dvb? ( virtual/linuxtv-dvb-headers ) - dvd? ( >=media-libs/libdvdread-4.1.3 ) - dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) - 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 ) - gif? ( media-libs/giflib ) - gsm? ( media-sound/gsm ) - iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) - ladspa? ( media-libs/ladspa-sdk ) - libass? ( >=media-libs/libass-0.9.10:=[enca?] ) - 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 ) - 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} ) - xanim? ( media-video/xanim ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) -" - -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" -ASM_DEP="dev-lang/yasm" -DEPEND="${RDEPEND} - virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - 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="~amd64 ~arm ~hppa ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -else - KEYWORDS="" -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 -# xvmc requires xvideo support -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 ) - xvmc? ( xv )" -RESTRICT="faac? ( bindist )" - -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 - - if has_version 'media-video/libav' ; then - ewarn "Please note that upstream uses media-video/ffmpeg." - ewarn "media-video/libav should be fine in theory but if you" - ewarn "experience any problem, try to move to media-video/ffmpeg." - 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() { - local svf=snapshot_version - if [[ ${PV} = *9999* ]]; then - # Set SVN version manually - subversion_wc_info - printf "${ESVN_WC_REVISION}" > $svf - 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 - - base_src_prepare - - # 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-kai - --disable-libopus - --disable-libilbc - $(use_enable network networking) - $(use_enable joystick) - " - uses="bl bluray enca ftp rtc" # 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 external libdvdcss, dvdread and dvdnav - myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal" - 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 - 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 gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use jpeg2k || 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="directfb md5sum sdl" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use aalib || myconf+=" --disable-aa" - use fbcon || myconf+=" --disable-fbdev" - use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb" - 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 - - if use video_cards_tdfx; then - myconf+=" - $(use_enable video_cards_tdfx tdfxvid) - $(use_enable fbcon tdfxfb) - " - else - myconf+=" - --disable-3dfx - --disable-tdfxvid - --disable-tdfxfb - " - fi - - # 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" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi - - ############################ - # 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() { - base_src_compile - # 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" -} diff --git a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild deleted file mode 100644 index 6c9466ed2ff0..000000000000 --- a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild +++ /dev/null @@ -1,628 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" -ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" - -inherit toolchain-funcs eutils flag-o-matic multilib base ${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 -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k 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 vdpau vidix -vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran" - -VIDEO_CARDS="s3virge mga tdfx" -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} - !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 ) -RDEPEND+=" - sys-libs/ncurses:0= - app-arch/bzip2 - sys-libs/zlib - >=media-video/ffmpeg-2.0:0 - 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 ) - cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) - dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) - dts? ( media-libs/libdca ) - dv? ( media-libs/libdv ) - dvb? ( virtual/linuxtv-dvb-headers ) - dvd? ( >=media-libs/libdvdread-4.1.3 ) - dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) - 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 ) - gif? ( media-libs/giflib ) - gsm? ( media-sound/gsm ) - iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) - ladspa? ( media-libs/ladspa-sdk ) - libass? ( >=media-libs/libass-0.9.10:=[enca?] ) - 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} ) - xanim? ( media-video/xanim ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) -" - -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" -ASM_DEP="dev-lang/yasm" -DEPEND="${RDEPEND} - virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - 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 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -else - KEYWORDS="arm hppa" -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 -# xvmc requires xvideo support -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 ) - xvmc? ( xv )" -RESTRICT="faac? ( bindist )" - -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 - - if has_version 'media-video/libav' ; then - ewarn "Please note that upstream uses media-video/ffmpeg." - ewarn "media-video/libav should be fine in theory but if you" - ewarn "experience any problem, try to move to media-video/ffmpeg." - 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() { - local svf=snapshot_version - if [[ ${PV} = *9999* ]]; then - # Set SVN version manually - subversion_wc_info - printf "${ESVN_WC_REVISION}" > $svf - 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 - - base_src_prepare - - # 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-kai - --disable-libopus - --disable-libilbc - $(use_enable network networking) - $(use_enable joystick) - " - uses="bl bluray enca ftp rtc" # 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 - 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 gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use jpeg2k || 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="directfb md5sum sdl" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use aalib || myconf+=" --disable-aa" - use fbcon || myconf+=" --disable-fbdev" - use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb" - 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 - - if use video_cards_tdfx; then - myconf+=" - $(use_enable video_cards_tdfx tdfxvid) - $(use_enable fbcon tdfxfb) - " - else - myconf+=" - --disable-3dfx - --disable-tdfxvid - --disable-tdfxfb - " - fi - - # 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" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi - - ############################ - # 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() { - base_src_compile - # 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" -} diff --git a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild b/media-video/mplayer/mplayer-1.2_pre20150730.ebuild deleted file mode 100644 index 118dbc4bb0b9..000000000000 --- a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild +++ /dev/null @@ -1,644 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git" -ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS="" - -inherit toolchain-funcs eutils flag-o-matic multilib base ${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 -directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k 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 vdpau vidix -vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran" - -VIDEO_CARDS="s3virge mga tdfx" -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} - !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 ) -RDEPEND+=" - sys-libs/ncurses:0= - app-arch/bzip2 - sys-libs/zlib - >=media-video/ffmpeg-2.6: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 ) - cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) - dga? ( x11-libs/libXxf86dga ) - directfb? ( dev-libs/DirectFB ) - dts? ( media-libs/libdca ) - dv? ( media-libs/libdv ) - dvb? ( virtual/linuxtv-dvb-headers ) - dvd? ( >=media-libs/libdvdread-4.1.3 ) - dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) - 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 ) - gif? ( media-libs/giflib ) - gsm? ( media-sound/gsm ) - iconv? ( virtual/libiconv ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) - ladspa? ( media-libs/ladspa-sdk ) - libass? ( >=media-libs/libass-0.9.10:=[enca?] ) - 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} ) - xanim? ( media-video/xanim ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv ) - xvmc? ( x11-libs/libXvMC ) -" - -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" -ASM_DEP="dev-lang/yasm" -DEPEND="${RDEPEND} - virtual/pkgconfig - dga? ( x11-proto/xf86dgaproto ) - X? ( ${X_DEPS} ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -else - KEYWORDS="" -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 -# xvmc requires xvideo support -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 ) - xvmc? ( xv )" -RESTRICT="faac? ( bindist )" - -PATCHES=( - # Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241 - "${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.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 - - if has_version 'media-video/libav' ; then - ewarn "Please note that upstream uses media-video/ffmpeg." - ewarn "media-video/libav should be fine in theory but if you" - ewarn "experience any problem, try to move to media-video/ffmpeg." - 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() { - local svf=snapshot_version - if [[ ${PV} = *9999* ]]; then - # Set SVN version manually - subversion_wc_info - printf "${ESVN_WC_REVISION}" > $svf - 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 - - base_src_prepare - - # Use sane default for >=virtual/udev-197 - sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die - - if has_version '>=media-video/ffmpeg-2.9'; then - epatch "${FILESDIR}/${P}-av_fmt.patch" - epatch "${FILESDIR}/${P}-rev.patch" - epatch "${FILESDIR}/${P}-chan.patch" - epatch "${FILESDIR}/${P}-frame.patch" - epatch "${FILESDIR}/${P}-get_buffer.patch" - epatch "${FILESDIR}/${P}-pkt_destruct.patch" - epatch "${FILESDIR}/${P}-alloc.patch" - epatch "${FILESDIR}/${P}-encode.patch" - fi -} - -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-kai - --disable-libopus - --disable-libilbc - $(use_enable network networking) - $(use_enable joystick) - " - uses="bl bluray enca ftp rtc" # 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 - 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 gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use jpeg2k || 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="directfb md5sum sdl" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use aalib || myconf+=" --disable-aa" - use fbcon || myconf+=" --disable-fbdev" - use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb" - 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 - - if use video_cards_tdfx; then - myconf+=" - $(use_enable video_cards_tdfx tdfxvid) - $(use_enable fbcon tdfxfb) - " - else - myconf+=" - --disable-3dfx - --disable-tdfxvid - --disable-tdfxfb - " - fi - - # 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" - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi - - ############################ - # 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() { - base_src_compile - # 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" -} |