Fix jpeg library mismatch and demo Makefile. Bug #148593

Package-Manager: portage-2.1.1

6 files changed, 139 insertions, 8 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 1d83c41ace06..d7a8515d37b4 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.18 2006/09/16 11:29:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.19 2006/10/14 11:29:13 tupone Exp $
+
+*irrlicht-1.1-r1 (14 Oct 2006)
+
+  14 Oct 2006; <tupone@gentoo.org> +files/irrlicht-1.1-demoMake.patch,
+  +files/irrlicht-1.1-jpeg.patch, +irrlicht-1.1-r1.ebuild:
+  Fix jpeg library mismatch and demo Makefile. Bug #148593 by Jesper Saxtorph
 
 *irrlicht-1.1 (16 Sep 2006)
 
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index c9796fd79900..e53537d645ad 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -17,24 +17,36 @@ AUX irrlicht-1.1-config.patch 1357 RMD160 7735711727875a86798bc5aaded4a7446e4d37
 MD5 9878aefe6ae59a4a46ce7dce7dea9397 files/irrlicht-1.1-config.patch 1357
 RMD160 7735711727875a86798bc5aaded4a7446e4d3755 files/irrlicht-1.1-config.patch 1357
 SHA256 cb31c5b0ddbdbcb1807f4d7c4c359d0735a940a2bc47b7e47094ce07997f0001 files/irrlicht-1.1-config.patch 1357
+AUX irrlicht-1.1-demoMake.patch 618 RMD160 4a03562b6f5f51fd9abca0b02e1a095586b98263 SHA1 01d9c74bc850ab8a72332e40525a5802273fd805 SHA256 2b9716074de8e076844275b431f1665d3c356636363cf6c8cc082d5ece2895ad
+MD5 a25c8198150e065c6c7ab7f66eceeb49 files/irrlicht-1.1-demoMake.patch 618
+RMD160 4a03562b6f5f51fd9abca0b02e1a095586b98263 files/irrlicht-1.1-demoMake.patch 618
+SHA256 2b9716074de8e076844275b431f1665d3c356636363cf6c8cc082d5ece2895ad files/irrlicht-1.1-demoMake.patch 618
 AUX irrlicht-1.1-gcc41.patch 582 RMD160 1439d463d357d565c45ab4fd03e4c53316b135b2 SHA1 3cd7e12fbaeef7510be171e6c335fbc6cfa75df2 SHA256 4e916f9f045a51bd1daffadab7fdd1a8e56acd620bb518d34f358ad728e85b39
 MD5 a7430c7f875f432d336c73fa136834dd files/irrlicht-1.1-gcc41.patch 582
 RMD160 1439d463d357d565c45ab4fd03e4c53316b135b2 files/irrlicht-1.1-gcc41.patch 582
 SHA256 4e916f9f045a51bd1daffadab7fdd1a8e56acd620bb518d34f358ad728e85b39 files/irrlicht-1.1-gcc41.patch 582
+AUX irrlicht-1.1-jpeg.patch 706 RMD160 574599882d16de0db72b01ad21a495c29e680cf5 SHA1 d67fcfb40a6b0e23207ae56cad5125ab1952a789 SHA256 a24eb235b390af6db2d893891b383f1d98510f79cbb5e39775e9d2e77599710f
+MD5 4e49e2e5b984311f091ad42d1b68ed79 files/irrlicht-1.1-jpeg.patch 706
+RMD160 574599882d16de0db72b01ad21a495c29e680cf5 files/irrlicht-1.1-jpeg.patch 706
+SHA256 a24eb235b390af6db2d893891b383f1d98510f79cbb5e39775e9d2e77599710f files/irrlicht-1.1-jpeg.patch 706
 DIST irrlicht-0.14.0.zip 13925328 RMD160 6c2abb7822a2fdb0b360983a5ad8094f7bd77eb5 SHA1 1d77e5b6e4bfe4edee1e808e9f07f3a414bd3bd9 SHA256 5b8c2424463cec711298edb77e25f021a11ac09950e085ebaeb8db546421dd97
 DIST irrlicht-1.1.zip 15647723 RMD160 1469ade750699b12244e0f38ea07e6a4314e696c SHA1 63190a3cf04e7a52998992adec409531a2fd114a SHA256 6ef74629d33b4f2cb2faa91d81cbd0f591ebce620ebfae8e4fd3fb71f1137f19
 EBUILD irrlicht-0.14.0.ebuild 2220 RMD160 a2256ccfc898644a681fadf3c280cde8bbebc3d7 SHA1 0d36673818552c9cd498e7971612e5bd2dcc663b SHA256 00974ffd44a6f6d28c5df3914c7ab116446956e7e058b9150e61a330be3d807a
 MD5 98ab80734a6b0565651c619e7fdd8c72 irrlicht-0.14.0.ebuild 2220
 RMD160 a2256ccfc898644a681fadf3c280cde8bbebc3d7 irrlicht-0.14.0.ebuild 2220
 SHA256 00974ffd44a6f6d28c5df3914c7ab116446956e7e058b9150e61a330be3d807a irrlicht-0.14.0.ebuild 2220
+EBUILD irrlicht-1.1-r1.ebuild 1836 RMD160 ff8e1712c678653362ebbc0ad1b8bfd8283e5de1 SHA1 75eb0cd254c377d570f21ed638f665ab36b3f4c7 SHA256 fc85c16be2f45d03f79d6f723ee7f96f3417c2b44dba38e7c9debf6568dc3809
+MD5 c0be65fc82dd4d9ca452f6e8eec1489b irrlicht-1.1-r1.ebuild 1836
+RMD160 ff8e1712c678653362ebbc0ad1b8bfd8283e5de1 irrlicht-1.1-r1.ebuild 1836
+SHA256 fc85c16be2f45d03f79d6f723ee7f96f3417c2b44dba38e7c9debf6568dc3809 irrlicht-1.1-r1.ebuild 1836
 EBUILD irrlicht-1.1.ebuild 1621 RMD160 7e9460c668a35831fdd1521045bcf037ff50e4af SHA1 eba00e7576d416880105538e78388c530e0189ff SHA256 2a2c480d174ce0f5a38575e2c8d7efd8a4d752089a1c19d2a8c0f561189513d2
 MD5 0a7c63b9d2e717af2099a1f8d1aeb61b irrlicht-1.1.ebuild 1621
 RMD160 7e9460c668a35831fdd1521045bcf037ff50e4af irrlicht-1.1.ebuild 1621
 SHA256 2a2c480d174ce0f5a38575e2c8d7efd8a4d752089a1c19d2a8c0f561189513d2 irrlicht-1.1.ebuild 1621
-MISC ChangeLog 3188 RMD160 79c89ac8c45304e805432033ebd5a0b6cdfd57ba SHA1 5a7d750592a6982f67e21cec3718e34c79f259fd SHA256 2cd235c340c88990ec9b09212e443e077fef7b6a72369aa288df123fb11408ed
-MD5 4057877fb6d507bfeef369277e428316 ChangeLog 3188
-RMD160 79c89ac8c45304e805432033ebd5a0b6cdfd57ba ChangeLog 3188
-SHA256 2cd235c340c88990ec9b09212e443e077fef7b6a72369aa288df123fb11408ed ChangeLog 3188
+MISC ChangeLog 3429 RMD160 0ac6ceaf21a2d22df3fa5074bf1d51e31b4bd38e SHA1 f46bb423de4f3f3853dfca672f95fca474c7b03c SHA256 3cd24e7a1dec5393ce503167737fb0b796657e9fab4368629477261a33e75d66
+MD5 dcd3dc8ff09960ca2797b8d814fc77fa ChangeLog 3429
+RMD160 0ac6ceaf21a2d22df3fa5074bf1d51e31b4bd38e ChangeLog 3429
+SHA256 3cd24e7a1dec5393ce503167737fb0b796657e9fab4368629477261a33e75d66 ChangeLog 3429
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
 MD5 ad41838cd74c70f9c72295bda4662786 metadata.xml 790
 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a metadata.xml 790
@@ -45,10 +57,13 @@ SHA256 18454d48aa533cbe66ea93acbc6adabe86f361ea07263185f6165de48716353a files/di
 MD5 80763a673fb7e778c220baaa5bc0cf6d files/digest-irrlicht-1.1 235
 RMD160 31441437239c94f40ad85390f945933a5f7016c7 files/digest-irrlicht-1.1 235
 SHA256 29a07f4de557b88f5f885cad68cfff10025eb61b95b007c1fc8cede6895b475e files/digest-irrlicht-1.1 235
+MD5 80763a673fb7e778c220baaa5bc0cf6d files/digest-irrlicht-1.1-r1 235
+RMD160 31441437239c94f40ad85390f945933a5f7016c7 files/digest-irrlicht-1.1-r1 235
+SHA256 29a07f4de557b88f5f885cad68cfff10025eb61b95b007c1fc8cede6895b475e files/digest-irrlicht-1.1-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFC+BK2CTtIKiFlQIRAh4yAJ9NwkRxOXUKx7QpO1UB+emTc9+wagCfWOpd
-KZw+hv9t8AiUEpPONZeJKv8=
-=Qy8r
+iD8DBQFFMMoXbfN2jvlVAhwRAhpfAJ4k4e78Z1L0F/0nSWD8BFWdoVwhpQCfXgyD
+wfcw06NBSU7nN0ic+bh/Qxw=
+=4Min
 -----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/digest-irrlicht-1.1-r1 b/dev-games/irrlicht/files/digest-irrlicht-1.1-r1
new file mode 100644
index 000000000000..905f5ed5b361
--- /dev/null
+++ b/dev-games/irrlicht/files/digest-irrlicht-1.1-r1
@@ -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-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.1-demoMake.patch
new file mode 100644
index 000000000000..56de8ca5c8e8
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.1-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/files/irrlicht-1.1-jpeg.patch b/dev-games/irrlicht/files/irrlicht-1.1-jpeg.patch
new file mode 100644
index 000000000000..0097aa28839c
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.1-jpeg.patch
@@ -0,0 +1,21 @@
+--- CImageLoaderJPG.h.old	2006-10-14 12:18:56.000000000 +0200
++++ CImageLoaderJPG.h	2006-10-14 12:19:55.000000000 +0200
+@@ -12,8 +12,6 @@
+ #include "IrrCompileConfig.h"
+ #ifdef _IRR_COMPILE_WITH_LIBJPEG_
+ extern "C" {
+-	#include "jpeglib/jconfig.h"
+-	#define JCONFIG_INCLUDED
+ 	#ifndef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ 	#include <jpeglib.h> // use system lib
+ 	#else  // _IRR_USE_NON_SYSTEM_JPEG_LIB_
+--- CImageWriterJPG.cpp.old	2006-10-14 12:20:14.000000000 +0200
++++ CImageWriterJPG.cpp	2006-10-14 12:20:35.000000000 +0200
+@@ -10,7 +10,6 @@
+ #ifdef _IRR_COMPILE_WITH_LIBJPEG_
+ extern "C"
+ {
+-	#include "jpeglib/jconfig.h"
+ #ifndef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ 	#include <jpeglib.h>
+ 	#include <jerror.h>
diff --git a/dev-games/irrlicht/irrlicht-1.1-r1.ebuild b/dev-games/irrlicht/irrlicht-1.1-r1.ebuild
new file mode 100644
index 000000000000..bdb7ad2b5134
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.1-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-r1.ebuild,v 1.1 2006/10/14 11:29:13 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}"
+
+	edos2unix CImageLoaderJPG.h \
+		CImageWriterJPG.cpp \
+		../../examples/Demo/Makefile
+	epatch "${FILESDIR}/"${P}-jpeg.patch \
+		"${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 -r \
+		-e '/^CXXFLAGS/s:=:+=:' \
+		-e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
+		-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
+}