From 763af2847eb522bdc6c0db1c587f7b559a490056 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Mon, 23 Jul 2007 19:50:02 +0000 Subject: Version bump, bug #184508 Package-Manager: portage-2.1.3_rc9 --- dev-games/irrlicht/ChangeLog | 9 +++- dev-games/irrlicht/Manifest | 36 ++++++++----- dev-games/irrlicht/files/digest-irrlicht-1.3.1 | 3 ++ .../irrlicht/files/irrlicht-0.14.0-gcc41.patch | 44 ---------------- .../irrlicht/files/irrlicht-1.3.1-config.patch | 26 ++++++++++ .../irrlicht/files/irrlicht-1.3.1-demoMake.patch | 20 ++++++++ dev-games/irrlicht/irrlicht-1.3.1.ebuild | 59 ++++++++++++++++++++++ 7 files changed, 140 insertions(+), 57 deletions(-) create mode 100644 dev-games/irrlicht/files/digest-irrlicht-1.3.1 delete mode 100644 dev-games/irrlicht/files/irrlicht-0.14.0-gcc41.patch create mode 100644 dev-games/irrlicht/files/irrlicht-1.3.1-config.patch create mode 100644 dev-games/irrlicht/files/irrlicht-1.3.1-demoMake.patch create mode 100644 dev-games/irrlicht/irrlicht-1.3.1.ebuild (limited to 'dev-games/irrlicht') diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog index 7767ba1f7674..83178e3d5b7e 100644 --- a/dev-games/irrlicht/ChangeLog +++ b/dev-games/irrlicht/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-games/irrlicht # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.21 2007/06/01 21:04:10 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.22 2007/07/23 19:50:02 nyhm Exp $ + +*irrlicht-1.3.1 (23 Jul 2007) + + 23 Jul 2007; Tristan Heaven + +files/irrlicht-1.3.1-config.patch, +files/irrlicht-1.3.1-demoMake.patch, + +irrlicht-1.3.1.ebuild: + Version bump, bug #184508 *irrlicht-1.3 (01 Jun 2007) diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest index c69d8b1e5eb7..1a4084191eeb 100644 --- a/dev-games/irrlicht/Manifest +++ b/dev-games/irrlicht/Manifest @@ -1,10 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX irrlicht-0.14.0-gcc41.patch 1836 RMD160 d637e9f49167e7b7cc79983556b2bec079de49d0 SHA1 eb3fe553f0bbb098a4d97c7f626d890b74eb69ca SHA256 e3005916b06c360d7e5cefcdac14cbaeb0d2021b1da6adbbe010efe5215d1505 -MD5 5182269be1187ffbd25e8461bf8866b1 files/irrlicht-0.14.0-gcc41.patch 1836 -RMD160 d637e9f49167e7b7cc79983556b2bec079de49d0 files/irrlicht-0.14.0-gcc41.patch 1836 -SHA256 e3005916b06c360d7e5cefcdac14cbaeb0d2021b1da6adbbe010efe5215d1505 files/irrlicht-0.14.0-gcc41.patch 1836 AUX irrlicht-1.2-config.patch 1357 RMD160 7735711727875a86798bc5aaded4a7446e4d3755 SHA1 69dd8e9324dac86861ba6f2bdfcd4c40668e9aa0 SHA256 cb31c5b0ddbdbcb1807f4d7c4c359d0735a940a2bc47b7e47094ce07997f0001 MD5 9878aefe6ae59a4a46ce7dce7dea9397 files/irrlicht-1.2-config.patch 1357 RMD160 7735711727875a86798bc5aaded4a7446e4d3755 files/irrlicht-1.2-config.patch 1357 @@ -29,20 +25,33 @@ AUX irrlicht-1.3-opengl.patch 655 RMD160 83a06521306cf177581f2e547a4b9b69ef79e20 MD5 482fcd4ab66e17c76273ec131a05920a files/irrlicht-1.3-opengl.patch 655 RMD160 83a06521306cf177581f2e547a4b9b69ef79e20b files/irrlicht-1.3-opengl.patch 655 SHA256 c97b3d5f857e31de24482cd72d92f6d3c9c1b4ddb2a8ff162411d5f684967865 files/irrlicht-1.3-opengl.patch 655 +AUX irrlicht-1.3.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9 +MD5 83ca02c06b0290ee512711be7c2eeb2a files/irrlicht-1.3.1-config.patch 1308 +RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e files/irrlicht-1.3.1-config.patch 1308 +SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9 files/irrlicht-1.3.1-config.patch 1308 +AUX irrlicht-1.3.1-demoMake.patch 682 RMD160 ff5673563dacff62ffd9acf9f1a172ee121894d9 SHA1 938e9d13705e963a9f23148e3af51f6177b396cb SHA256 15ac94dc4a3ff5203cccbc3bb396751a7f62c351511caf2755c13b94832889b6 +MD5 d10af66d45c7ad1859de2ca907ade6b8 files/irrlicht-1.3.1-demoMake.patch 682 +RMD160 ff5673563dacff62ffd9acf9f1a172ee121894d9 files/irrlicht-1.3.1-demoMake.patch 682 +SHA256 15ac94dc4a3ff5203cccbc3bb396751a7f62c351511caf2755c13b94832889b6 files/irrlicht-1.3.1-demoMake.patch 682 DIST irrlicht-1.2.zip 17278801 RMD160 248f66108d4ff64d17460397131afd80e3729ab4 SHA1 4cf33561f6c65d82302b1af1edba507372593fe4 SHA256 e89184273e35168011c533c1a61cd9a5a6547f76ca7eee08ee677793db55bc9b +DIST irrlicht-1.3.1.zip 16325880 RMD160 771d3e843483b6cb9d8e0e0664beeedb63d56773 SHA1 374e25a95de399ce6f7683d651a65827cf64a5ce SHA256 91f080776fbad55331ca793b25647def2ef66363eac0cf5fef619f3690044beb DIST irrlicht-1.3.zip 16473254 RMD160 947d9107d6dff012037ace9e12db78debfa08de4 SHA1 006c1f22912da345a9fe7b47da845b81e64a1fec SHA256 5370777c47c4311de21a8c71b2a302711364299b71f43d1e13d35ea2bc66cefe EBUILD irrlicht-1.2.ebuild 1695 RMD160 c196072b617dae1b74216dd7c09010c5904154b0 SHA1 94d9aefb0458594ad34072d9a9f59610b38c65ee SHA256 374d0a8b3d7a9b1273e5c5a794b6eab065a93e6037eb0c037111cf4642d51018 MD5 3a1b971872d04a399b4135277ea2e6ad irrlicht-1.2.ebuild 1695 RMD160 c196072b617dae1b74216dd7c09010c5904154b0 irrlicht-1.2.ebuild 1695 SHA256 374d0a8b3d7a9b1273e5c5a794b6eab065a93e6037eb0c037111cf4642d51018 irrlicht-1.2.ebuild 1695 +EBUILD irrlicht-1.3.1.ebuild 1349 RMD160 97bb61d0ee7a6a1bbf91e8c9420d54c0b769abef SHA1 a43bf48cd7520c9fda83411875949861b6d51b07 SHA256 cb3ebd9c934a88467a076b4e76a9006d58da7751d51b6d309e8eebf28d23ad73 +MD5 4c99c774cda0a39f33d7d80559c35510 irrlicht-1.3.1.ebuild 1349 +RMD160 97bb61d0ee7a6a1bbf91e8c9420d54c0b769abef irrlicht-1.3.1.ebuild 1349 +SHA256 cb3ebd9c934a88467a076b4e76a9006d58da7751d51b6d309e8eebf28d23ad73 irrlicht-1.3.1.ebuild 1349 EBUILD irrlicht-1.3.ebuild 1637 RMD160 35802d251070bd07a23a28c922aa49dd792e41b2 SHA1 6f8f1c9ed16d19a7bea3b98fe28775cd87282a7e SHA256 29d499873acf1adbb6cfc585b24ca7aeb077e854e8390293babb9f6133c339d8 MD5 b54971ece456fdfcf48d16fb15d9c489 irrlicht-1.3.ebuild 1637 RMD160 35802d251070bd07a23a28c922aa49dd792e41b2 irrlicht-1.3.ebuild 1637 SHA256 29d499873acf1adbb6cfc585b24ca7aeb077e854e8390293babb9f6133c339d8 irrlicht-1.3.ebuild 1637 -MISC ChangeLog 3852 RMD160 f4beb182637a77d5827577288f354ae514110aa9 SHA1 2d2f52dc0e3ae494f67f022aa952e11b19777fc6 SHA256 f752e4b75978cc89c4f3e1746faee7a26de605e80e6da2ae655b369ab52eecd8 -MD5 2a3cc7a6816e226d76f5ddc80415e919 ChangeLog 3852 -RMD160 f4beb182637a77d5827577288f354ae514110aa9 ChangeLog 3852 -SHA256 f752e4b75978cc89c4f3e1746faee7a26de605e80e6da2ae655b369ab52eecd8 ChangeLog 3852 +MISC ChangeLog 4062 RMD160 7ee6efce00823d3d3475d8892e8921e940c1f74a SHA1 ae45183151ce8d2b67101af33ea88be20f353552 SHA256 10027ec8b8f2b1a0da6a69ccccd39c1647a81af66d6214f2b7d5202430a04d70 +MD5 25d7151b172bf4ca71b5c4b89c2557f7 ChangeLog 4062 +RMD160 7ee6efce00823d3d3475d8892e8921e940c1f74a ChangeLog 4062 +SHA256 10027ec8b8f2b1a0da6a69ccccd39c1647a81af66d6214f2b7d5202430a04d70 ChangeLog 4062 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc MD5 ad41838cd74c70f9c72295bda4662786 metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a metadata.xml 790 @@ -53,10 +62,13 @@ SHA256 1050ed335e1f605e5f3ecab169b6b81a391ca640435382d05e7fc0ac39694631 files/di MD5 4dd897637b004af0b4bcc6891737e702 files/digest-irrlicht-1.3 235 RMD160 8374b9dbe877a4fc51fa26702ebea122c0943531 files/digest-irrlicht-1.3 235 SHA256 3eb01b6e8f89a7c8ab896b407522461b34ccc61e5960c68e2f42ad91e47fc84a files/digest-irrlicht-1.3 235 +MD5 eee200938e45716e6429d5ab7aee85ab files/digest-irrlicht-1.3.1 241 +RMD160 ed04a3591ad181314d301985e40d3bd5dfc49e51 files/digest-irrlicht-1.3.1 241 +SHA256 75301eefa4919bbd2bbd8437bb3c98c46e132470e686478733889192144cdb83 files/digest-irrlicht-1.3.1 241 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.4 (GNU/Linux) +Version: GnuPG v2.0.5 (GNU/Linux) -iD8DBQFGYInTdz7hIScOURERAr4bAKDwdMnitivQrXvLeX++hraOYwM0rwCgrEBj -vWJAdQd3bN13RgUV35wY2R0= -=Qs7j +iD8DBQFGpQZqdz7hIScOURERAsp+AKDYhTRGm42fl/8pKseOcWCi5fJcJwCgoGHP +cw4XWI8SLRHhp7JKKiT1NGY= +=agXr -----END PGP SIGNATURE----- diff --git a/dev-games/irrlicht/files/digest-irrlicht-1.3.1 b/dev-games/irrlicht/files/digest-irrlicht-1.3.1 new file mode 100644 index 000000000000..2808f44eed1b --- /dev/null +++ b/dev-games/irrlicht/files/digest-irrlicht-1.3.1 @@ -0,0 +1,3 @@ +MD5 939b21d5fa16d7d949e4ce0c23e0b4b0 irrlicht-1.3.1.zip 16325880 +RMD160 771d3e843483b6cb9d8e0e0664beeedb63d56773 irrlicht-1.3.1.zip 16325880 +SHA256 91f080776fbad55331ca793b25647def2ef66363eac0cf5fef619f3690044beb irrlicht-1.3.1.zip 16325880 diff --git a/dev-games/irrlicht/files/irrlicht-0.14.0-gcc41.patch b/dev-games/irrlicht/files/irrlicht-0.14.0-gcc41.patch deleted file mode 100644 index dd624fba7e4d..000000000000 --- a/dev-games/irrlicht/files/irrlicht-0.14.0-gcc41.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- include/matrix4.h.old 2006-03-17 14:49:10.894034456 +0100 -+++ include/matrix4.h 2006-03-17 14:53:27.969952976 +0100 -@@ -59,7 +59,7 @@ - void setTranslation( const vector3df& translation ); - - //! Gets the current translation -- vector3df matrix4::getTranslation() const; -+ vector3df getTranslation() const; - - //! Set the inverse translation of the current matrix. Will erase any previous values. - void setInverseTranslation( const vector3df& translation ); ---- include/quaternion.h.old 2006-03-17 14:49:10.894034456 +0100 -+++ include/quaternion.h 2006-03-17 14:53:42.701713408 +0100 -@@ -52,7 +52,7 @@ - quaternion& operator*=(f32 s); - - //! multiplication operator -- vector3df quaternion::operator* (const vector3df& v) const; -+ vector3df operator* (const vector3df& v) const; - - //! multiplication operator - quaternion& operator*=(const quaternion& other); ---- ../../include/matrix4.h.old 2006-03-17 14:48:29.901266304 +0100 -+++ ../../include/matrix4.h 2006-03-17 14:59:04.464797984 +0100 -@@ -59,7 +59,7 @@ - void setTranslation( const vector3df& translation ); - - //! Gets the current translation -- vector3df matrix4::getTranslation() const; -+ vector3df getTranslation() const; - - //! Set the inverse translation of the current matrix. Will erase any previous values. - void setInverseTranslation( const vector3df& translation ); ---- ../../include/quaternion.h.old 2006-03-17 14:48:33.810671984 +0100 -+++ ../../include/quaternion.h 2006-03-17 14:59:12.071641568 +0100 -@@ -52,7 +52,7 @@ - quaternion& operator*=(f32 s); - - //! multiplication operator -- vector3df quaternion::operator* (const vector3df& v) const; -+ vector3df operator* (const vector3df& v) const; - - //! multiplication operator - quaternion& operator*=(const quaternion& other); diff --git a/dev-games/irrlicht/files/irrlicht-1.3.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.3.1-config.patch new file mode 100644 index 000000000000..fbb1cab1ac7b --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.3.1-config.patch @@ -0,0 +1,26 @@ +--- include/IrrCompileConfig.h ++++ include/IrrCompileConfig.h +@@ -113,7 +113,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. +@@ -124,7 +123,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. +@@ -135,7 +133,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.3.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.3.1-demoMake.patch new file mode 100644 index 000000000000..055a9b496a7e --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.3.1-demoMake.patch @@ -0,0 +1,20 @@ +--- examples/Demo/Makefile ++++ examples/Demo/Makefile +@@ -2,7 +2,7 @@ + Target = Demo + Sources = CDemo.cpp CMainMenu.cpp main.cpp + +-CPPFLAGS = -I../../include -I/usr/X11R6/include ++CPPFLAGS = -I/usr/include/irrlicht + CXXFLAGS = -O3 -ffast-math + + ifeq ($(HOSTTYPE), x86_64) +@@ -13,7 +13,7 @@ + + # target specific settings + all_linux: SYSTEM=Linux +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 ++all_linux: LDFLAGS = -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 -lpng -ljpeg + + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm diff --git a/dev-games/irrlicht/irrlicht-1.3.1.ebuild b/dev-games/irrlicht/irrlicht-1.3.1.ebuild new file mode 100644 index 000000000000..1bc08559ab91 --- /dev/null +++ b/dev-games/irrlicht/irrlicht-1.3.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.3.1.ebuild,v 1.1 2007/07/23 19:50:02 nyhm Exp $ + +inherit eutils + +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 ${P} + epatch \ + "${FILESDIR}"/${P}-config.patch \ + "${FILESDIR}"/${P}-demoMake.patch + + cd "${S}" + sed -i \ + -e '/^CXXFLAGS/s:=:+=:' \ + -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \ + -e '/^ZLIBOBJ/d' \ + -e '/^JPEGLIBOBJ/d' \ + -e '/^LIBPNGOBJ/d' \ + Makefile || die "sed failed" +} + +src_compile() { + emake CXX="$(tc-getCXX)" || die "emake 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 +} -- cgit v1.2.3-65-gdbad