diff options
| author |   Steve Dibb <beandog@gentoo.org> | 2008-11-24 21:52:53 +0000 |
|---|---|---|
| committer | Steve Dibb <beandog@gentoo.org> | 2008-11-24 21:52:53 +0000 |
| commit | 6ef52a15d7e96f430c312ef368ad913b3a6bee2c (patch) | |
| tree | 4872236df11e4ffb4aaaa7a9b91e8a730c54195d /media-video/mplayer | |
| parent | Fix bug #248589 reported by mathwizard@gmx.de (diff) | |
| download | gentoo-2-6ef52a15d7e96f430c312ef368ad913b3a6bee2c.tar.gz gentoo-2-6ef52a15d7e96f430c312ef368ad913b3a6bee2c.tar.bz2 gentoo-2-6ef52a15d7e96f430c312ef368ad913b3a6bee2c.zip | |
Fix sparc compilation, bug 241110; Thanks to Friedrich Oslage for patch
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64, RepoMan options: --force)
Diffstat (limited to 'media-video/mplayer')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-libmpeg2-libavcodec.patch | 27 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_rc2_p27725-r1.ebuild | 5 |
3 files changed, 37 insertions, 2 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index bac07ea2d395..fefa1660e33b 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.598 2008/11/10 11:24:29 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.599 2008/11/24 21:52:53 beandog Exp $ + + 24 Nov 2008; Steve Dibb <beandog@gentoo.org> + +files/mplayer-libmpeg2-libavcodec.patch, + mplayer-1.0_rc2_p27725-r1.ebuild: + Fix sparc compilation, bug 241110; Thanks to Friedrich Oslage for patch 10 Nov 2008; Raúl Porcel <armin76@gentoo.org> mplayer-1.0_rc2_p27725-r1.ebuild: diff --git a/media-video/mplayer/files/mplayer-libmpeg2-libavcodec.patch b/media-video/mplayer/files/mplayer-libmpeg2-libavcodec.patch new file mode 100644 index 000000000000..a2352bc16c6a --- /dev/null +++ b/media-video/mplayer/files/mplayer-libmpeg2-libavcodec.patch @@ -0,0 +1,27 @@ +--- libavcodec/sparc/simple_idct_vis.c ++++ libavcodec/sparc/simple_idct_vis.c +@@ -384,6 +384,7 @@ + "st %%f14, [%12+" dest "] \n\t"\ + + ++extern void ff_simple_idct_vis(DCTELEM *data); + inline void ff_simple_idct_vis(DCTELEM *data) { + int out1, out2, out3, out4; + DECLARE_ALIGNED_8(int16_t, temp[8*8]); +--- libmpeg2/idct.c ++++ libmpeg2/idct.c +@@ -265,13 +265,12 @@ + mpeg2_idct_altivec_init (); + } else + #endif +-#ifdef HAVE_VIS ++#ifdef ARCH_ALPHA + if (accel & MPEG2_ACCEL_ALPHA_MVI) { + mpeg2_idct_copy = mpeg2_idct_copy_mvi; + mpeg2_idct_add = mpeg2_idct_add_mvi; + mpeg2_idct_alpha_init (); + } else +-#elif ARCH_ALPHA + if (accel & MPEG2_ACCEL_ALPHA) { + int i; + diff --git a/media-video/mplayer/mplayer-1.0_rc2_p27725-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p27725-r1.ebuild index 0f966ee54c79..9e82d7ef7775 100644 --- a/media-video/mplayer/mplayer-1.0_rc2_p27725-r1.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc2_p27725-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p27725-r1.ebuild,v 1.9 2008/11/10 11:24:29 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p27725-r1.ebuild,v 1.10 2008/11/24 21:52:53 beandog Exp $ EAPI="1" @@ -206,6 +206,9 @@ src_unpack() { cd "${S}" + # Fix sparc compilation, bug 241110 + epatch "${FILESDIR}/mplayer-libmpeg2-libavcodec.patch" + # Fix x264 compilation, bug 240347 epatch "${FILESDIR}/mplayer-1.0_rc2_p27725-libx264.patch" |