dev-games/irrlicht: Revert d9c9e77a1d01ba8ef834d036f5b9e9e4110596aa.

Package-Manager: portage-2.2.28

diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index cfe019b0f8f38a6585a949582a6c13d38d5cc5f1..2ddd5afe14866424fdcc42b998e96ff97a7d9175 100644 (file)
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,2 +1 @@
 DIST irrlicht-1.8.1.zip 24167632 SHA256 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb WHIRLPOOL c66f0a15575327667cbe82c79919518771e55d5e919c972e64e104a6272b78a20bbb7bbba864722dead4248fb43dd722227181d696eb63e82b4093aaadac132b
-DIST irrlicht-1.8.4.zip 27927144 SHA256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 WHIRLPOOL a5fecbd27968fbd4a5b17b9528388ec0870d1c3ceb85e36bbab40ce30aa61c7f2f387df160808dbaafa4488abeaf238c7cf93994b380a1b2c3a8a5c421949be1

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
deleted file mode 100644 (file)
index 0c51ffe..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- irrlicht-1.8.4/include/IrrCompileConfig.h
-+++ irrlicht-1.8.4/include/IrrCompileConfig.h
-@@ -245,7 +245,7 @@
- //! 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_USE_NON_SYSTEM_JPEG_LIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
- #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
- #endif
-@@ -261,7 +261,7 @@
- //! 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_USE_NON_SYSTEM_LIB_PNG_
- #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
- #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
- #endif
-@@ -598,7 +598,7 @@
- /** If this is commented out, Irrlicht will try to compile using the zlib
- installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
- defined. */
--#define _IRR_USE_NON_SYSTEM_ZLIB_
-+//#define _IRR_USE_NON_SYSTEM_ZLIB_
- #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
- #undef _IRR_USE_NON_SYSTEM_ZLIB_
- #endif

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
deleted file mode 100644 (file)
index f4aa165..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
+++ /dev/null
@@ -1,764 +0,0 @@
---- irrlicht-1.8.4/examples/Demo/Makefile
-+++ irrlicht-1.8.4/examples/Demo/Makefile
-@@ -2,8 +2,9 @@\r
- Target = Demo\r
- Sources = CDemo.cpp CMainMenu.cpp main.cpp\r
- \r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -Wall -O3 -ffast-math\r
-+CXXFLAGS ?= -O3\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS += -Wall -ffast-math\r
- \r
- ifeq ($(HOSTTYPE), x86_64)\r
- LIBSELECT=64\r
-@@ -13,7 +14,7 @@\r
- \r
- # target specific settings\r
- all_linux: SYSTEM=Linux\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- \r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm\r
---- irrlicht-1.8.4/examples/14.Win32Window/Makefile
-+++ irrlicht-1.8.4/examples/14.Win32Window/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
-+++ irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht \r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
-+++ irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/08.SpecialFX/Makefile
-+++ irrlicht-1.8.4/examples/08.SpecialFX/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/06.2DGraphics/Makefile
-+++ irrlicht-1.8.4/examples/06.2DGraphics/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/04.Movement/Makefile
-+++ irrlicht-1.8.4/examples/04.Movement/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,14 +18,14 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
-+++ irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
-+++ irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/02.Quake3Map/Makefile
-+++ irrlicht-1.8.4/examples/02.Quake3Map/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,7 +18,7 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht\r
- static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm\r
-@@ -25,7 +25,7 @@\r
- static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc\r
- static_win32 all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32 static_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
-+++ irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
-@@ -5,9 +5,10 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
- #CXXFLAGS = -O3 -ffast-math\r
--CXXFLAGS = -g -Wall\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -Wall\r
- \r
- #default target is Linux\r
- all: all_linux\r
-@@ -17,14 +18,14 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
-+++ irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/10.Shaders/Makefile
-+++ irrlicht-1.8.4/examples/10.Shaders/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/09.Meshviewer/Makefile
-+++ irrlicht-1.8.4/examples/09.Meshviewer/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS +=  -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
-+++ irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
-@@ -5,9 +5,10 @@\r
- Sources = main.cpp sound.cpp q3factory.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
- #CXXFLAGS = -O3 -ffast-math\r
-+CXXFLAGS ?= -O3\r
--CXXFLAGS = -g -Wall\r
-+CXXFLAGS += -Wall\r
- \r
- #default target is Linux\r
- all: all_linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
-+++ irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/20.ManagedLights/Makefile
-+++ irrlicht-1.8.4/examples/20.ManagedLights/Makefile
-@@ -5,9 +5,10 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
- #CXXFLAGS = -O3 -ffast-math\r
-+CXXFLAGS ?= -O3\r
--CXXFLAGS = -g -Wall\r
-+CXXFLAGS += -Wall\r
- \r
- #default target is Linux\r
- all: all_linux\r
-@@ -17,14 +18,14 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/05.UserInterface/Makefile
-+++ irrlicht-1.8.4/examples/05.UserInterface/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/01.HelloWorld/Makefile
-+++ irrlicht-1.8.4/examples/01.HelloWorld/Makefile
-@@ -7,15 +7,15 @@\r
- # List of source files, separated by spaces\r
- Sources := main.cpp\r
- # Path to Irrlicht directory, should contain include/ and lib/\r
--IrrlichtHome := ../..\r
-+IrrlichtHome := /usr\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r
--BinPath = ../../bin/$(SYSTEM)\r
-+BinPath = ../../bin\r
- \r
- # general compiler settings (might need to be set when compiling the lib, too)\r
- # preprocessor flags, e.g. defines and include paths\r
- USERCPPFLAGS = \r
- # compiler flags such as optimization flags\r
--USERCXXFLAGS = -O3 -ffast-math\r
-+USERCXXFLAGS = -ffast-math\r
- #USERCXXFLAGS = -g -Wall\r
- # linker flags such as additional libraries and link paths\r
- USERLDFLAGS =\r
-@@ -24,16 +24,17 @@\r
- #no changes necessary below this line\r
- ####\r
- \r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r
--CXXFLAGS = $(USERCXXFLAGS)\r
--LDFLAGS = $(USERLDFLAGS)\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += $(USERCXXFLAGS)\r
-+LDFLAGS += $(USERLDFLAGS)\r
- \r
- #default target is Linux\r
- all: all_linux\r
- \r
- # target specific settings\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32 static_win32: SUF=.exe\r
---- irrlicht-1.8.4/examples/18.SplitScreen/Makefile
-+++ irrlicht-1.8.4/examples/18.SplitScreen/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/07.Collision/Makefile
-+++ irrlicht-1.8.4/examples/07.Collision/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,13 +18,13 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r
---- irrlicht-1.8.4/examples/24.CursorControl/Makefile
-+++ irrlicht-1.8.4/examples/24.CursorControl/Makefile
-@@ -7,15 +7,15 @@\r
- # List of source files, separated by spaces\r
- Sources := main.cpp\r
- # Path to Irrlicht directory, should contain include/ and lib/\r
--IrrlichtHome := ../..\r
-+IrrlichtHome := /usr\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r
--BinPath = ../../bin/$(SYSTEM)\r
-+BinPath = ../../bin\r
- \r
- # general compiler settings (might need to be set when compiling the lib, too)\r
- # preprocessor flags, e.g. defines and include paths\r
- USERCPPFLAGS = \r
- # compiler flags such as optimization flags\r
--USERCXXFLAGS = -O3 -ffast-math\r
-+USERCXXFLAGS = -ffast-math\r
- #USERCXXFLAGS = -g -Wall\r
- # linker flags such as additional libraries and link paths\r
- USERLDFLAGS =\r
-@@ -24,16 +24,17 @@\r
- #no changes necessary below this line\r
- ####\r
- \r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r
--CXXFLAGS = $(USERCXXFLAGS)\r
--LDFLAGS = $(USERLDFLAGS)\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += $(USERCXXFLAGS)\r
-+LDFLAGS += $(USERLDFLAGS)\r
- \r
- #default target is Linux\r
- all: all_linux\r
- \r
- # target specific settings\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32 static_win32: SUF=.exe\r
---- irrlicht-1.8.4/examples/25.XmlHandling/Makefile
-+++ irrlicht-1.8.4/examples/25.XmlHandling/Makefile
-@@ -7,15 +7,15 @@\r
- # List of source files, separated by spaces\r
- Sources := main.cpp\r
- # Path to Irrlicht directory, should contain include/ and lib/\r
--IrrlichtHome := ../..\r
-+IrrlichtHome := /usr\r
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems\r
--BinPath = ../../bin/$(SYSTEM)\r
-+BinPath = ../../bin\r
- \r
- # general compiler settings (might need to be set when compiling the lib, too)\r
- # preprocessor flags, e.g. defines and include paths\r
- USERCPPFLAGS = \r
- # compiler flags such as optimization flags\r
--USERCXXFLAGS = -O3 -ffast-math\r
-+USERCXXFLAGS = -ffast-math\r
- #USERCXXFLAGS = -g -Wall\r
- # linker flags such as additional libraries and link paths\r
- USERLDFLAGS =\r
-@@ -24,16 +24,17 @@\r
- #no changes necessary below this line\r
- ####\r
- \r
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)\r
--CXXFLAGS = $(USERCXXFLAGS)\r
--LDFLAGS = $(USERLDFLAGS)\r
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += $(USERCXXFLAGS)\r
-+LDFLAGS += $(USERLDFLAGS)\r
- \r
- #default target is Linux\r
- all: all_linux\r
- \r
- # target specific settings\r
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht\r
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht\r
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32 static_win32: SUF=.exe\r
---- irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
-+++ irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
-@@ -5,8 +5,9 @@\r
- Sources = main.cpp\r
- \r
- # general compiler settings\r
--CPPFLAGS = -I../../include -I/usr/X11R6/include\r
--CXXFLAGS = -O3 -ffast-math\r
-+CPPFLAGS += -I/usr/include/irrlicht\r
-+CXXFLAGS ?= -O3\r
-+CXXFLAGS += -ffast-math\r
- #CXXFLAGS = -g -Wall\r
- \r
- #default target is Linux\r
-@@ -17,14 +18,14 @@\r
- endif\r
- \r
- # target specific settings\r
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor\r
-+all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg\r
- all_linux clean_linux: SYSTEM=Linux\r
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm\r
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL\r
- all_win32 clean_win32: SYSTEM=Win32-gcc\r
- all_win32 clean_win32: SUF=.exe\r
- # name of the binary - only valid for targets which set SYSTEM\r
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)\r
-+DESTPATH = ../../bin/$(Target)$(SUF)\r
- \r
- all_linux all_win32:\r
-       $(warning Building...)\r

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
deleted file mode 100644 (file)
index c243d64..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- irrlicht-1.8.4/source/Irrlicht/Makefile
-+++ irrlicht-1.8.4/source/Irrlicht/Makefile
-@@ -46,11 +46,7 @@
- IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o\r
- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o\r
- IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o\r
--ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o\r
--JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o\r
--LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o\r
- LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o\r
--BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o\r
- \r
- # Next variable is for additional scene nodes etc. of customized Irrlicht versions\r
- EXTRAOBJ =\r
-@@ -61,18 +57,16 @@
- \r
- ###############\r
- #Compiler flags\r
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng\r
-+CXXINCS = -I../../include\r
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1\r
--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing\r
-+CXXFLAGS += -Wall -fno-exceptions -fno-rtti\r
- ifndef NDEBUG\r
--CXXFLAGS += -g -D_DEBUG\r
--else\r
--CXXFLAGS += -fexpensive-optimizations -O3\r
-+CXXFLAGS += -D_DEBUG\r
- endif\r
- ifdef PROFILE\r
- CXXFLAGS += -pg\r
- endif\r
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES\r
-+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES\r
- \r
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC\r
- sharedlib sharedlib_osx: CFLAGS += -fPIC\r
-@@ -88,7 +82,7 @@
- LIB_PATH = ../../lib/$(SYSTEM)\r
- INSTALL_DIR = /usr/local/lib\r
- sharedlib install: SHARED_LIB = libIrrlicht.so\r
--sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm\r
-+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz\r
- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include\r
- \r
- #OSX specific options\r

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
deleted file mode 100644 (file)
index 6036ea3..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=520746
-
-http://code.metager.de/source/diff/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp?r2=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404823&r1=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404320
-
---- irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
-+++ irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp
-@@ -66,7 +66,7 @@
- boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
- {
-       // DO NOTHING
--      return 1;
-+      return TRUE;
- }
- 
- 

diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
deleted file mode 100644 (file)
index 9f9e240..0000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001
-From: hiker <henrichsjoerg@mgail.com>
-Date: Wed, 26 Feb 2014 11:13:03 +1100
-Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation
- problems.
-
---- irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
-+++ irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h
-@@ -21,6 +21,7 @@
-       #endif
-       #include <GL/gl.h>
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+              typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-               #include "glext.h"
-       #endif
-       #include "wglext.h"
-@@ -35,6 +36,7 @@
-       #endif
-       #include <OpenGL/gl.h>
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+              typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-               #include "glext.h"
-       #endif
- #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
-@@ -48,6 +50,7 @@
-       #define NO_SDL_GLEXT
-       #include <SDL/SDL_video.h>
-       #include <SDL/SDL_opengl.h>
-+      typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-       #include "glext.h"
- #else
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-@@ -60,6 +63,7 @@
-       #include <GL/gl.h>
-       #include <GL/glx.h>
-       #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-+      typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-       #include "glext.h"
-       #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
-       #include "glxext.h"

diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
deleted file mode 100644 (file)
index fa018e3..0000000
--- a/dev-games/irrlicht/irrlicht-1.8.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-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="debug doc static-libs"
-
-RDEPEND="virtual/jpeg:0
-       media-libs/libpng:0=
-       app-arch/bzip2
-       sys-libs/zlib
-       virtual/opengl
-       x11-libs/libX11
-       x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-       app-arch/unzip
-       x11-proto/xproto
-       x11-proto/xf86vidmodeproto"
-
-S=${WORKDIR}/${P}/source/${PN^}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch
-       "${FILESDIR}"/${P}-config.patch
-       "${FILESDIR}"/${P}-demoMake.patch
-       "${FILESDIR}"/${P}-mesa-10.x.patch
-       "${FILESDIR}"/${P}-jpeg-9a.patch )
-
-DOCS=( changes.txt readme.txt )
-
-src_prepare() {
-       cd "${WORKDIR}"/${P} || die
-       edos2unix include/IrrCompileConfig.h
-       sed -i \
-               -e 's:\.\./\.\./media:../media:g' \
-               $(grep -rl '\.\./\.\./media' examples) \
-               || die 'sed failed'
-       default
-}
-
-src_compile() {
-       tc-export CXX CC AR
-       emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "")
-}
-
-src_install() {
-       cd "${WORKDIR}"/${P} || die
-
-       use static-libs && dolib.a lib/Linux/libIrrlicht.a
-       dolib.so lib/Linux/libIrrlicht.so*
-
-       # create library symlinks
-       dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8
-       dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so
-
-       insinto /usr/include/${PN}
-       doins include/*
-
-       einstalldocs
-
-       # don't do these with einstalldocs because they shouldn't be compressed
-       if use doc ; then
-               insinto /usr/share/doc/${PF}
-               doins -r examples media
-       fi
-}