Patch to fix compiling with gcc-3.4.x.

4 files changed, 60 insertions, 14 deletions

diff --git a/media-video/ati-gatos/ChangeLog b/media-video/ati-gatos/ChangeLog
index 807c4cec173c..78ef9c42ca99 100644
--- a/media-video/ati-gatos/ChangeLog
+++ b/media-video/ati-gatos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ati-gatos
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-gatos/ChangeLog,v 1.18 2004/10/04 06:20:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-gatos/ChangeLog,v 1.19 2004/12/24 04:27:00 vapier Exp $
+
+  23 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/ati-gatos-4.4.0-prototypes.patch, ati-gatos-4.4.0.ebuild:
+  Patch to fix compiling with gcc-3.4.x.
 
   03 Oct 2004; Donnie Berkholz <spyderous@gentoo.org>; ati-gatos-4.4.0.ebuild:
   Update XFree references to Xorg.
diff --git a/media-video/ati-gatos/Manifest b/media-video/ati-gatos/Manifest
index 00dbf430b8e9..ec6db552e3f9 100644
--- a/media-video/ati-gatos/Manifest
+++ b/media-video/ati-gatos/Manifest
@@ -1,7 +1,18 @@
-MD5 b7b5f72b91ae71934d72d4cb7381e549 ChangeLog 2665
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b2b834ae157f9d6a83f9ede1597db75b ChangeLog 2821
 MD5 9fb1596ce1b15c6cf93b2a3e05f38285 metadata.xml 337
 MD5 509ffacc782a18f5b5bb975c7d843818 ati-gatos-4.3.0.ebuild 2289
-MD5 266959b91a3660633f6ffe277374a67b ati-gatos-4.4.0.ebuild 2394
+MD5 f73e4f75586ad9487cbc0e53565344f6 ati-gatos-4.4.0.ebuild 2403
 MD5 909c81fb5d11eb05efdf420d56460f57 files/digest-ati-gatos-4.3.0 68
 MD5 f0a4b78e9cfa26b4ffdf829e000d0459 files/ati-gatos-4.4.0-new-xorg.patch 10854
 MD5 ee56241b288c93ecd41472ee630a1ace files/digest-ati-gatos-4.4.0 77
+MD5 21b46c970264da1f4d614d8357e56336 files/ati-gatos-4.4.0-prototypes.patch 1100
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBy5qhroRuSHgZdywRAmBPAKCCvanopCjqE8XROp97ITzfBltj+gCdH1t3
+C/uIbVvxm+/1YS8niLP9Nfs=
+=pRDY
+-----END PGP SIGNATURE-----
diff --git a/media-video/ati-gatos/ati-gatos-4.4.0.ebuild b/media-video/ati-gatos/ati-gatos-4.4.0.ebuild
index 98f5453d7741..abf3eb8898f3 100644
--- a/media-video/ati-gatos/ati-gatos-4.4.0.ebuild
+++ b/media-video/ati-gatos/ati-gatos-4.4.0.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-gatos/ati-gatos-4.4.0.ebuild,v 1.2 2004/10/04 06:20:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-gatos/ati-gatos-4.4.0.ebuild,v 1.3 2004/12/24 04:27:00 vapier Exp $
 
 inherit eutils
 
-IUSE=""
-
 SNAPSHOT=20040930
 MYP=${P}-${SNAPSHOT}
 
 DESCRIPTION="ATI Multimedia-capable drivers for Xorg"
-SRC_URI="mirror://gentoo/${MYP}.tar.bz2"
 HOMEPAGE="http://gatos.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MYP}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
-DEPEND="${DEPEND}
-	>=x11-base/xorg-x11-6.7.0-r1"
+DEPEND=">=x11-base/xorg-x11-6.7.0-r1"
 
 pkg_setup() {
-	if [ ! "`grep sdk /var/db/pkg/x11-base/xorg-x11-[0-9]*/USE`" ]
-	then
+	if ! built_with_use x11-base/xorg-x11 sdk ; then
 		ewarn "This package requires that xorg-x11 was merged with the sdk USE flag enabled."
 		die "Please merge xorg-x11 with the sdk USE flag enabled."
 	fi
@@ -32,12 +29,13 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	if has_version '>=x11-base/xorg-x11-6.7.99*'
-	then
+	if has_version '>=x11-base/xorg-x11-6.7.99*' ; then
 		einfo "Patching ati-gatos for use with >=x11-base/xorg-x11-6.7.99"
 		epatch ${FILESDIR}/${P}-new-xorg.patch
 	fi
 
+	epatch ${FILESDIR}/${P}-prototypes.patch
+
 	# Build makefiles against Xorg SDK
 	imake -I/usr/X11R6/lib/Server/config/cf -DUseInstalled -DXF86DriverSDK
 
diff --git a/media-video/ati-gatos/files/ati-gatos-4.4.0-prototypes.patch b/media-video/ati-gatos/files/ati-gatos-4.4.0-prototypes.patch
new file mode 100644
index 000000000000..f18869084c63
--- /dev/null
+++ b/media-video/ati-gatos/files/ati-gatos-4.4.0-prototypes.patch
@@ -0,0 +1,33 @@
+These source files don't prototype some functions before 
+attempting to use them.  On older GCC's, that was acceptable, 
+but newer ones complain and cause build failure:
+
+fi1236.c:371: error: conflicting types for 'MT2032_dump_status'
+fi1236.c:170: error: previous implicit declaration of 'MT2032_dump_status' was here
+
+Patch doesn't seem to be in upstream cvs:
+http://cvs.sourceforge.net/viewcvs.py/gatos/ati.4.4.0/fi1236.c
+http://cvs.sourceforge.net/viewcvs.py/gatos/ati.4.4.0/theatre.c
+
+Patch author: vapier@gentoo.org
+
+--- ati-gatos-4.4.0/fi1236.c.orig	2004-12-23 23:16:06.256187928 -0500
++++ ati-gatos-4.4.0/fi1236.c	2004-12-23 23:17:46.030020000 -0500
+@@ -112,6 +112,7 @@
+ }
+ 
+ 
++static void MT2032_dump_status(FI1236Ptr f);
+ static void MT2032_init(FI1236Ptr f)
+ {
+ CARD8 data[10];
+--- ati-gatos-4.4.0/theatre.c.orig	2004-12-23 23:17:50.433350592 -0500
++++ ati-gatos-4.4.0/theatre.c	2004-12-23 23:18:10.858245536 -0500
+@@ -24,6 +24,7 @@
+ #define VIP_TYPE      "ATI VIP BUS"
+ 
+ 
++void DumpRageTheatreRegsByName(TheatrePtr t);
+ TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b)
+ {
+    TheatrePtr t;