commit: 60fe6a5bfba34fdf503055777159ca8ceaf35624 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Fri Mar 4 10:02:55 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Fri Mar 4 10:02:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60fe6a5b
media-video/mplayer: remove old Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> media-video/mplayer/Manifest | 1 - .../mplayer/files/mplayer-1.0_rc4-pkg-config.patch | 74 --- .../mplayer/files/mplayer-1.1-codecid.patch | 19 - media-video/mplayer/files/mplayer-1.1-ffmpeg.patch | 34 -- .../mplayer/files/mplayer-1.1-libav-0.8.patch | 21 - .../mplayer/files/mplayer-1.1-libav-9.patch | 488 --------------- .../mplayer/files/mplayer-1.1-missingbreak.patch | 18 - .../mplayer/files/mplayer-1.1-planaraudio.patch | 138 ----- .../files/mplayer-1.1.1-avcodecidsubrip.patch | 17 - .../files/mplayer-1.1.1-codecidsubrip.patch | 17 - media-video/mplayer/mplayer-1.1.1-r1.ebuild | 658 --------------------- 11 files changed, 1485 deletions(-) diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 9ea4a43..87b0dfb 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,4 +1,3 @@ -DIST MPlayer-1.1.1.tar.xz 11202492 SHA256 ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76 SHA512 06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed0 WHIRLPOOL 3cd0f3845cd45961b778c384a322bc628cc9cd6fef3801b62389bd616a443ba5270c378a889412a7dc72d37ff26704d5d989d2c995a2a4a6540f6313ccacbb63 DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72 DIST MPlayer-1.2.tar.xz 13019196 SHA256 ffe7f6f10adf2920707e8d6c04f0d3ed34c307efc6cd90ac46593ee8fba2e2b6 SHA512 ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa WHIRLPOOL 65bcda55684dced6b286e505df4180f849d6a9f2e1e44560f3393311694ea5a0e96cd7c454b8bbc4198b92c1fd3b0fb4f7c5f6842710b40dc47216037a88b33b DIST MPlayer-1.3.0.tar.xz 13278984 SHA256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae WHIRLPOOL 4aaa9609b0c27c0363671e32fb6b7cac8d2c0944c3425c8e76de0250fb76865d5f47c341b11704a0ea980401288d1d28fcd172a5f8469c9713ec37f977bcb088 diff --git a/media-video/mplayer/files/mplayer-1.0_rc4-pkg-config.patch b/media-video/mplayer/files/mplayer-1.0_rc4-pkg-config.patch deleted file mode 100644 index a93136c..0000000 --- a/media-video/mplayer/files/mplayer-1.0_rc4-pkg-config.patch +++ /dev/null @@ -1,74 +0,0 @@ -respect $PKG_CONFIG, and use pkg-config for libdvdnav/libdvdread by -default rather than the ugly xxx-config scripts - -https://bugs.gentoo.org/410189 - -hassle [email protected] if this causes issues - ---- configure -+++ configure -@@ -4042,7 +4042,7 @@ echores "$_apple_ir" - fi #if linux - - echocheck "pkg-config" --_pkg_config=pkg-config -+_pkg_config=${PKG_CONFIG:-pkg-config} - if $($_pkg_config --version > /dev/null 2>&1); then - if test "$ld_static"; then - _pkg_config="$_pkg_config --static" -@@ -5740,8 +5740,13 @@ if test "$_dvdread_internal" = auto ; th - elif test "$_dvdread" = auto ; then - _dvdread=no - if test "$_dl" = yes; then -- _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null) -- _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null) -+ if ! $_pkg_config --exists dvdread ; then -+ _dvdreadcflags=$($_pkgconfig dvdread --cflags) -+ _dvdreadlibs=$($_pkgconfig dvdread --libs) -+ else -+ _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null) -+ _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null) -+ fi - if header_check dvdread/dvd_reader.h $_dvdreadcflags $_dvdreadlibs $ld_dl ; then - _dvdread=yes - extra_cflags="$extra_cflags $_dvdreadcflags" -@@ -7721,13 +7726,20 @@ if test "$_dvdnav" = auto ; then - dvdnav_internal=yes - res_comment="internal" - else -- $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no -+ if ! $_pkg_config --exists dvdnavmini ; then -+ $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no -+ fi - fi - fi - if test "$_dvdnav" = auto ; then - _dvdnav=no -- _dvdnavdir=$($_dvdnavconfig --cflags) -- _dvdnavlibs=$($_dvdnavconfig --libs) -+ if $_pkg_config --exists dvdnavmini ; then -+ _dvdnavdir=$($_pkg_config --cflags dvdnavmini) -+ _dvdnavlibs=$($_pkg_config --libs dvdnavmini) -+ else -+ _dvdnavdir=$($_dvdnavconfig --cflags) -+ _dvdnavlibs=$($_dvdnavconfig --libs) -+ fi - statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $ld_dl $ld_pthread && _dvdnav=yes - fi - if test "$_dvdnav" = yes ; then -@@ -7736,8 +7748,13 @@ if test "$_dvdnav" = yes ; then - cflags_libdvdnav="-Ilibdvdnav" - inputmodules="dvdnav(internal) $inputmodules" - else -- extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)" -- extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)" -+ if $_pkg_config --exists dvdnavmini ; then -+ extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnavmini)" -+ extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnavmini)" -+ else -+ extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)" -+ extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)" -+ fi - inputmodules="dvdnav $inputmodules" - fi - else diff --git a/media-video/mplayer/files/mplayer-1.1-codecid.patch b/media-video/mplayer/files/mplayer-1.1-codecid.patch deleted file mode 100644 index 38a58aa..0000000 --- a/media-video/mplayer/files/mplayer-1.1-codecid.patch +++ /dev/null @@ -1,19 +0,0 @@ -r35075 | iive | 2012-08-11 12:42:43 -0400 (Sat, 11 Aug 2012) | 4 lines - -Quick Build Fix. FFmpeg CodecID is redefined as AVCodecID. -It needs the FFmpeg includes in all places that use it. - - -Index: libmpdemux/mp_taglists.h -=================================================================== ---- libmpdemux/mp_taglists.h (revision 35074) -+++ libmpdemux/mp_taglists.h (revision 35075) -@@ -20,6 +20,8 @@ - #define MPLAYER_MP_TAGLISTS_H - - #include <stdint.h> -+#include "libavutil/common.h" -+#include "libavformat/avformat.h" - - enum CodecID mp_tag2codec_id(uint32_t tag, int audio); - uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio); diff --git a/media-video/mplayer/files/mplayer-1.1-ffmpeg.patch b/media-video/mplayer/files/mplayer-1.1-ffmpeg.patch deleted file mode 100644 index 6ec6ef7..0000000 --- a/media-video/mplayer/files/mplayer-1.1-ffmpeg.patch +++ /dev/null @@ -1,34 +0,0 @@ -Let it build with ffmpeg 0.10.3. - -Index: MPlayer-1.1/fmt-conversion.c -=================================================================== ---- MPlayer-1.1.orig/fmt-conversion.c -+++ MPlayer-1.1/fmt-conversion.c -@@ -65,9 +65,13 @@ static const struct { - {IMGFMT_RGBA, PIX_FMT_RGB0}, - {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE}, - {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE}, -+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 50, 0) - {IMGFMT_422A, PIX_FMT_YUVA422P}, -+#endif -+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101) - {IMGFMT_444A, PIX_FMT_YUVA444P}, - #endif -+#endif - #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1) - {IMGFMT_GBR24P, PIX_FMT_GBRP}, - #endif -Index: MPlayer-1.1/libmpdemux/mp_taglists.c -=================================================================== ---- MPlayer-1.1.orig/libmpdemux/mp_taglists.c -+++ MPlayer-1.1/libmpdemux/mp_taglists.c -@@ -125,7 +125,9 @@ static const struct AVCodecTag mp_bmp_ta - { CODEC_ID_BMV_VIDEO, MKTAG('B', 'M', 'V', 'V')}, - { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, - { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')}, -+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54,1,0) - { CODEC_ID_CDXL, MKTAG('C', 'D', 'X', 'L')}, -+#endif - { CODEC_ID_CMV, MKTAG('M', 'V', 'I', 'f')}, - { CODEC_ID_DFA, MKTAG('C', 'D', 'F', 'A')}, - { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')}, diff --git a/media-video/mplayer/files/mplayer-1.1-libav-0.8.patch b/media-video/mplayer/files/mplayer-1.1-libav-0.8.patch deleted file mode 100644 index acfb605..0000000 --- a/media-video/mplayer/files/mplayer-1.1-libav-0.8.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- mplayer-1.0~svn34750.orig/libmpcodecs/vd_ffmpeg.c -+++ mplayer-1.0~svn34750/libmpcodecs/vd_ffmpeg.c -@@ -47,6 +47,18 @@ - - #include "libavcodec/avcodec.h" - -+#ifndef AV_EF_COMPLIANT -+#define AV_EF_COMPLIANT 0 -+#endif -+ -+#ifndef AV_EF_CAREFUL -+#define AV_EF_CAREFUL 0 -+#endif -+ -+#ifndef AV_EF_AGGRESSIVE -+#define AV_EF_AGGRESSIVE 0 -+#endif -+ - #if AVPALETTE_SIZE > 1024 - #error palette too large, adapt libmpcodecs/vf.c:vf_get_image - #endif diff --git a/media-video/mplayer/files/mplayer-1.1-libav-9.patch b/media-video/mplayer/files/mplayer-1.1-libav-9.patch deleted file mode 100644 index a2630b6..0000000 --- a/media-video/mplayer/files/mplayer-1.1-libav-9.patch +++ /dev/null @@ -1,488 +0,0 @@ -diff -urN MPlayer-1.1.orig//av_opts.c MPlayer-1.1/av_opts.c ---- MPlayer-1.1.orig//av_opts.c 2012-01-28 14:51:57.000000000 +0100 -+++ MPlayer-1.1/av_opts.c 2013-01-17 09:29:34.472213703 +0100 -@@ -42,7 +42,7 @@ - arg = strchr(str, '='); - if(arg) *arg++= 0; - -- if(av_set_string3(v, str, arg, 0, NULL) < 0){ -+ if(av_opt_set(v, str, arg, 0) < 0){ - free(start); - return -1; - } -diff -urN MPlayer-1.1.orig//bstr.c MPlayer-1.1/bstr.c ---- MPlayer-1.1.orig//bstr.c 2010-07-19 00:00:48.000000000 +0200 -+++ MPlayer-1.1/bstr.c 2013-01-17 09:43:10.787183988 +0100 -@@ -18,6 +18,7 @@ - - #include <string.h> - #include <libavutil/avutil.h> -+#include <libavutil/common.h> - - #include "bstr.h" - -diff -urN MPlayer-1.1.orig//codec-cfg.c MPlayer-1.1/codec-cfg.c ---- MPlayer-1.1.orig//codec-cfg.c 2012-05-08 12:56:22.000000000 +0200 -+++ MPlayer-1.1/codec-cfg.c 2013-01-17 09:34:39.860202586 +0100 -@@ -54,6 +54,7 @@ - #include "help_mp.h" - - #include "libavutil/avutil.h" -+#include "libavutil/common.h" - #include "libmpcodecs/img_format.h" - #include "codec-cfg.h" - -diff -urN MPlayer-1.1.orig//fmt-conversion.c MPlayer-1.1/fmt-conversion.c ---- MPlayer-1.1.orig//fmt-conversion.c 2013-01-17 09:16:03.213243232 +0100 -+++ MPlayer-1.1/fmt-conversion.c 2013-01-17 09:28:32.490215959 +0100 -@@ -26,134 +26,134 @@ - - static const struct { - int fmt; -- enum PixelFormat pix_fmt; -+ enum AVPixelFormat pix_fmt; - } conversion_map[] = { -- {IMGFMT_ARGB, PIX_FMT_ARGB}, -- {IMGFMT_BGRA, PIX_FMT_BGRA}, -- {IMGFMT_BGR24, PIX_FMT_BGR24}, -- {IMGFMT_BGR16BE, PIX_FMT_RGB565BE}, -- {IMGFMT_BGR16LE, PIX_FMT_RGB565LE}, -- {IMGFMT_BGR15BE, PIX_FMT_RGB555BE}, -- {IMGFMT_BGR15LE, PIX_FMT_RGB555LE}, -- {IMGFMT_BGR12BE, PIX_FMT_RGB444BE}, -- {IMGFMT_BGR12LE, PIX_FMT_RGB444LE}, -- {IMGFMT_BGR8, PIX_FMT_RGB8}, -- {IMGFMT_BGR4, PIX_FMT_RGB4}, -- {IMGFMT_BGR1, PIX_FMT_MONOBLACK}, -- {IMGFMT_RGB1, PIX_FMT_MONOBLACK}, -- {IMGFMT_RG4B, PIX_FMT_BGR4_BYTE}, -- {IMGFMT_BG4B, PIX_FMT_RGB4_BYTE}, -- {IMGFMT_RGB48LE, PIX_FMT_RGB48LE}, -- {IMGFMT_RGB48BE, PIX_FMT_RGB48BE}, -- {IMGFMT_ABGR, PIX_FMT_ABGR}, -- {IMGFMT_RGBA, PIX_FMT_RGBA}, -- {IMGFMT_RGB24, PIX_FMT_RGB24}, -- {IMGFMT_RGB16BE, PIX_FMT_BGR565BE}, -- {IMGFMT_RGB16LE, PIX_FMT_BGR565LE}, -- {IMGFMT_RGB15BE, PIX_FMT_BGR555BE}, -- {IMGFMT_RGB15LE, PIX_FMT_BGR555LE}, -- {IMGFMT_RGB12BE, PIX_FMT_BGR444BE}, -- {IMGFMT_RGB12LE, PIX_FMT_BGR444LE}, -- {IMGFMT_RGB8, PIX_FMT_BGR8}, -- {IMGFMT_RGB4, PIX_FMT_BGR4}, -- {IMGFMT_BGR8, PIX_FMT_PAL8}, --// NB: This works only because PIX_FMT_0RGB32 is a CPP Macro. --// note that most other PIX_FMT values are enums --#ifdef PIX_FMT_0RGB32 -- {IMGFMT_BGR32, PIX_FMT_0RGB32}, -- {IMGFMT_BGRA, PIX_FMT_BGR0}, -- {IMGFMT_RGBA, PIX_FMT_RGB0}, -- {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE}, -- {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE}, -+ {IMGFMT_ARGB, AV_PIX_FMT_ARGB}, -+ {IMGFMT_BGRA, AV_PIX_FMT_BGRA}, -+ {IMGFMT_BGR24, AV_PIX_FMT_BGR24}, -+ {IMGFMT_BGR16BE, AV_PIX_FMT_RGB565BE}, -+ {IMGFMT_BGR16LE, AV_PIX_FMT_RGB565LE}, -+ {IMGFMT_BGR15BE, AV_PIX_FMT_RGB555BE}, -+ {IMGFMT_BGR15LE, AV_PIX_FMT_RGB555LE}, -+ {IMGFMT_BGR12BE, AV_PIX_FMT_RGB444BE}, -+ {IMGFMT_BGR12LE, AV_PIX_FMT_RGB444LE}, -+ {IMGFMT_BGR8, AV_PIX_FMT_RGB8}, -+ {IMGFMT_BGR4, AV_PIX_FMT_RGB4}, -+ {IMGFMT_BGR1, AV_PIX_FMT_MONOBLACK}, -+ {IMGFMT_RGB1, AV_PIX_FMT_MONOBLACK}, -+ {IMGFMT_RG4B, AV_PIX_FMT_BGR4_BYTE}, -+ {IMGFMT_BG4B, AV_PIX_FMT_RGB4_BYTE}, -+ {IMGFMT_RGB48LE, AV_PIX_FMT_RGB48LE}, -+ {IMGFMT_RGB48BE, AV_PIX_FMT_RGB48BE}, -+ {IMGFMT_ABGR, AV_PIX_FMT_ABGR}, -+ {IMGFMT_RGBA, AV_PIX_FMT_RGBA}, -+ {IMGFMT_RGB24, AV_PIX_FMT_RGB24}, -+ {IMGFMT_RGB16BE, AV_PIX_FMT_BGR565BE}, -+ {IMGFMT_RGB16LE, AV_PIX_FMT_BGR565LE}, -+ {IMGFMT_RGB15BE, AV_PIX_FMT_BGR555BE}, -+ {IMGFMT_RGB15LE, AV_PIX_FMT_BGR555LE}, -+ {IMGFMT_RGB12BE, AV_PIX_FMT_BGR444BE}, -+ {IMGFMT_RGB12LE, AV_PIX_FMT_BGR444LE}, -+ {IMGFMT_RGB8, AV_PIX_FMT_BGR8}, -+ {IMGFMT_RGB4, AV_PIX_FMT_BGR4}, -+ {IMGFMT_BGR8, AV_PIX_FMT_PAL8}, -+// NB: This works only because AV_PIX_FMT_0RGB32 is a CPP Macro. -+// note that most other AV_PIX_FMT values are enums -+#ifdef AV_PIX_FMT_0RGB32 -+ {IMGFMT_BGR32, AV_PIX_FMT_0RGB32}, -+ {IMGFMT_BGRA, AV_PIX_FMT_BGR0}, -+ {IMGFMT_RGBA, AV_PIX_FMT_RGB0}, -+ {IMGFMT_RGB64LE, AV_PIX_FMT_RGBA64LE}, -+ {IMGFMT_RGB64BE, AV_PIX_FMT_RGBA64BE}, - #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 50, 0) -- {IMGFMT_422A, PIX_FMT_YUVA422P}, -+ {IMGFMT_422A, AV_PIX_FMT_YUVA422P}, - #endif - #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101) -- {IMGFMT_444A, PIX_FMT_YUVA444P}, -+ {IMGFMT_444A, AV_PIX_FMT_YUVA444P}, - #endif - #endif - #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1) -- {IMGFMT_GBR24P, PIX_FMT_GBRP}, -+ {IMGFMT_GBR24P, AV_PIX_FMT_GBRP}, - #endif -- {IMGFMT_YUY2, PIX_FMT_YUYV422}, -- {IMGFMT_UYVY, PIX_FMT_UYVY422}, -- {IMGFMT_NV12, PIX_FMT_NV12}, -- {IMGFMT_NV21, PIX_FMT_NV21}, -- {IMGFMT_Y800, PIX_FMT_GRAY8}, -- {IMGFMT_Y8, PIX_FMT_GRAY8}, -- {IMGFMT_YVU9, PIX_FMT_YUV410P}, -- {IMGFMT_IF09, PIX_FMT_YUV410P}, -- {IMGFMT_YV12, PIX_FMT_YUV420P}, -- {IMGFMT_I420, PIX_FMT_YUV420P}, -- {IMGFMT_IYUV, PIX_FMT_YUV420P}, -- {IMGFMT_411P, PIX_FMT_YUV411P}, -- {IMGFMT_422P, PIX_FMT_YUV422P}, -- {IMGFMT_444P, PIX_FMT_YUV444P}, -- {IMGFMT_440P, PIX_FMT_YUV440P}, -- -- {IMGFMT_420A, PIX_FMT_YUVA420P}, -- -- {IMGFMT_420P16_LE, PIX_FMT_YUV420P16LE}, -- {IMGFMT_420P16_BE, PIX_FMT_YUV420P16BE}, -- {IMGFMT_420P10_LE, PIX_FMT_YUV420P10LE}, -- {IMGFMT_420P10_BE, PIX_FMT_YUV420P10BE}, -- {IMGFMT_420P9_LE, PIX_FMT_YUV420P9LE}, -- {IMGFMT_420P9_BE, PIX_FMT_YUV420P9BE}, -- {IMGFMT_422P16_LE, PIX_FMT_YUV422P16LE}, -- {IMGFMT_422P16_BE, PIX_FMT_YUV422P16BE}, -- {IMGFMT_422P10_LE, PIX_FMT_YUV422P10LE}, -- {IMGFMT_422P10_BE, PIX_FMT_YUV422P10BE}, -- {IMGFMT_422P9_LE, PIX_FMT_YUV422P9LE}, -- {IMGFMT_422P9_BE, PIX_FMT_YUV422P9BE}, -- {IMGFMT_444P16_LE, PIX_FMT_YUV444P16LE}, -- {IMGFMT_444P16_BE, PIX_FMT_YUV444P16BE}, -- {IMGFMT_444P10_LE, PIX_FMT_YUV444P10LE}, -- {IMGFMT_444P10_BE, PIX_FMT_YUV444P10BE}, -- {IMGFMT_444P9_LE, PIX_FMT_YUV444P9LE}, -- {IMGFMT_444P9_BE, PIX_FMT_YUV444P9BE}, -+ {IMGFMT_YUY2, AV_PIX_FMT_YUYV422}, -+ {IMGFMT_UYVY, AV_PIX_FMT_UYVY422}, -+ {IMGFMT_NV12, AV_PIX_FMT_NV12}, -+ {IMGFMT_NV21, AV_PIX_FMT_NV21}, -+ {IMGFMT_Y800, AV_PIX_FMT_GRAY8}, -+ {IMGFMT_Y8, AV_PIX_FMT_GRAY8}, -+ {IMGFMT_YVU9, AV_PIX_FMT_YUV410P}, -+ {IMGFMT_IF09, AV_PIX_FMT_YUV410P}, -+ {IMGFMT_YV12, AV_PIX_FMT_YUV420P}, -+ {IMGFMT_I420, AV_PIX_FMT_YUV420P}, -+ {IMGFMT_IYUV, AV_PIX_FMT_YUV420P}, -+ {IMGFMT_411P, AV_PIX_FMT_YUV411P}, -+ {IMGFMT_422P, AV_PIX_FMT_YUV422P}, -+ {IMGFMT_444P, AV_PIX_FMT_YUV444P}, -+ {IMGFMT_440P, AV_PIX_FMT_YUV440P}, -+ -+ {IMGFMT_420A, AV_PIX_FMT_YUVA420P}, -+ -+ {IMGFMT_420P16_LE, AV_PIX_FMT_YUV420P16LE}, -+ {IMGFMT_420P16_BE, AV_PIX_FMT_YUV420P16BE}, -+ {IMGFMT_420P10_LE, AV_PIX_FMT_YUV420P10LE}, -+ {IMGFMT_420P10_BE, AV_PIX_FMT_YUV420P10BE}, -+ {IMGFMT_420P9_LE, AV_PIX_FMT_YUV420P9LE}, -+ {IMGFMT_420P9_BE, AV_PIX_FMT_YUV420P9BE}, -+ {IMGFMT_422P16_LE, AV_PIX_FMT_YUV422P16LE}, -+ {IMGFMT_422P16_BE, AV_PIX_FMT_YUV422P16BE}, -+ {IMGFMT_422P10_LE, AV_PIX_FMT_YUV422P10LE}, -+ {IMGFMT_422P10_BE, AV_PIX_FMT_YUV422P10BE}, -+ {IMGFMT_422P9_LE, AV_PIX_FMT_YUV422P9LE}, -+ {IMGFMT_422P9_BE, AV_PIX_FMT_YUV422P9BE}, -+ {IMGFMT_444P16_LE, AV_PIX_FMT_YUV444P16LE}, -+ {IMGFMT_444P16_BE, AV_PIX_FMT_YUV444P16BE}, -+ {IMGFMT_444P10_LE, AV_PIX_FMT_YUV444P10LE}, -+ {IMGFMT_444P10_BE, AV_PIX_FMT_YUV444P10BE}, -+ {IMGFMT_444P9_LE, AV_PIX_FMT_YUV444P9LE}, -+ {IMGFMT_444P9_BE, AV_PIX_FMT_YUV444P9BE}, - - // YUVJ are YUV formats that use the full Y range and not just - // 16 - 235 (see colorspaces.txt). - // Currently they are all treated the same way. -- {IMGFMT_YV12, PIX_FMT_YUVJ420P}, -- {IMGFMT_422P, PIX_FMT_YUVJ422P}, -- {IMGFMT_444P, PIX_FMT_YUVJ444P}, -- {IMGFMT_440P, PIX_FMT_YUVJ440P}, -- -- {IMGFMT_XVMC_MOCO_MPEG2, PIX_FMT_XVMC_MPEG2_MC}, -- {IMGFMT_XVMC_IDCT_MPEG2, PIX_FMT_XVMC_MPEG2_IDCT}, -- {IMGFMT_VDPAU_MPEG1, PIX_FMT_VDPAU_MPEG1}, -- {IMGFMT_VDPAU_MPEG2, PIX_FMT_VDPAU_MPEG2}, -- {IMGFMT_VDPAU_H264, PIX_FMT_VDPAU_H264}, -- {IMGFMT_VDPAU_WMV3, PIX_FMT_VDPAU_WMV3}, -- {IMGFMT_VDPAU_VC1, PIX_FMT_VDPAU_VC1}, -- {IMGFMT_VDPAU_MPEG4, PIX_FMT_VDPAU_MPEG4}, -- {0, PIX_FMT_NONE} -+ {IMGFMT_YV12, AV_PIX_FMT_YUVJ420P}, -+ {IMGFMT_422P, AV_PIX_FMT_YUVJ422P}, -+ {IMGFMT_444P, AV_PIX_FMT_YUVJ444P}, -+ {IMGFMT_440P, AV_PIX_FMT_YUVJ440P}, -+ -+ {IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC}, -+ {IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT}, -+ {IMGFMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1}, -+ {IMGFMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2}, -+ {IMGFMT_VDPAU_H264, AV_PIX_FMT_VDPAU_H264}, -+ {IMGFMT_VDPAU_WMV3, AV_PIX_FMT_VDPAU_WMV3}, -+ {IMGFMT_VDPAU_VC1, AV_PIX_FMT_VDPAU_VC1}, -+ {IMGFMT_VDPAU_MPEG4, AV_PIX_FMT_VDPAU_MPEG4}, -+ {0, AV_PIX_FMT_NONE} - }; - --enum PixelFormat imgfmt2pixfmt(int fmt) -+enum AVPixelFormat imgfmt2pixfmt(int fmt) - { - int i; -- enum PixelFormat pix_fmt; -+ enum AVPixelFormat pix_fmt; - for (i = 0; conversion_map[i].fmt; i++) - 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; - } - --int pixfmt2imgfmt(enum PixelFormat pix_fmt) -+int pixfmt2imgfmt(enum AVPixelFormat pix_fmt) - { - 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; - if (!fmt) -- mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported PixelFormat %i\n", pix_fmt); -+ mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVPixelFormat %i\n", pix_fmt); - return fmt; - } - -diff -urN MPlayer-1.1.orig//fmt-conversion.h MPlayer-1.1/fmt-conversion.h ---- MPlayer-1.1.orig//fmt-conversion.h 2011-03-01 22:44:15.000000000 +0100 -+++ MPlayer-1.1/fmt-conversion.h 2013-01-17 09:28:38.120215759 +0100 -@@ -23,8 +23,8 @@ - #include "libavutil/avutil.h" - #include "libavutil/samplefmt.h" - --enum PixelFormat imgfmt2pixfmt(int fmt); --int pixfmt2imgfmt(enum PixelFormat pix_fmt); -+enum AVPixelFormat imgfmt2pixfmt(int fmt); -+int pixfmt2imgfmt(enum AVPixelFormat pix_fmt); - enum AVSampleFormat affmt2samplefmt(int fmt); - int samplefmt2affmt(enum AVSampleFormat sample_fmt); - -diff -urN MPlayer-1.1.orig//libaf/af_format.c MPlayer-1.1/libaf/af_format.c ---- MPlayer-1.1.orig//libaf/af_format.c 2011-10-26 17:12:35.000000000 +0200 -+++ MPlayer-1.1/libaf/af_format.c 2013-01-17 09:43:32.770183189 +0100 -@@ -34,6 +34,7 @@ - #include "libvo/fastmemcpy.h" - - #include "libavutil/avutil.h" -+#include "libavutil/common.h" - - /* Functions used by play to convert the input audio to the correct - format */ -diff -urN MPlayer-1.1.orig//libaf/af_lavcac3enc.c MPlayer-1.1/libaf/af_lavcac3enc.c ---- MPlayer-1.1.orig//libaf/af_lavcac3enc.c 2012-02-19 16:21:23.000000000 +0100 -+++ MPlayer-1.1/libaf/af_lavcac3enc.c 2013-01-17 09:44:27.103181211 +0100 -@@ -32,6 +32,7 @@ - #include "reorder_ch.h" - #include "av_helpers.h" - -+#include "libavutil/common.h" - #include "libavcodec/avcodec.h" - #include "libavutil/intreadwrite.h" - -diff -urN MPlayer-1.1.orig//libmpcodecs/vf.c MPlayer-1.1/libmpcodecs/vf.c ---- MPlayer-1.1.orig//libmpcodecs/vf.c 2012-05-30 23:08:05.000000000 +0200 -+++ MPlayer-1.1/libmpcodecs/vf.c 2013-01-17 09:50:25.861168154 +0100 -@@ -40,6 +40,7 @@ - #include "vf.h" - - #include "libvo/fastmemcpy.h" -+#include "libavutil/common.h" - #include "libavutil/mem.h" - - extern const vf_info_t vf_info_1bpp; -diff -urN MPlayer-1.1.orig//libmpcodecs/vf_geq.c MPlayer-1.1/libmpcodecs/vf_geq.c ---- MPlayer-1.1.orig//libmpcodecs/vf_geq.c 2011-04-19 09:32:36.000000000 +0200 -+++ MPlayer-1.1/libmpcodecs/vf_geq.c 2013-01-17 09:44:01.045182161 +0100 -@@ -34,6 +34,8 @@ - - #include "libavcodec/avcodec.h" - #include "libavutil/eval.h" -+#include "libavutil/common.h" -+#include "libavutil/mem.h" - - struct vf_priv_s { - AVExpr * e[3]; -diff -urN MPlayer-1.1.orig//libmpcodecs/vf_gradfun.c MPlayer-1.1/libmpcodecs/vf_gradfun.c ---- MPlayer-1.1.orig//libmpcodecs/vf_gradfun.c 2010-04-06 11:46:47.000000000 +0200 -+++ MPlayer-1.1/libmpcodecs/vf_gradfun.c 2013-01-17 09:47:10.679175257 +0100 -@@ -39,6 +39,7 @@ - #include "vf.h" - #include "libvo/fastmemcpy.h" - #include "libavutil/avutil.h" -+#include "libavutil/common.h" - #include "libavutil/x86_cpu.h" - - struct vf_priv_s { -diff -urN MPlayer-1.1.orig//libmpcodecs/vf_sab.c MPlayer-1.1/libmpcodecs/vf_sab.c ---- MPlayer-1.1.orig//libmpcodecs/vf_sab.c 2011-05-25 15:46:32.000000000 +0200 -+++ MPlayer-1.1/libmpcodecs/vf_sab.c 2013-01-17 09:28:59.964214957 +0100 -@@ -32,6 +32,7 @@ - #endif - - #include "libavutil/avutil.h" -+#include "libavutil/mem.h" - #include "img_format.h" - #include "mp_image.h" - #include "vf.h" -diff -urN MPlayer-1.1.orig//libmpcodecs/vf_screenshot.c MPlayer-1.1/libmpcodecs/vf_screenshot.c ---- MPlayer-1.1.orig//libmpcodecs/vf_screenshot.c 2012-02-19 23:09:30.000000000 +0100 -+++ MPlayer-1.1/libmpcodecs/vf_screenshot.c 2013-01-17 09:28:04.643216971 +0100 -@@ -39,6 +39,7 @@ - - #include "libswscale/swscale.h" - #include "libavcodec/avcodec.h" -+#include "libavutil/mem.h" - - struct vf_priv_s { - int frameno; -diff -urN MPlayer-1.1.orig//libmpdemux/demux_lavf.c MPlayer-1.1/libmpdemux/demux_lavf.c ---- MPlayer-1.1.orig//libmpdemux/demux_lavf.c 2012-04-07 22:08:53.000000000 +0200 -+++ MPlayer-1.1/libmpdemux/demux_lavf.c 2013-01-17 09:41:44.880187116 +0100 -@@ -317,20 +317,20 @@ - sh_audio->samplerate= codec->sample_rate; - sh_audio->i_bps= codec->bit_rate/8; - switch (codec->codec_id) { -- case CODEC_ID_PCM_S8: -- case CODEC_ID_PCM_U8: -+ case AV_CODEC_ID_PCM_S8: -+ case AV_CODEC_ID_PCM_U8: - sh_audio->samplesize = 1; - break; -- case CODEC_ID_PCM_S16LE: -- case CODEC_ID_PCM_S16BE: -- case CODEC_ID_PCM_U16LE: -- case CODEC_ID_PCM_U16BE: -+ case AV_CODEC_ID_PCM_S16LE: -+ case AV_CODEC_ID_PCM_S16BE: -+ case AV_CODEC_ID_PCM_U16LE: -+ case AV_CODEC_ID_PCM_U16BE: - sh_audio->samplesize = 2; - break; -- case CODEC_ID_PCM_ALAW: -+ case AV_CODEC_ID_PCM_ALAW: - sh_audio->format = 0x6; - break; -- case CODEC_ID_PCM_MULAW: -+ case AV_CODEC_ID_PCM_MULAW: - sh_audio->format = 0x7; - break; - } -@@ -358,7 +358,7 @@ - priv->vstreams[priv->video_streams] = i; - bih=calloc(sizeof(*bih) + codec->extradata_size,1); - -- if(codec->codec_id == CODEC_ID_RAWVIDEO) { -+ if(codec->codec_id == AV_CODEC_ID_RAWVIDEO) { - switch (codec->pix_fmt) { - case PIX_FMT_RGB24: - codec->codec_tag= MKTAG(24, 'B', 'G', 'R'); -@@ -423,24 +423,24 @@ - case AVMEDIA_TYPE_SUBTITLE:{ - sh_sub_t* sh_sub; - char type; -- if(codec->codec_id == CODEC_ID_TEXT) -+ if(codec->codec_id == AV_CODEC_ID_TEXT) - type = 't'; -- else if(codec->codec_id == CODEC_ID_MOV_TEXT) -+ else if(codec->codec_id == AV_CODEC_ID_MOV_TEXT) - type = 'm'; -- else if(codec->codec_id == CODEC_ID_SSA) -+ else if(codec->codec_id == AV_CODEC_ID_SSA) - type = 'a'; -- else if(codec->codec_id == CODEC_ID_DVD_SUBTITLE) -+ else if(codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE) - type = 'v'; -- else if(codec->codec_id == CODEC_ID_XSUB) -+ else if(codec->codec_id == AV_CODEC_ID_XSUB) - type = 'x'; -- else if(codec->codec_id == CODEC_ID_DVB_SUBTITLE) -+ else if(codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) - type = 'b'; -- else if(codec->codec_id == CODEC_ID_DVB_TELETEXT) -+ else if(codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) - type = 'd'; -- else if(codec->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE) -+ else if(codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) - type = 'p'; --#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100) -- else if(codec->codec_id == CODEC_ID_EIA_608) -+#if LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 14, 100) -+ else if(codec->codec_id == AV_CODEC_ID_EIA_608) - type = 'c'; - #endif - else if(codec->codec_tag == MKTAG('c', '6', '0', '8')) -@@ -465,7 +465,7 @@ - break; - } - case AVMEDIA_TYPE_ATTACHMENT:{ -- if (st->codec->codec_id == CODEC_ID_TTF) { -+ if (st->codec->codec_id == AV_CODEC_ID_TTF) { - AVDictionaryEntry *fnametag = av_dict_get(st->metadata, "filename", NULL, 0); - demuxer_add_attachment(demuxer, fnametag ? fnametag->value : NULL, - "application/x-truetype-font", -@@ -808,7 +808,7 @@ - prog->aid = program->stream_index[i]; - break; - case AVMEDIA_TYPE_SUBTITLE: -- if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == CODEC_ID_TEXT) -+ if(prog->sid == -2 && priv->avfc->streams[program->stream_index[i]]->codec->codec_id == AV_CODEC_ID_TEXT) - prog->sid = program->stream_index[i]; - break; - } -diff -urN MPlayer-1.1.orig//stream/cache2.c MPlayer-1.1/stream/cache2.c ---- MPlayer-1.1.orig//stream/cache2.c 2012-03-04 16:11:50.000000000 +0100 -+++ MPlayer-1.1/stream/cache2.c 2013-01-17 09:30:01.501212718 +0100 -@@ -40,6 +40,7 @@ - #include <errno.h> - - #include "libavutil/avutil.h" -+#include "libavutil/common.h" - #include "osdep/shmem.h" - #include "osdep/timer.h" - #if defined(__MINGW32__) -diff -urN MPlayer-1.1.orig//sub/spudec.c MPlayer-1.1/sub/spudec.c ---- MPlayer-1.1.orig//sub/spudec.c 2012-04-23 20:39:16.000000000 +0200 -+++ MPlayer-1.1/sub/spudec.c 2013-01-17 09:46:50.054176009 +0100 -@@ -42,6 +42,7 @@ - #include "spudec.h" - #include "vobsub.h" - #include "libavutil/avutil.h" -+#include "libavutil/common.h" - #include "libavutil/intreadwrite.h" - #include "libswscale/swscale.h" - -diff -urN MPlayer-1.1.orig//sub/sub_cc.c MPlayer-1.1/sub/sub_cc.c ---- MPlayer-1.1.orig//sub/sub_cc.c 2012-04-07 22:08:53.000000000 +0200 -+++ MPlayer-1.1/sub/sub_cc.c 2013-01-17 09:46:31.413176687 +0100 -@@ -42,6 +42,7 @@ - #include "sub.h" - - #include "libavutil/avutil.h" -+#include "libavutil/common.h" - - - #define CC_MAX_LINE_LENGTH 64 diff --git a/media-video/mplayer/files/mplayer-1.1-missingbreak.patch b/media-video/mplayer/files/mplayer-1.1-missingbreak.patch deleted file mode 100644 index 0dd7064..0000000 --- a/media-video/mplayer/files/mplayer-1.1-missingbreak.patch +++ /dev/null @@ -1,18 +0,0 @@ ------------------------------------------------------------------------- -r35436 | upsuper | 2012-11-21 08:37:24 -0300 (Wed, 21 Nov 2012) | 2 lines - -Add missing break. - ------------------------------------------------------------------------- -Index: libmpcodecs/ad_ffmpeg.c -=================================================================== ---- libmpcodecs/ad_ffmpeg.c (revision 35435) -+++ libmpcodecs/ad_ffmpeg.c (revision 35436) -@@ -245,6 +245,7 @@ - case 4: - copy_samples_planar(4, frame->nb_samples, channels, - buf, frame->extended_data); -+ break; - default: - copy_samples_planar(sample_size, frame->nb_samples, channels, - buf, frame->extended_data); diff --git a/media-video/mplayer/files/mplayer-1.1-planaraudio.patch b/media-video/mplayer/files/mplayer-1.1-planaraudio.patch deleted file mode 100644 index 48dcb4c..0000000 --- a/media-video/mplayer/files/mplayer-1.1-planaraudio.patch +++ /dev/null @@ -1,138 +0,0 @@ ------------------------------------------------------------------------- -r35228 | cigaes | 2012-10-04 15:04:42 -0300 (Thu, 04 Oct 2012) | 5 lines - -ad_ffmpeg: basic support for planar formats. - -Upgrade to avcodec_decode_audio4(). -Planar formats are immediately converted to packet formats. -A lot of optimizations are still possible. ------------------------------------------------------------------------- - - -Index: libmpcodecs/ad_ffmpeg.c -=================================================================== ---- libmpcodecs/ad_ffmpeg.c (revision 35227) -+++ libmpcodecs/ad_ffmpeg.c (revision 35228) -@@ -57,7 +57,7 @@ - { - int broken_srate = 0; - int samplerate = lavc_context->sample_rate; -- int sample_format = samplefmt2affmt(lavc_context->sample_fmt); -+ int sample_format = samplefmt2affmt(av_get_packed_sample_fmt(lavc_context->sample_fmt)); - if (!sample_format) - sample_format = sh_audio->sample_format; - if(sh_audio->wf){ -@@ -169,10 +169,10 @@ - sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; - - switch (lavc_context->sample_fmt) { -- case AV_SAMPLE_FMT_U8: -- case AV_SAMPLE_FMT_S16: -- case AV_SAMPLE_FMT_S32: -- case AV_SAMPLE_FMT_FLT: -+ case AV_SAMPLE_FMT_U8: case AV_SAMPLE_FMT_U8P: -+ case AV_SAMPLE_FMT_S16: case AV_SAMPLE_FMT_S16P: -+ case AV_SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32P: -+ case AV_SAMPLE_FMT_FLT: case AV_SAMPLE_FMT_FLTP: - break; - default: - return 0; -@@ -202,10 +202,68 @@ - return CONTROL_UNKNOWN; - } - -+static av_always_inline void copy_samples_planar(unsigned bps, -+ unsigned nb_samples, -+ unsigned nb_channels, -+ unsigned char *dst, -+ unsigned char **src) -+{ -+ unsigned s, c, o = 0; -+ -+ for (s = 0; s < nb_samples; s++) { -+ for (c = 0; c < nb_channels; c++) { -+ memcpy(dst, src[c] + o, bps); -+ dst += bps; -+ } -+ o += bps; -+ } -+} -+ -+static int copy_samples(AVCodecContext *avc, AVFrame *frame, -+ unsigned char *buf, int max_size) -+{ -+ int channels = avc->channels; -+ int sample_size = av_get_bytes_per_sample(avc->sample_fmt); -+ int size = channels * sample_size * frame->nb_samples; -+ -+ if (size > max_size) { -+ av_log(avc, AV_LOG_ERROR, -+ "Buffer overflow while decoding a single frame\n"); -+ return AVERROR(EINVAL); /* same as avcodec_decode_audio3 */ -+ } -+ /* TODO reorder channels at the same time */ -+ if (av_sample_fmt_is_planar(avc->sample_fmt)) { -+ switch (sample_size) { -+ case 1: -+ copy_samples_planar(1, frame->nb_samples, channels, -+ buf, frame->extended_data); -+ break; -+ case 2: -+ copy_samples_planar(2, frame->nb_samples, channels, -+ buf, frame->extended_data); -+ break; -+ case 4: -+ copy_samples_planar(4, frame->nb_samples, channels, -+ buf, frame->extended_data); -+ default: -+ copy_samples_planar(sample_size, frame->nb_samples, channels, -+ buf, frame->extended_data); -+ } -+ } else { -+ memcpy(buf, frame->data[0], size); -+ } -+ return size; -+} -+ - static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) - { - unsigned char *start=NULL; -- int y,len=-1; -+ int y,len=-1, got_frame; -+ AVFrame *frame = avcodec_alloc_frame(); -+ -+ if (!frame) -+ return AVERROR(ENOMEM); -+ - while(len<minlen){ - AVPacket pkt; - int len2=maxlen; -@@ -230,7 +288,7 @@ - sh_audio->pts = pts; - sh_audio->pts_bytes = 0; - } -- y=avcodec_decode_audio3(sh_audio->context,(int16_t*)buf,&len2,&pkt); -+ y=avcodec_decode_audio4(sh_audio->context, frame, &got_frame, &pkt); - //printf("return:%d samples_out:%d bitstream_in:%d sample_sum:%d\n", y, len2, x, len); fflush(stdout); - // LATM may need many packets to find mux info - if (y == AVERROR(EAGAIN)) -@@ -238,6 +296,11 @@ - if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } - if(!sh_audio->parser && y<x) - sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) -+ if (!got_frame) -+ continue; -+ len2 = copy_samples(sh_audio->context, frame, buf, maxlen); -+ if (len2 < 0) -+ return len2; - if(len2>0){ - if (((AVCodecContext *)sh_audio->context)->channels >= 5) { - int samplesize = av_get_bytes_per_sample(((AVCodecContext *) -@@ -258,5 +321,7 @@ - if (setup_format(sh_audio, sh_audio->context)) - break; - } -+ -+ av_free(frame); - return len; - } diff --git a/media-video/mplayer/files/mplayer-1.1.1-avcodecidsubrip.patch b/media-video/mplayer/files/mplayer-1.1.1-avcodecidsubrip.patch deleted file mode 100644 index 2e357db..0000000 --- a/media-video/mplayer/files/mplayer-1.1.1-avcodecidsubrip.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: MPlayer-1.1.1/libmpdemux/demux_lavf.c -=================================================================== ---- MPlayer-1.1.1.orig/libmpdemux/demux_lavf.c -+++ MPlayer-1.1.1/libmpdemux/demux_lavf.c -@@ -423,7 +423,11 @@ static void handle_stream(demuxer_t *dem - case AVMEDIA_TYPE_SUBTITLE:{ - sh_sub_t* sh_sub; - char type; -- if(codec->codec_id == AV_CODEC_ID_TEXT) -+ if(codec->codec_id == AV_CODEC_ID_TEXT -+#if LIBAVUTIL_VERSION_MICRO >= 100 -+ || codec->codec_id == AV_CODEC_ID_SUBRIP -+#endif -+ ) - type = 't'; - else if(codec->codec_id == AV_CODEC_ID_MOV_TEXT) - type = 'm'; diff --git a/media-video/mplayer/files/mplayer-1.1.1-codecidsubrip.patch b/media-video/mplayer/files/mplayer-1.1.1-codecidsubrip.patch deleted file mode 100644 index 27bd9db..0000000 --- a/media-video/mplayer/files/mplayer-1.1.1-codecidsubrip.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: MPlayer-1.1.1/libmpdemux/demux_lavf.c -=================================================================== ---- MPlayer-1.1.1.orig/libmpdemux/demux_lavf.c -+++ MPlayer-1.1.1/libmpdemux/demux_lavf.c -@@ -423,7 +423,11 @@ static void handle_stream(demuxer_t *dem - case AVMEDIA_TYPE_SUBTITLE:{ - sh_sub_t* sh_sub; - char type; -- if(codec->codec_id == CODEC_ID_TEXT) -+ if(codec->codec_id == CODEC_ID_TEXT -+#if LIBAVUTIL_VERSION_MICRO >= 100 -+ || codec->codec_id == AV_CODEC_ID_SUBRIP -+#endif -+ ) - type = 't'; - else if(codec->codec_id == CODEC_ID_MOV_TEXT) - type = 'm'; diff --git a/media-video/mplayer/mplayer-1.1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1.1-r1.ebuild deleted file mode 100644 index 777777b..0000000 --- a/media-video/mplayer/mplayer-1.1.1-r1.ebuild +++ /dev/null @@ -1,658 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -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 +quicktime -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}" ]; 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 - app-arch/bzip2 - sys-libs/zlib - >=virtual/ffmpeg-0.10.3 - 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-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) - 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 ) - selinux? ( sec-policy/selinux-mplayer ) - sdl? ( media-libs/libsdl ) - speex? ( media-libs/speex ) - theora? ( media-libs/libtheora[encode?] ) - truetype? ( ${FONT_RDEPS} ) - vdpau? ( x11-libs/libvdpau ) - vorbis? ( 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} ) -" - -SLOT="0" -LICENSE="GPL-2" -if [[ ${PV} != *9999* ]]; then - KEYWORDS="alpha amd64 arm hppa ia64 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, win32codecs 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 -# libvorbis require external tremor to work -# radio requires oss or alsa backend -# xvmc requires xvideo support -REQUIRED_USE=" - dvdnav? ( dvd ) - libass? ( truetype ) - truetype? ( iconv ) - ggi? ( X ) - xinerama? ( X ) - dga? ( X ) - opengl? ( || ( X aqua ) ) - osdmenu? ( || ( X aqua ) ) - vdpau? ( X ) - vidix? ( X ) - xscreensaver? ( X ) - xv? ( X ) - xvmc? ( xv )" -RESTRICT="faac? ( bindist )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch" - "${FILESDIR}/${PN}-1.1-ffmpeg.patch" - "${FILESDIR}/${PN}-1.1-libav-0.8.patch" - "${FILESDIR}/${PN}-1.1-codecid.patch" -) - -pkg_setup() { - if [[ ${PV} == *9999* ]]; then - elog - elog "This is a live ebuild which installs the latest from upstream's" - elog "subversion repository, and is unsupported by Gentoo." - elog "Everything but bugs in the ebuild itself will be ignored." - elog - fi - - if use cpudetection; then - ewarn - ewarn "You've enabled the cpudetection flag. This feature is" - ewarn "included mainly for people who want to use the same" - ewarn "binary on another system with a different CPU architecture." - ewarn "MPlayer will already detect your CPU settings by default at" - ewarn "buildtime; this flag is used for runtime detection." - ewarn "You won't need this turned on if you are only building" - ewarn "mplayer for this system. Also, if your compile fails, try" - ewarn "disabling this use flag." - fi -} - -src_unpack() { - if [[ ${PV} = *9999* ]]; then - subversion_src_unpack - cd "${WORKDIR}" - rm -rf "${WORKDIR}/${P}/ffmpeg/" - ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack ) - else - unpack ${A} - fi - - if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then - cd "${S}" - cp "${FILESDIR}/dump_ffmpeg.sh" . || die - chmod +x dump_ffmpeg.sh - ./dump_ffmpeg.sh || die - fi - - if ! use truetype; then - unpack font-arial-iso-8859-1.tar.bz2 \ - font-arial-iso-8859-2.tar.bz2 \ - font-arial-cp1250.tar.bz2 - fi -} - -src_prepare() { - 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 - - if has_version dev-libs/libcdio-paranoia; then - sed -i \ - -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ - -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ - configure stream/stream_cdda.c || die - fi - - base_src_prepare - if has_version '>=media-video/libav-9_rc' || has_version '>=media-video/ffmpeg-1.1' ; then - epatch "${FILESDIR}/${PN}-1.1-libav-9.patch" \ - "${FILESDIR}/${PN}-1.1-planaraudio.patch" \ - "${FILESDIR}/${PN}-1.1-missingbreak.patch" \ - "${FILESDIR}/${PN}-1.1.1-avcodecidsubrip.patch" - elif has_version '>=media-video/ffmpeg-1' ; then - epatch "${FILESDIR}/${PN}-1.1.1-codecidsubrip.patch" - fi - - # 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}" - - # 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 - myconf+=" - --disable-svga --disable-svgalib_helper - --disable-ass-internal - --disable-arts - --disable-kai - $(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" - # Disable internal mp3lib, bug #384849 - # Samuli Suominen: Looks like MPlayer in Portage is using internal mp3lib by - # default, where as mpg123 upstream has incorporated all the optimizations - # from mplayer's mp3lib in libmpg123 and more. - # It makes very little sense to use the internal copy as default anymore. - myconf+=" --disable-mp3lib" - if ! use mp3; then - myconf+=" - --disable-mp3lame - --disable-mpg123 - " - fi - uses="a52 bs2b dv gsm lzo rtmp" - 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 xanim" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use jpeg2k || myconf+=" --disable-libopenjpeg" - if use vorbis || use tremor; then - use tremor || myconf+=" --disable-tremor-internal" - use vorbis || myconf+=" --disable-libvorbis" - else - myconf+=" - --disable-tremor-internal - --disable-tremor - --disable-libvorbis - " - fi - # 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 # - ################# - # bug 213836 - use quicktime || myconf+=" --disable-qtx" - myconf+=" --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 - - tc-export PKG_CONFIG - ./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 - LINGUAS=${LINGUAS/zh/zh_CN} - 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" -}
