Version bump to 1.1 Bug #139476

(Portage version: 2.1.1)

5 files changed, 112 insertions, 1 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 4e03e45aec44..1d83c41ace06 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.17 2006/07/27 16:17:14 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.18 2006/09/16 11:29:59 tupone Exp $
+
+*irrlicht-1.1 (16 Sep 2006)
+
+  16 Sep 2006; <tupone@gentoo.org> +files/irrlicht-1.1-config.patch,
+  +files/irrlicht-1.1-gcc41.patch, +irrlicht-1.1.ebuild:
+  Version bump to 1.1 Bug #139476 by stephane barotin
 
   27 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -irrlicht-0.12.0.ebuild, irrlicht-0.14.0.ebuild:
diff --git a/dev-games/irrlicht/files/digest-irrlicht-1.1 b/dev-games/irrlicht/files/digest-irrlicht-1.1
new file mode 100644
index 000000000000..905f5ed5b361
--- /dev/null
+++ b/dev-games/irrlicht/files/digest-irrlicht-1.1
@@ -0,0 +1,3 @@
+MD5 c2a3606e037213555e7891f0433fa98a irrlicht-1.1.zip 15647723
+RMD160 1469ade750699b12244e0f38ea07e6a4314e696c irrlicht-1.1.zip 15647723
+SHA256 6ef74629d33b4f2cb2faa91d81cbd0f591ebce620ebfae8e4fd3fb71f1137f19 irrlicht-1.1.zip 15647723
diff --git a/dev-games/irrlicht/files/irrlicht-1.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.1-config.patch
new file mode 100644
index 000000000000..e6ba8795f0d6
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.1-config.patch
@@ -0,0 +1,26 @@
+--- include/IrrCompileConfig.h.old	2006-09-16 12:42:28.000000000 +0200
++++ include/IrrCompileConfig.h	2006-09-16 12:42:58.000000000 +0200
+@@ -68,7 +68,6 @@
+ //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
+  This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
+ 
+ 
+ //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
+@@ -79,7 +78,6 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+  This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ 
+ 
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+@@ -90,7 +88,6 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+  This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+ 
+ 
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
diff --git a/dev-games/irrlicht/files/irrlicht-1.1-gcc41.patch b/dev-games/irrlicht/files/irrlicht-1.1-gcc41.patch
new file mode 100644
index 000000000000..5f0efbe7c141
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.1-gcc41.patch
@@ -0,0 +1,11 @@
+--- source/Irrlicht/CSceneManager.h.old	2006-09-16 12:15:36.000000000 +0200
++++ source/Irrlicht/CSceneManager.h	2006-09-16 12:15:45.000000000 +0200
+@@ -146,7 +146,7 @@
+ 
+ 		//! Adds a skydome scene node. A skydome is a large (half-) sphere with a
+ 		//! panoramic texture on it and is drawn around the camera position.
+-		virtual ISceneNode* CSceneManager::addSkyDomeSceneNode(video::ITexture* texture,
++		virtual ISceneNode* addSkyDomeSceneNode(video::ITexture* texture,
+ 			u32 horiRes, u32 vertRes, f64 texturePercentage,
+ 			f64 spherePercentage, ISceneNode* parent, s32 id);
+ 
diff --git a/dev-games/irrlicht/irrlicht-1.1.ebuild b/dev-games/irrlicht/irrlicht-1.1.ebuild
new file mode 100644
index 000000000000..e902b0b6cb09
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.1.ebuild,v 1.1 2006/09/16 11:29:59 tupone Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="open source high performance realtime 3D engine written in C++"
+HOMEPAGE="http://irrlicht.sourceforge.net/"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/Irrlicht
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}"/${P}
+	edos2unix source/Irrlicht/CSceneManager.h \
+		include/IrrCompileConfig.h
+	epatch "${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}/"${P}-config.patch
+	cd "${S}"
+
+	# stupid nvidia / xorg GL differences
+	# still needed - bug #114335
+	if echo -e '#include <GL/glx.h>\nglXGetProcAddress blah;' | \
+	   $(tc-getCC) -E - | \
+	   grep -q glXGetProcAddressARB
+	then
+		epatch "${FILESDIR}"/${PN}-0.12.0-opengl.patch
+	fi
+
+	# use the system zlib/jpeg/png
+	sed -i -r \
+		-e '/^CXXFLAGS/s:=:+=:' \
+		-e '/^ZLIBOBJ/d' \
+		-e '/^JPEGLIBOBJ/d' \
+		-e '/^LIBPNGOBJ/d' \
+		Makefile || die "sed objs"
+}
+
+src_install() {
+	cd ../..
+	dolib.a lib/Linux/libIrrlicht.a || die "dolib.a failed"
+	insinto /usr/include/${PN}
+	doins include/* || die "doins failed"
+	dodoc changes.txt readme.txt
+	if use doc ; then
+		cp -r examples media "${D}"/usr/share/doc/${PF}/ || die "cp failed"
+	fi
+}