From 8d1e4f10e50bd5fa01c9b042e82b7b3510dfffeb Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Thu, 19 Aug 2004 10:57:28 +0000 Subject: Add patch from marco to fix matrix function (bug #44429) --- dev-games/irrlicht/ChangeLog | 6 +++- dev-games/irrlicht/Manifest | 21 +++++++------- dev-games/irrlicht/files/0.6-matrix4.patch | 44 ++++++++++++++++++++++++++++++ dev-games/irrlicht/irrlicht-0.6.ebuild | 16 +++++------ 4 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 dev-games/irrlicht/files/0.6-matrix4.patch (limited to 'dev-games') diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog index f75900295ee7..0cda6a860425 100644 --- a/dev-games/irrlicht/ChangeLog +++ b/dev-games/irrlicht/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/irrlicht # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.5 2004/06/24 22:11:56 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.6 2004/08/19 10:57:28 mr_bones_ Exp $ + + 19 Aug 2004; Michael Sterrett + +files/0.6-matrix4.patch, irrlicht-0.6.ebuild: + Add patch from marco to fix matrix function (bug #44429) 13 Apr 2004; David Holm irrlicht-0.6.ebuild: Added to ~ppc. diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest index 4575e9912004..f1166640610c 100644 --- a/dev-games/irrlicht/Manifest +++ b/dev-games/irrlicht/Manifest @@ -1,17 +1,18 @@ -MD5 35e63b79df7a7c17756d0741ed5a90af irrlicht-0.5.ebuild 1086 +MD5 cc910634ba9ce163c714713e37627fc2 ChangeLog 937 MD5 3a9d774dd69235ad3a48f4b6ef64e85f irrlicht-0.4.ebuild 1086 -MD5 abd0f5ae81b612a3d64444a138dc985a irrlicht-0.6.ebuild 1074 -MD5 da15039ba9a78a272ecce9861d799d67 ChangeLog 772 +MD5 35e63b79df7a7c17756d0741ed5a90af irrlicht-0.5.ebuild 1086 MD5 ad41838cd74c70f9c72295bda4662786 metadata.xml 790 -MD5 3d0c46bd872601ae474803a089531688 files/0.5-opengl.patch 189 +MD5 5e68fa0d8bcb48ffd5a1a6134be71567 irrlicht-0.6.ebuild 1136 MD5 fa4aefc57679135f80c2762fcb2f0a74 files/0.4-jpeg.patch 540 -MD5 7b37375664460afe01f8a7e43267fc32 files/0.5-system-libs.patch 608 -MD5 198eb6eaae065c1fc596876e91e6edb2 files/digest-irrlicht-0.4 62 -MD5 28cea3cba0224c39fac23e8735d46d52 files/digest-irrlicht-0.5 63 -MD5 649feea18262ca019ba09afd0e683da2 files/digest-irrlicht-0.6 63 MD5 3d0c46bd872601ae474803a089531688 files/0.4-opengl.patch 189 +MD5 7b37375664460afe01f8a7e43267fc32 files/0.4-system-libs.patch 608 +MD5 198eb6eaae065c1fc596876e91e6edb2 files/digest-irrlicht-0.4 62 MD5 33d681a58fa24489d6bdf9f48346ed08 files/0.5-jpeg.patch 536 +MD5 3d0c46bd872601ae474803a089531688 files/0.5-opengl.patch 189 +MD5 7b37375664460afe01f8a7e43267fc32 files/0.5-system-libs.patch 608 +MD5 28cea3cba0224c39fac23e8735d46d52 files/digest-irrlicht-0.5 63 MD5 33d681a58fa24489d6bdf9f48346ed08 files/0.6-jpeg.patch 536 -MD5 7b37375664460afe01f8a7e43267fc32 files/0.6-system-libs.patch 608 -MD5 7b37375664460afe01f8a7e43267fc32 files/0.4-system-libs.patch 608 MD5 3d0c46bd872601ae474803a089531688 files/0.6-opengl.patch 189 +MD5 7b37375664460afe01f8a7e43267fc32 files/0.6-system-libs.patch 608 +MD5 649feea18262ca019ba09afd0e683da2 files/digest-irrlicht-0.6 63 +MD5 e649d039e3bedf6bd1808eaab999e98e files/0.6-matrix4.patch 1538 diff --git a/dev-games/irrlicht/files/0.6-matrix4.patch b/dev-games/irrlicht/files/0.6-matrix4.patch new file mode 100644 index 000000000000..bf5d3742a2d9 --- /dev/null +++ b/dev-games/irrlicht/files/0.6-matrix4.patch @@ -0,0 +1,44 @@ +diff -Nur irrlicht-0.6/include/matrix4.h irrlicht-0.6_new/include/matrix4.h +--- irrlicht-0.6/include/matrix4.h 2004-08-17 23:18:27.372459013 +0200 ++++ irrlicht-0.6_new/include/matrix4.h 2004-08-17 23:21:56.520925016 +0200 +@@ -186,7 +186,7 @@ + newMatrix[8] = m1[0]*m2[8] + m1[4]*m2[9] + m1[8]*m2[10] + m1[12]*m2[11]; + newMatrix[9] = m1[1]*m2[8] + m1[5]*m2[9] + m1[9]*m2[10] + m1[13]*m2[11]; + newMatrix[10] = m1[2]*m2[8] + m1[6]*m2[9] + m1[10]*m2[10] + m1[14]*m2[11]; +- newMatrix[11] = m1[3]*m2[8] + m1[7]*m2[10] + m1[11]*m2[10] + m1[15]*m2[11]; ++ newMatrix[11] = m1[3]*m2[8] + m1[7]*m2[9] + m1[11]*m2[10] + m1[15]*m2[11]; + + newMatrix[12] = m1[0]*m2[12] + m1[4]*m2[13] + m1[8]*m2[14] + m1[12]*m2[15]; + newMatrix[13] = m1[1]*m2[12] + m1[5]*m2[13] + m1[9]*m2[14] + m1[13]*m2[15]; +@@ -308,7 +308,7 @@ + + f32 rotx, roty, X, Z; + +- if (fabs(Y)>0.0005f) ++ if (fabs(C)>0.0005f) + { + rotx = mat(2,2) / C; + roty = mat(2,1) / C; +@@ -320,16 +320,16 @@ + else + { + X = 0.0f; +- rotx = -mat(1,1); +- roty = mat(1,0); ++ rotx = mat(1,1); ++ roty = -mat(0,1); + Z = atan2f( roty, rotx ) * (f32)GRAD_PI; + } + +- if (fabs(X)>=360.00f) X=0.00f; +- if (fabs(Y)>=360.00f) Y=0.00f; +- if (fabs(Z)>=360.00f) Z=0.00f; ++ if (X<0.00f) X+=360.00f; ++ if (Y<0.00f) Y+=360.00f; ++ if (Z<0.00f) Z+=360.00f; + +- return vector3df(X,Y,Z); ++ return vector3df((f32)X,(f32)Y,(f32)Z); + } + + inline void matrix4::setInverseRotationRadians( const vector3df& rotation ) diff --git a/dev-games/irrlicht/irrlicht-0.6.ebuild b/dev-games/irrlicht/irrlicht-0.6.ebuild index b502442e3de8..e24cdba0b619 100644 --- a/dev-games/irrlicht/irrlicht-0.6.ebuild +++ b/dev-games/irrlicht/irrlicht-0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.6.ebuild,v 1.3 2004/06/24 22:11:56 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-0.6.ebuild,v 1.4 2004/08/19 10:57:28 mr_bones_ Exp $ inherit eutils @@ -20,20 +20,20 @@ DEPEND="media-libs/jpeg src_unpack() { unpack ${A} - cd ${S} - cd source + cd ${S}/source unzip -qo source.zip || die "unpacking source.zip" rm -rf source.zip zlib jpeglib ln -s /usr/include jpeglib ln -s /usr/include zlib - epatch ${FILESDIR}/${PV}-system-libs.patch - epatch ${FILESDIR}/${PV}-jpeg.patch - epatch ${FILESDIR}/${PV}-opengl.patch + epatch "${FILESDIR}/${PV}-system-libs.patch" + epatch "${FILESDIR}/${PV}-jpeg.patch" + epatch "${FILESDIR}/${PV}-opengl.patch" + epatch "${FILESDIR}/${PV}-matrix4.patch" } src_compile() { cd source - emake || die + emake || die "emake failed" } src_install() { @@ -41,5 +41,5 @@ src_install() { insinto /usr/include/${PN} doins include/* dodoc changes.txt readme.txt - use doc && cp -r examples media ${D}/usr/share/doc/${PF}/ + use doc && cp -r examples media "${D}/usr/share/doc/${PF}/" } -- cgit v1.2.3-65-gdbad