summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2003-06-01 14:36:24 +0000
committerMartin Holzer <mholzer@gentoo.org>2003-06-01 14:36:24 +0000
commitc596f2a79ee775b2749bb5c9bc2ed98af4113f16 (patch)
tree21960fe913fc39c31381e5777fb81ebabd7a3400 /media-video/mjpegtools
parentmjpegtools update (diff)
downloadgentoo-2-c596f2a79ee775b2749bb5c9bc2ed98af4113f16.tar.gz
gentoo-2-c596f2a79ee775b2749bb5c9bc2ed98af4113f16.tar.bz2
gentoo-2-c596f2a79ee775b2749bb5c9bc2ed98af4113f16.zip
Making gcc 2.95 compatible
Diffstat (limited to 'media-video/mjpegtools')
-rw-r--r--media-video/mjpegtools/ChangeLog5
-rw-r--r--media-video/mjpegtools/Manifest4
-rw-r--r--media-video/mjpegtools/mjpegtools-1.6.1.ebuild6
3 files changed, 10 insertions, 5 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 9e5ca5e390bb..1072cda4b9d0 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mjpegtools
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.25 2003/06/01 14:07:32 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.26 2003/06/01 14:36:15 mholzer Exp $
+
+ 01 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.1.ebuild:
+ Making gcc 2.95 compatible
01 Jun 2003; Martin Holzer <mholzer@gentoo.org> mjpegtools-1.6.0-r7.ebuild:
Making gcc 2.95 compatible
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 5f45c4344d83..1f7ce764d972 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,7 +1,7 @@
-MD5 f25989d690e64b97612afca5eecb0055 ChangeLog 5460
+MD5 f9dd830320793f97d5acd193784e030a ChangeLog 5565
MD5 cf0462eb5f7d08ea353754e085e2d42e mjpegtools-1.6.0-r5.ebuild 2295
MD5 bca05a7204d0ca660b773846ad1f5df2 mjpegtools-1.6.0-r7.ebuild 2911
-MD5 376ac6318ef58c1394cee97b0e6d9f12 mjpegtools-1.6.1.ebuild 2390
+MD5 d3f02b0b02a436028238f8d20aaa1c4c mjpegtools-1.6.1.ebuild 2447
MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443
MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r5 147
MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147
diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
index 7aad38c3bdb3..f09d9793366e 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.ebuild,v 1.4 2003/05/02 18:58:33 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.1.ebuild,v 1.5 2003/06/01 14:36:15 mholzer Exp $
IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi"
-inherit libtool flag-o-matic base
+inherit gcc libtool flag-o-matic base
S="${WORKDIR}/${P}"
DESCRIPTION="Tools for MJPEG video"
@@ -46,11 +46,13 @@ src_unpack() {
sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h
sed -i "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h
+ if [ "`gcc-major-version`" -eq "3" ] ; then
# Don't remove this!!!
# Contact phoen][x <phoenix@gentoo.org> if you have problems with it.
cd ${S}/lavtools
sed -i "s/dv_decoder_new(0,0,0)\;/dv_decoder_new()\;/" lav_common.c
sed -i "s/dv_decoder_new(0,0,0)\;/dv_decoder_new()\;/" lav_io.c
+ fi
fi
}