From f79b9660cc73f812fbd163a12a360cf57ac6467c Mon Sep 17 00:00:00 2001 From: Martin Schlemmer Date: Tue, 26 Apr 2005 13:45:37 +0000 Subject: Fix building with gcc4. (Portage version: 2.0.51.20-r4) --- media-libs/libmovtar/ChangeLog | 8 ++++++-- media-libs/libmovtar/files/libmovtar-0.1.3-gcc4.patch | 11 +++++++++++ media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild | 9 ++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 media-libs/libmovtar/files/libmovtar-0.1.3-gcc4.patch (limited to 'media-libs') diff --git a/media-libs/libmovtar/ChangeLog b/media-libs/libmovtar/ChangeLog index b367ee563822..80f0c728e009 100644 --- a/media-libs/libmovtar/ChangeLog +++ b/media-libs/libmovtar/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libmovtar -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmovtar/ChangeLog,v 1.8 2004/06/24 23:12:12 agriffis Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmovtar/ChangeLog,v 1.9 2005/04/26 13:45:37 azarah Exp $ + + 26 Apr 2005; Martin Schlemmer + +files/libmovtar-0.1.3-gcc4.patch, libmovtar-0.1.3-r1.ebuild: + Fix building with gcc4. 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords diff --git a/media-libs/libmovtar/files/libmovtar-0.1.3-gcc4.patch b/media-libs/libmovtar/files/libmovtar-0.1.3-gcc4.patch new file mode 100644 index 000000000000..ed2150ef61dd --- /dev/null +++ b/media-libs/libmovtar/files/libmovtar-0.1.3-gcc4.patch @@ -0,0 +1,11 @@ +--- libmovtar-0.1.3/rtjpeg/RTjpeg.c 2005-04-26 13:42:26.000000000 +0000 ++++ libmovtar-0.1.3.az/rtjpeg/RTjpeg.c 2005-04-26 13:42:43.000000000 +0000 +@@ -129,7 +129,7 @@ + register int ci, co=1, tmp; + register __s16 ZZvalue; + +- (__u8)strm[0]=(__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]); ++ strm[0]=(__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]); + + for(ci=1; ci<=bt8; ci++) + { diff --git a/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild b/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild index cb343aaf211e..4f07e4634c52 100644 --- a/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild +++ b/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild,v 1.12 2004/07/14 20:11:13 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild,v 1.13 2005/04/26 13:45:37 azarah Exp $ IUSE="mmx" -inherit libtool +inherit eutils libtool DESCRIPTION="Movtar tools and library for MJPEG video" SRC_URI="http://download.sourceforge.net/mjpeg/${P}.tar.gz" @@ -27,6 +27,9 @@ src_unpack() { cp movtar_play.c movtar_play.c.orig sed -e "s:#include ::" movtar_play.c.orig > movtar_play.c + # Fix building with gcc4 + epatch ${FILESDIR}/${P}-gcc4.patch + } src_compile() { -- cgit v1.2.3-65-gdbad