gcc-3.3 fix for libraw1394

4 files changed, 40 insertions, 5 deletions

diff --git a/sys-libs/libraw1394/ChangeLog b/sys-libs/libraw1394/ChangeLog
index 516a3eaf54f2..6599a8b4cc0c 100644
--- a/sys-libs/libraw1394/ChangeLog
+++ b/sys-libs/libraw1394/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libraw1394
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/ChangeLog,v 1.6 2003/09/02 09:26:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/ChangeLog,v 1.7 2003/09/06 12:54:45 hanno Exp $
+
+  06 Sep 2003; Hanno Boeck <hanno@gentoo.org> libraw1394-0.9.0.ebuild,
+  files/libraw_gcc33_fix:
+  Fix for gcc 3.3.
 
   02 Sep 2003; Seemant Kulleen <seemant@gentoo.org> libraw1394-0.9.0.ebuild:
   devfs will create the /dev/raw1394 device when the module is loaded -- thanks
diff --git a/sys-libs/libraw1394/Manifest b/sys-libs/libraw1394/Manifest
index 884014f215a2..1b9306095fd7 100644
--- a/sys-libs/libraw1394/Manifest
+++ b/sys-libs/libraw1394/Manifest
@@ -1,3 +1,4 @@
-MD5 e2cdf34402e5a2590c2c21dc68438ecf libraw1394-0.9.0.ebuild 776
-MD5 b0c9b2030a0d817bee2ed46e254ffc16 ChangeLog 1194
+MD5 626fa5ce13fd1affc5ba732f3ecb246a ChangeLog 1309
+MD5 e8479f3327d6edc0e398879951e03b95 libraw1394-0.9.0.ebuild 849
+MD5 805344f2108b517b175204d657f88fcb files/libraw_gcc33_fix 1060
 MD5 6bc52708d033490062bf8c735077bd74 files/digest-libraw1394-0.9.0 68
diff --git a/sys-libs/libraw1394/files/libraw_gcc33_fix b/sys-libs/libraw1394/files/libraw_gcc33_fix
new file mode 100644
index 000000000000..a1467e7535aa
--- /dev/null
+++ b/sys-libs/libraw1394/files/libraw_gcc33_fix
@@ -0,0 +1,25 @@
+--- libraw1394-0.9.0-orig/src/testlibraw.c	2001-01-27 04:26:32.000000000 +0200
++++ libraw1394-0.9.0/src/testlibraw.c	2003-08-17 20:05:02.000000000 +0300
+@@ -19,14 +19,14 @@
+ 
+ #define TESTADDR (CSR_REGISTER_BASE + CSR_CYCLE_TIME)
+ 
+-const char not_compatible[] = "\
+-This libraw1394 does not work with your version of Linux. You need a different
+-version that matches your kernel (see kernel help text for the raw1394 option to
+-find out which is the correct version).\n";
+-
+-const char not_loaded[] = "\
+-This probably means that you don't have raw1394 support in the kernel or that
+-you haven't loaded the raw1394 module.\n";
++const char not_compatible[] = \
++"This libraw1394 does not work with your version of Linux. You need a different "\
++"version that matches your kernel (see kernel help text for the raw1394 option to "\
++"find out which is the correct version).\n";
++
++const char not_loaded[] = \
++"This probably means that you don't have raw1394 support in the kernel or that " \
++"you haven't loaded the raw1394 module.\n";
+ 
+ quadlet_t buffer;
+ 
diff --git a/sys-libs/libraw1394/libraw1394-0.9.0.ebuild b/sys-libs/libraw1394/libraw1394-0.9.0.ebuild
index 0d9bae13d99f..6d6329b9eff8 100644
--- a/sys-libs/libraw1394/libraw1394-0.9.0.ebuild
+++ b/sys-libs/libraw1394/libraw1394-0.9.0.ebuild
@@ -1,18 +1,23 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/libraw1394-0.9.0.ebuild,v 1.10 2003/09/02 09:26:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libraw1394/libraw1394-0.9.0.ebuild,v 1.11 2003/09/06 12:54:45 hanno Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="libraw1394 provides direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface."
 HOMEPAGE="http://sourceforge.net/projects/libraw1394/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
+IUSE=""
 SLOT="0"
 LICENSE="LGPL-2.1 | GPL-2"
 KEYWORDS="x86 ppc"
 
 DEPEND="virtual/glibc"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/libraw_gcc33_fix
+}
+
 src_compile() {
 	econf || die
 	emake || die