Bug 95051, patch from Mark

(Portage version: 2.1.2_rc1-r7)

5 files changed, 98 insertions, 2 deletions

diff --git a/dev-perl/sdl-perl/ChangeLog b/dev-perl/sdl-perl/ChangeLog
index 930be64524f9..d067262d7a72 100644
--- a/dev-perl/sdl-perl/ChangeLog
+++ b/dev-perl/sdl-perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/sdl-perl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.36 2006/10/20 20:27:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.37 2006/11/18 16:05:07 mcummings Exp $
+
+*sdl-perl-2.1.3-r3 (18 Nov 2006)
+
+  18 Nov 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/sdl-perl-2.1.3-gfxPie.patch, sdl-perl-2.1.3-r2.ebuild,
+  +sdl-perl-2.1.3-r3.ebuild:
+  Bug 95051, patch from Mark
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
   sdl-perl-2.1.3-r2.ebuild:
diff --git a/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r3 b/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r3
new file mode 100644
index 000000000000..8f50e1ed9e03
--- /dev/null
+++ b/dev-perl/sdl-perl/files/digest-sdl-perl-2.1.3-r3
@@ -0,0 +1,3 @@
+MD5 6ce26e1b710ce52def4ec22637cd5176 SDL_Perl-2.1.3.tar.gz 782794
+RMD160 26a4d317d9a5761fc893b732f2236eaad8d12b88 SDL_Perl-2.1.3.tar.gz 782794
+SHA256 055e4eee85089cf9f7305e68580082fabb624c28199840cf91838b673539b082 SDL_Perl-2.1.3.tar.gz 782794
diff --git a/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch b/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch
new file mode 100644
index 000000000000..461eccd9ed38
--- /dev/null
+++ b/dev-perl/sdl-perl/files/sdl-perl-2.1.3-gfxPie.patch
@@ -0,0 +1,33 @@
+--- src/SDL.xs~	2003-03-27 12:17:23.000000000 +0200
++++ src/SDL.xs	2005-02-25 20:32:07.353170226 +0200
+@@ -71,6 +71,7 @@
+ #include <SDL_gfxPrimitives.h>
+ #include <SDL_framerate.h>
+ #include <SDL_imageFilter.h>
++#define PERL_SDL_GFXVERSION SDL_VERSIONNUM(SDL_GFXPRIMITIVES_MAJOR,SDL_GFXPRIMITIVES_MINOR,SDL_GFXPRIMITIVES_MICRO)
+ #endif
+ 
+ #ifdef USE_THREADS
+@@ -3742,7 +3743,11 @@
+     Sint16 end;
+     Uint32 color;
+ CODE:
++#if PERL_SDL_GFXVERSION >= 2012
++     RETVAL = filledPieColor( dst, x, y, rad, start, end, color );
++#else
+      RETVAL = filledpieColor( dst, x, y, rad, start, end, color );
++#endif
+ OUTPUT:
+      RETVAL
+ 
+@@ -3759,7 +3764,11 @@
+     Uint8 b;
+     Uint8 a;
+ CODE:
++#if PERL_SDL_GFXVERSION >= 2012
++     RETVAL = filledPieRGBA( dst, x, y, rad, start, end, r, g, b, a );
++#else
+      RETVAL = filledpieRGBA( dst, x, y, rad, start, end, r, g, b, a );
++#endif
+ OUTPUT:
+      RETVAL
diff --git a/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild b/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
index 46851677673a..3f20c0e97b44 100644
--- a/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
+++ b/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild,v 1.12 2006/10/20 20:27:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/sdl-perl-2.1.3-r2.ebuild,v 1.13 2006/11/18 16:05:07 mcummings Exp $
 
 inherit perl-module eutils
 
@@ -38,6 +38,7 @@ src_unpack() {
 	if has_version '>=dev-perl/module-build-0.28' ; then
 		epatch ${FILESDIR}/sdl-2.1.3.build.patch
 	fi
+	epatch ${FILESDIR}/sdl-perl-2.1.3-gfxPie.patch
 }
 
 src_install() {
diff --git a/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild b/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild
new file mode 100644
index 000000000000..5c0ad95cca08
--- /dev/null
+++ b/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/sdl-perl-2.1.3-r3.ebuild,v 1.1 2006/11/18 16:05:07 mcummings Exp $
+
+inherit perl-module eutils
+
+DESCRIPTION="SDL binding for perl"
+HOMEPAGE="http://sdl.perl.org/"
+SRC_URI="http://search.cpan.org/CPAN/authors/id/D/DG/DGOEHRIG/SDL_Perl-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="truetype mpeg"
+
+# Only enable this if you are confirming a bug in this module. The testsrequire
+# access to your /dev/{snd,sound} devices.
+#SRC_TEST="do"
+
+DEPEND="virtual/opengl
+	>=media-libs/libsdl-1.2.6
+	>=media-libs/sdl-mixer-1.2.5
+	>=media-libs/sdl-image-1.2.2
+	>=media-libs/sdl-gfx-2.0.3
+	>=media-libs/sdl-net-1.2.4
+	>=dev-perl/module-build-0.28
+	dev-perl/ExtUtils-CBuilder
+	mpeg? ( media-libs/smpeg )
+	truetype? ( >=media-libs/sdl-ttf-2.0.5 )
+	dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/SDL_Perl-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if has_version '>=dev-perl/module-build-0.28' ; then
+		epatch ${FILESDIR}/sdl-2.1.3.build.patch
+	fi
+	epatch ${FILESDIR}/sdl-perl-2.1.3-gfxPie.patch
+}
+
+src_install() {
+	perl-module_src_install
+	# The build doesnt properly abort when there is an error
+	if [[ -z $(find "${D}" -name SDL.pm) ]] ; then
+		die "failed to install properly"
+	fi
+}
+
+