Version bump

(Portage version: 2.1.2_rc2-r5)

5 files changed, 120 insertions, 1 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index d7a8515d37b4..b8ecd6d19058 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2006/10/14 11:29:13 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.20 2006/12/06 19:41:20 nyhm Exp $
+
+*irrlicht-1.2 (06 Dec 2006)
+
+  06 Dec 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/irrlicht-1.2-config.patch, +files/irrlicht-1.2-demoMake.patch,
+  +irrlicht-1.2.ebuild:
+  Version bump
 
 *irrlicht-1.1-r1 (14 Oct 2006)
 
diff --git a/dev-games/irrlicht/files/digest-irrlicht-1.2 b/dev-games/irrlicht/files/digest-irrlicht-1.2
new file mode 100644
index 000000000000..1fc86f002543
--- /dev/null
+++ b/dev-games/irrlicht/files/digest-irrlicht-1.2
@@ -0,0 +1,3 @@
+MD5 caf1d610d1268ab2f9e53e45c7349bf8 irrlicht-1.2.zip 17278801
+RMD160 248f66108d4ff64d17460397131afd80e3729ab4 irrlicht-1.2.zip 17278801
+SHA256 e89184273e35168011c533c1a61cd9a5a6547f76ca7eee08ee677793db55bc9b irrlicht-1.2.zip 17278801
diff --git a/dev-games/irrlicht/files/irrlicht-1.2-config.patch b/dev-games/irrlicht/files/irrlicht-1.2-config.patch
new file mode 100644
index 000000000000..e6ba8795f0d6
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.2-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.2-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.2-demoMake.patch
new file mode 100644
index 000000000000..56de8ca5c8e8
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.2-demoMake.patch
@@ -0,0 +1,14 @@
+--- ../../examples/Demo/Makefile.old	2006-10-14 13:06:42.000000000 +0200
++++ ../../examples/Demo/Makefile	2006-10-14 13:08:32.000000000 +0200
+@@ -2,9 +2,9 @@
+ # Handwritten by me, made with Kate. So it is far from being perfect. :)
+ 
+ CXX = g++
+-CPPFLAGS = -I"../../include" -I"/usr/X11R6/include"
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+-LDFLAGS = -L"/usr/X11R6/lib" -L"../../lib/Linux" -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
++LDFLAGS = -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 -lpng -ljpeg
+ # if you enable sound add the proper library for linking
+ # -laudiere
+ # -lSDL_mixer -lSDL
diff --git a/dev-games/irrlicht/irrlicht-1.2.ebuild b/dev-games/irrlicht/irrlicht-1.2.ebuild
new file mode 100644
index 000000000000..d5693e46e432
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.2.ebuild
@@ -0,0 +1,69 @@
+# 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.2.ebuild,v 1.1 2006/12/06 19:41:20 nyhm 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/${PN}/${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	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 include/IrrCompileConfig.h
+	epatch "${FILESDIR}"/${P}-config.patch
+
+	cd "${S}"
+	edos2unix ../../examples/Demo/Makefile
+	epatch "${FILESDIR}"/${P}-demoMake.patch
+
+	# 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 \
+		-e "/^CXX/s:g++:$(tc-getCXX):" \
+		-e '/^CXXFLAGS/s:=:+=:' \
+		-e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
+		-e '/^ZLIBOBJ/d' \
+		-e '/^JPEGLIBOBJ/d' \
+		-e '/^LIBPNGOBJ/d' \
+		Makefile || die "sed failed"
+}
+
+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
+		insinto /usr/share/doc/${PF}
+		doins -r examples media || die "doins failed"
+	fi
+}