summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Lashley <malc@gentoo.org>2004-07-31 18:05:54 +0000
committerMalcolm Lashley <malc@gentoo.org>2004-07-31 18:05:54 +0000
commit13fa9d7b98133229f6f1677850cf536ee2d6749a (patch)
treed61036336d16fc80fba13e1fbe286fe49d22da76
parentVersion bumped. (Manifest recommit) (diff)
downloadgentoo-2-13fa9d7b98133229f6f1677850cf536ee2d6749a.tar.gz
gentoo-2-13fa9d7b98133229f6f1677850cf536ee2d6749a.tar.bz2
gentoo-2-13fa9d7b98133229f6f1677850cf536ee2d6749a.zip
Add gcc34 compilation fix (same as kino) closes bug #58067
-rw-r--r--media-video/dvgrab/ChangeLog5
-rw-r--r--media-video/dvgrab/dvgrab-1.5.ebuild5
-rw-r--r--media-video/dvgrab/files/dvgrab_gcc34_fix11
3 files changed, 19 insertions, 2 deletions
diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index 57eabaf47a97..3288da7c6b51 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/dvgrab
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.3 2004/06/25 00:39:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.4 2004/07/31 18:05:54 malc Exp $
+
+ 31 Jul 2004; <malc@gentoo.org> dvgrab-1.5.ebuild:
+ Add gcc34 compilation fix (same as kino) closes bug #58067
31 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> dvgrab-1.5.ebuild:
Adding amd64 keyword, closing 46276.
diff --git a/media-video/dvgrab/dvgrab-1.5.ebuild b/media-video/dvgrab/dvgrab-1.5.ebuild
index 12b76e40cb8d..cb2a5d150647 100644
--- a/media-video/dvgrab/dvgrab-1.5.ebuild
+++ b/media-video/dvgrab/dvgrab-1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.5.ebuild,v 1.3 2004/06/25 00:39:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-1.5.ebuild,v 1.4 2004/07/31 18:05:54 malc Exp $
DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
HOMEPAGE="http://kino.schirmacher.de/"
@@ -16,6 +16,8 @@ DEPEND="sys-libs/libavc1394
jpeg? ( media-libs/jpeg )
quicktime? ( media-libs/libquicktime )"
+inherit eutils
+
# The following would be better but if it's satisfied by
# quicktime4linux then we need to use some special linker options
# (-ldl -lglib)
@@ -23,6 +25,7 @@ DEPEND="sys-libs/libavc1394
src_compile() {
econf ${myconf} || die
+ epatch ${FILESDIR}/dvgrab_gcc34_fix || die
emake || die
}
diff --git a/media-video/dvgrab/files/dvgrab_gcc34_fix b/media-video/dvgrab/files/dvgrab_gcc34_fix
new file mode 100644
index 000000000000..aaf4c5859481
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab_gcc34_fix
@@ -0,0 +1,11 @@
+--- dvgrab-1.5/work/dvgrab-1.5/ieee1394io.h 2004-01-04 21:46:21.000000000 +0000
++++ dvgrab-1.5_patched/work/dvgrab-1.5/ieee1394io.h 2004-07-31 18:50:28.246428088 +0100
+@@ -33,7 +33,7 @@
+
+ class IEEE1394Reader
+ {
+-private:
++protected:
+ /// the number of frames that had to be thrown away because
+ /// our inFrames queue did not contain available frames
+ static int droppedFrames;