summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-04-26 13:45:37 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-04-26 13:45:37 +0000
commitf79b9660cc73f812fbd163a12a360cf57ac6467c (patch)
tree084108c1a139b342cbcf9c5a978a24816d6fd782 /media-libs
parentrevision bump to compile with R-2.0.0 via some ugly hack (diff)
downloadgentoo-2-f79b9660cc73f812fbd163a12a360cf57ac6467c.tar.gz
gentoo-2-f79b9660cc73f812fbd163a12a360cf57ac6467c.tar.bz2
gentoo-2-f79b9660cc73f812fbd163a12a360cf57ac6467c.zip
Fix building with gcc4.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmovtar/ChangeLog8
-rw-r--r--media-libs/libmovtar/files/libmovtar-0.1.3-gcc4.patch11
-rw-r--r--media-libs/libmovtar/libmovtar-0.1.3-r1.ebuild9
3 files changed, 23 insertions, 5 deletions
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 <azarah@gentoo.org>
+ +files/libmovtar-0.1.3-gcc4.patch, libmovtar-0.1.3-r1.ebuild:
+ Fix building with gcc4.
06 Dec 2002; Rodney Rees <manson@gentoo.org> : 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 <jinclude.h>::" movtar_play.c.orig > movtar_play.c
+ # Fix building with gcc4
+ epatch ${FILESDIR}/${P}-gcc4.patch
+
}
src_compile() {