diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-04-25 19:32:50 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-04-25 19:32:50 +0000 |
| commit | facf2b79788031b091d1776ce0127917480881d3 (patch) | |
| tree | efd500f4ac48826c505a19ff09bf3a32ca03b1c7 /media-libs | |
| parent | Version bumped to 2.16 and closing bug #83411. (diff) | |
| download | gentoo-2-facf2b79788031b091d1776ce0127917480881d3.tar.gz gentoo-2-facf2b79788031b091d1776ce0127917480881d3.tar.bz2 gentoo-2-facf2b79788031b091d1776ce0127917480881d3.zip | |
Fix building for gcc4.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libmpeg3/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libmpeg3/files/1.5.2-gcc4.patch | 11 | ||||
| -rw-r--r-- | media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild | 7 |
3 files changed, 21 insertions, 3 deletions
diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog index d75293d9d3b1..b04cfd3254b1 100644 --- a/media-libs/libmpeg3/ChangeLog +++ b/media-libs/libmpeg3/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libmpeg3 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.34 2005/04/08 02:32:22 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.35 2005/04/25 19:32:50 azarah Exp $ + + 25 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +files/1.5.2-gcc4.patch, + libmpeg3-1.5.2-r1.ebuild: + Fix building for gcc4. 08 Apr 2005; Danny van Dyk <kugelfang@gentoo.org> libmpeg3-1.5.2-r1.ebuild: diff --git a/media-libs/libmpeg3/files/1.5.2-gcc4.patch b/media-libs/libmpeg3/files/1.5.2-gcc4.patch new file mode 100644 index 000000000000..11dee13b3593 --- /dev/null +++ b/media-libs/libmpeg3/files/1.5.2-gcc4.patch @@ -0,0 +1,11 @@ +--- libmpeg3-1.5.2/video/output.c.orig 2005-04-25 19:14:02.000000000 +0000 ++++ libmpeg3-1.5.2/video/output.c 2005-04-25 19:14:15.000000000 +0000 +@@ -497,7 +497,7 @@ + *data++ = 0; + + #define STORE_PIXEL_RGB565 \ +- *((unsigned short*)data)++ = \ ++ *data++ = \ + ((CLIP(r_l) & 0xf8) << 8) | \ + ((CLIP(g_l) & 0xfc) << 3) | \ + ((CLIP(b_l) & 0xf8) >> 3); diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild index 7a258bfdb176..d7c4d05f3717 100644 --- a/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild +++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.5 2005/04/08 02:32:22 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r1.ebuild,v 1.6 2005/04/25 19:32:50 azarah Exp $ inherit flag-o-matic eutils gcc @@ -33,7 +33,10 @@ src_unpack() { epatch ${FILESDIR}/${PV}-proper-c.patch epatch ${FILESDIR}/${PV}-no-nasm.patch epatch ${FILESDIR}/${PV}-gentoo-multilib.patch - [ "`gcc-version`" == "3.4" ] && epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452 + [ "`gcc-version`" == "3.4" -o "`gcc-major-version`" -ge 4 ] && \ + epatch ${FILESDIR}/${PV}-gcc3.4.patch #49452 + [ "`gcc-major-version`" -ge 4 ] && \ + epatch ${FILESDIR}/${PV}-gcc4.patch # remove a52 crap echo > Makefile.a52 rm -rf a52dec-0.7.3/* |