Fix build error with newer versions of gcc #115087 by charly.

Package-Manager: portage-2.0.53

5 files changed, 81 insertions, 8 deletions

diff --git a/media-libs/sdl-gfx/ChangeLog b/media-libs/sdl-gfx/ChangeLog
index 06a153cb4120..019241c40a7c 100644
--- a/media-libs/sdl-gfx/ChangeLog
+++ b/media-libs/sdl-gfx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/sdl-gfx
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gfx/ChangeLog,v 1.28 2005/04/21 19:09:31 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gfx/ChangeLog,v 1.29 2005/12/10 19:49:45 vapier Exp $
+
+*sdl-gfx-2.0.13-r1 (10 Dec 2005)
+
+  10 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/sdl-gfx-2.0.13-gcc34.patch, +sdl-gfx-2.0.13-r1.ebuild:
+  Fix build error with newer versions of gcc #115087 by charly.
 
   21 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
   sdl-gfx-2.0.13.ebuild:
diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest
index 266cec70cdf3..e5427d4759bf 100644
--- a/media-libs/sdl-gfx/Manifest
+++ b/media-libs/sdl-gfx/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1d48e18d277960775fdc2fd3587c5a7d sdl-gfx-2.0.13.ebuild 920
+MD5 0e7e6ac87f3068ab1aaa9216dab1bd26 ChangeLog 3343
+MD5 754377119b8dd712ea3bf57460c33257 files/digest-sdl-gfx-2.0.13-r1 66
+MD5 76a22a2a5a9fbd772b6501ba0463c7bb files/sdl-gfx-2.0.13-gcc34.patch 447
 MD5 583673dbf2a4a07468a6146e77f87862 metadata.xml 814
-MD5 e6e15f7a4cae3d8f1ec622739052ab65 ChangeLog 3133
-MD5 754377119b8dd712ea3bf57460c33257 files/digest-sdl-gfx-2.0.13 66
+MD5 ded2d0fc681538d36795b674694bbc4f sdl-gfx-2.0.13-r1.ebuild 1008
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDOc/1gIKl8Uu19MoRAjGsAJ4l1yI7x4sttBgYIYgelQVgiYgeNwCfdy3c
-z58/u2a+Vjtn0GG2IuFYimw=
-=CjiS
+iD8DBQFDmzIZgIKl8Uu19MoRAoCIAJ9oqi1pYgYCoXWMkDyRtHlFrADz6ACeOzUg
+XmTu+OoBkfuqyNL5Z4fOWNM=
+=jCkp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/sdl-gfx/files/digest-sdl-gfx-2.0.13-r1 b/media-libs/sdl-gfx/files/digest-sdl-gfx-2.0.13-r1
new file mode 100644
index 000000000000..3ccaca51fcbd
--- /dev/null
+++ b/media-libs/sdl-gfx/files/digest-sdl-gfx-2.0.13-r1
@@ -0,0 +1 @@
+MD5 b1ce778232db0b1979695f0a5a945a13 SDL_gfx-2.0.13.tar.gz 598297
diff --git a/media-libs/sdl-gfx/files/sdl-gfx-2.0.13-gcc34.patch b/media-libs/sdl-gfx/files/sdl-gfx-2.0.13-gcc34.patch
new file mode 100644
index 000000000000..ff39f9aed239
--- /dev/null
+++ b/media-libs/sdl-gfx/files/sdl-gfx-2.0.13-gcc34.patch
@@ -0,0 +1,26 @@
+Fix build error with newer gcc
+
+http://bugs.gentoo.org/115087
+
+--- SDL_gfxPrimitives.h
++++ SDL_gfxPrimitives.h
+@@ -187,7 +187,7 @@
+ 
+ /* Ends C function definitions when using C++ */
+ #ifdef __cplusplus
+-};
++}
+ #endif
+ 
+ #endif				/* _SDL_gfxPrimitives_h */
+--- SDL_imageFilter.h
++++ SDL_imageFilter.h
+@@ -186,7 +186,7 @@
+ 
+ /* Ends C function definitions when using C++ */
+ #ifdef __cplusplus
+-};
++}
+ #endif
+ 
+ #endif				/* _SDL_imageFilter_h */
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.13-r1.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.13-r1.ebuild
new file mode 100644
index 000000000000..073098aa2194
--- /dev/null
+++ b/media-libs/sdl-gfx/sdl-gfx-2.0.13-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-gfx/sdl-gfx-2.0.13-r1.ebuild,v 1.1 2005/12/10 19:49:45 vapier Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="${P/sdl-/SDL_}"
+DESCRIPTION="Graphics drawing primitives library for SDL"
+HOMEPAGE="http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/index.html"
+SRC_URI="http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE="mmx"
+
+DEPEND=">=media-libs/libsdl-1.2"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+}
+
+src_compile() {
+	filter-flags -finline-functions -funroll-loops #26892 #89749
+	replace-flags -O? -O2
+
+	econf $(use_enable mmx) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+	dohtml -r Docs/*
+}