Version bump, bug #184508

(Portage version: 2.1.3_rc9)

4 files changed, 49 insertions, 44 deletions

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