diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-16 16:44:56 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-16 16:44:56 +0000 |
| commit | d3389cb07b0bb94e4c6696b8bab9de2853fae67d (patch) | |
| tree | 4e19c1b16f707378a449882ea7aaf65378d041c8 /media-video/mplayer | |
| parent | Fix compability with libcdio-paranoia wrt #452458 (diff) | |
| download | gentoo-2-d3389cb07b0bb94e4c6696b8bab9de2853fae67d.tar.gz gentoo-2-d3389cb07b0bb94e4c6696b8bab9de2853fae67d.tar.bz2 gentoo-2-d3389cb07b0bb94e4c6696b8bab9de2853fae67d.zip | |
Build with system libav-0.8. Still fails a bit with libav9.
(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.1-libav-0.8.patch | 21 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.1-r1.ebuild | 5 |
3 files changed, 29 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index e537c5d5d906..1f9d1ea02041 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.867 2013/01/16 08:41:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.868 2013/01/16 16:44:56 scarabeus Exp $ + + 16 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> + +files/mplayer-1.1-libav-0.8.patch, mplayer-1.1-r1.ebuild: + Build with system libav-0.8. Still fails a bit with libav9. 16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> mplayer-1.1-r1.ebuild: Fix compability with dev-libs/libcdio-paranoia. 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 new file mode 100644 index 000000000000..acfb60584a96 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.1-libav-0.8.patch @@ -0,0 +1,21 @@ +--- 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/mplayer-1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1-r1.ebuild index 2de9339a2ead..719f6acb2070 100644 --- a/media-video/mplayer/mplayer-1.1-r1.ebuild +++ b/media-video/mplayer/mplayer-1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.13 2013/01/16 08:41:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1-r1.ebuild,v 1.14 2013/01/16 16:44:56 scarabeus Exp $ EAPI=4 @@ -61,7 +61,7 @@ RDEPEND+=" sys-libs/ncurses app-arch/bzip2 sys-libs/zlib - >=media-video/ffmpeg-0.10.3 + >=virtual/ffmpeg-0.10.3 !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) @@ -194,6 +194,7 @@ REQUIRED_USE="bindist? ( !faac !win32codecs ) PATCHES=( "${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch" "${FILESDIR}/${P}-ffmpeg.patch" + "${FILESDIR}/${P}-libav-0.8.patch" "${FILESDIR}/${P}-codecid.patch" ) |