Added patches to allow compiling with gcc-3.4

4 files changed, 57 insertions, 5 deletions

diff --git a/media-tv/mythfrontend/ChangeLog b/media-tv/mythfrontend/ChangeLog
index aec2ba5adc2c..0d87891ca24c 100644
--- a/media-tv/mythfrontend/ChangeLog
+++ b/media-tv/mythfrontend/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/mythfrontend
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.18 2004/06/25 00:32:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/ChangeLog,v 1.19 2004/06/28 16:54:01 morfic Exp $
+
+  28 Jun 2004; Daniel Goller <morfic@gentoo.org> mythfrontend-0.15.1.ebuild:
+  Applied patch to allow compiling with gcc-3.4 conditionally
+  Patch thanks to Herbie Hopkins
+  This closes bug #52819
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mythfrontend-0.13.ebuild,
   mythfrontend-0.14-r1.ebuild, mythfrontend-0.15.1.ebuild:
diff --git a/media-tv/mythfrontend/Manifest b/media-tv/mythfrontend/Manifest
index db8b2f2e1e95..dc395af69934 100644
--- a/media-tv/mythfrontend/Manifest
+++ b/media-tv/mythfrontend/Manifest
@@ -1,9 +1,10 @@
-MD5 1dcee5db35b5e059e7144e2799d0abab mythfrontend-0.15.1.ebuild 5099
+MD5 d53ee898a67b47e23920a4650f365e08 mythfrontend-0.15.1.ebuild 5271
 MD5 718b0bd72f8bac27fbf6f687d128a4c6 mythfrontend-0.14-r1.ebuild 4228
 MD5 31247cce705afa71aca3b58989862205 mythfrontend-0.13.ebuild 2786
-MD5 6322bb5d36644b0356fc41c4ba8c22bd ChangeLog 2810
+MD5 a219376024abf797d5f27d6137a2a3ef ChangeLog 3006
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 788cdcff1808794391bf5ef2e157b5fb files/digest-mythfrontend-0.15.1 67
 MD5 f34c79d00b235a08f18cf9f2107d6390 files/mythtv-0.15-directfb.patch 1185
+MD5 e7cc68f54ad1c6128aec944e105189e3 files/gcc-3.4-fix.patch 1773
 MD5 a01439b4ddf480862e31867fc4689698 files/digest-mythfrontend-0.13 65
 MD5 24ab1e90e64fb0be4704e74b633e96b1 files/digest-mythfrontend-0.14-r1 65
diff --git a/media-tv/mythfrontend/files/gcc-3.4-fix.patch b/media-tv/mythfrontend/files/gcc-3.4-fix.patch
new file mode 100644
index 000000000000..097177687318
--- /dev/null
+++ b/media-tv/mythfrontend/files/gcc-3.4-fix.patch
@@ -0,0 +1,39 @@
+diff -ur mythtv-0.15.1.orig/libs/libmythtv/fifowriter.cpp mythtv-0.15.1/libs/libmythtv/fifowriter.cpp
+--- mythtv-0.15.1.orig/libs/libmythtv/fifowriter.cpp	2004-06-02 21:06:54.427866608 +0100
++++ mythtv-0.15.1/libs/libmythtv/fifowriter.cpp	2004-06-02 21:08:37.942130048 +0100
+@@ -21,9 +21,9 @@
+     maxblksize = new long[count];
+     killwr = new int[count];
+     fbcount = new int[count];
+-    fifo_buf = new (struct fifo_buf *)[count];
+-    fb_inptr = new (struct fifo_buf *)[count];
+-    fb_outptr = new (struct fifo_buf *)[count];
++    fifo_buf = new fifo_ptr[count];
++    fb_inptr = new fifo_ptr[count];
++    fb_outptr = new fifo_ptr[count];
+     fifothrds = new pthread_t[count];
+     fifo_lock = new pthread_mutex_t [count];
+     empty_cond = new pthread_cond_t[count];
+diff -ur mythtv-0.15.1.orig/libs/libmythtv/fifowriter.h mythtv-0.15.1/libs/libmythtv/fifowriter.h
+--- mythtv-0.15.1.orig/libs/libmythtv/fifowriter.h	2004-06-02 21:06:54.423867216 +0100
++++ mythtv-0.15.1/libs/libmythtv/fifowriter.h	2004-06-02 21:08:03.708334376 +0100
+@@ -29,6 +29,7 @@
+         long blksize;
+      } **fifo_buf, **fb_inptr, **fb_outptr;
+ 
++     typedef struct fifo_buf* fifo_ptr;
+      pthread_t *fifothrds;
+      pthread_mutex_t *fifo_lock;
+      pthread_cond_t *full_cond, *empty_cond;
+diff -ur mythtv-0.15.1.orig/settings.pro mythtv-0.15.1/settings.pro
+--- mythtv-0.15.1.orig/settings.pro	2004-06-02 21:06:54.474859464 +0100
++++ mythtv-0.15.1/settings.pro	2004-06-02 21:07:07.013953232 +0100
+@@ -14,7 +14,7 @@
+ 
+ release {
+         DEFINES += MMX
+-        QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer
++        QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer -fpermissive
+         QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
+ }
+ 
diff --git a/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild b/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild
index d10eb7ff3dd9..e7652f8610d2 100644
--- a/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild
+++ b/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild,v 1.4 2004/06/25 00:32:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythfrontend/mythfrontend-0.15.1.ebuild,v 1.5 2004/06/28 16:54:01 morfic Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils gcc
 
 DESCRIPTION="Homebrew PVR project frontend."
 HOMEPAGE="http://www.mythtv.org/"
@@ -63,6 +63,13 @@ src_unpack() {
 	done
 
 	use directfb && epatch ${FILESDIR}/mythtv-0.15-directfb.patch
+
+	#Applies patch for gcc-3.4.0 closing bug #52819
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+	epatch ${FILESDIR}/gcc-3.4-fix.patch
+	fi
+
 }
 
 src_compile() {