* [gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
@ 2016-09-09 13:32 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-09-09 13:32 UTC (permalink / raw
To: gentoo-commits
commit: d9c9e77a1d01ba8ef834d036f5b9e9e4110596aa
Author: Christopher Head <chead <AT> chead <DOT> ca>
AuthorDate: Sun Sep 4 06:01:02 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 13:31:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c9e77a
dev-games/irrlicht: version bump to 1.8.4.
Also upgrade to EAPI 6.
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2213
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-games/irrlicht/Manifest | 1 +
.../irrlicht/files/irrlicht-1.8.4-config.patch | 29 +
.../irrlicht/files/irrlicht-1.8.4-demoMake.patch | 764 +++++++++++++++++++++
.../irrlicht/files/irrlicht-1.8.4-gentoo.patch | 46 ++
.../irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch | 15 +
.../irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch | 40 ++
dev-games/irrlicht/irrlicht-1.8.4.ebuild | 74 ++
7 files changed, 969 insertions(+)
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 2ddd5af..cfe019b 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1 +1,2 @@
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
new file mode 100644
index 00000000..0c51ffe
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
@@ -0,0 +1,29 @@
+--- 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
new file mode 100644
index 00000000..f4aa165
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch
@@ -0,0 +1,764 @@
+--- irrlicht-1.8.4/examples/Demo/Makefile
++++ irrlicht-1.8.4/examples/Demo/Makefile
+@@ -2,8 +2,9 @@
+ Target = Demo
+ Sources = CDemo.cpp CMainMenu.cpp main.cpp
+
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -Wall -O3 -ffast-math
++CXXFLAGS ?= -O3
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS += -Wall -ffast-math
+
+ ifeq ($(HOSTTYPE), x86_64)
+ LIBSELECT=64
+@@ -13,7 +14,7 @@
+
+ # target specific settings
+ all_linux: SYSTEM=Linux
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
+--- irrlicht-1.8.4/examples/14.Win32Window/Makefile
++++ irrlicht-1.8.4/examples/14.Win32Window/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
++++ irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
++++ irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/08.SpecialFX/Makefile
++++ irrlicht-1.8.4/examples/08.SpecialFX/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/06.2DGraphics/Makefile
++++ irrlicht-1.8.4/examples/06.2DGraphics/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/04.Movement/Makefile
++++ irrlicht-1.8.4/examples/04.Movement/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,14 +18,14 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
++++ irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
++++ irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/02.Quake3Map/Makefile
++++ irrlicht-1.8.4/examples/02.Quake3Map/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,7 +18,7 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
+ static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
+@@ -25,7 +25,7 @@
+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc
+ static_win32 all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32 static_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
++++ irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
+-CXXFLAGS = -g -Wall
++CXXFLAGS ?= -O3
++CXXFLAGS += -Wall
+
+ #default target is Linux
+ all: all_linux
+@@ -17,14 +18,14 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
++++ irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/10.Shaders/Makefile
++++ irrlicht-1.8.4/examples/10.Shaders/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/09.Meshviewer/Makefile
++++ irrlicht-1.8.4/examples/09.Meshviewer/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
++++ irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp sound.cpp q3factory.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
++CXXFLAGS ?= -O3
+-CXXFLAGS = -g -Wall
++CXXFLAGS += -Wall
+
+ #default target is Linux
+ all: all_linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
++++ irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/20.ManagedLights/Makefile
++++ irrlicht-1.8.4/examples/20.ManagedLights/Makefile
+@@ -5,9 +5,10 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS += -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
++CXXFLAGS ?= -O3
+-CXXFLAGS = -g -Wall
++CXXFLAGS += -Wall
+
+ #default target is Linux
+ all: all_linux
+@@ -17,14 +18,14 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/05.UserInterface/Makefile
++++ irrlicht-1.8.4/examples/05.UserInterface/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/01.HelloWorld/Makefile
++++ irrlicht-1.8.4/examples/01.HelloWorld/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS =
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+
+ #default target is Linux
+ all: all_linux
+
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- irrlicht-1.8.4/examples/18.SplitScreen/Makefile
++++ irrlicht-1.8.4/examples/18.SplitScreen/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/07.Collision/Makefile
++++ irrlicht-1.8.4/examples/07.Collision/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,13 +18,13 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
+--- irrlicht-1.8.4/examples/24.CursorControl/Makefile
++++ irrlicht-1.8.4/examples/24.CursorControl/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS =
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+
+ #default target is Linux
+ all: all_linux
+
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- irrlicht-1.8.4/examples/25.XmlHandling/Makefile
++++ irrlicht-1.8.4/examples/25.XmlHandling/Makefile
+@@ -7,15 +7,15 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+ USERCPPFLAGS =
+ # compiler flags such as optimization flags
+-USERCXXFLAGS = -O3 -ffast-math
++USERCXXFLAGS = -ffast-math
+ #USERCXXFLAGS = -g -Wall
+ # linker flags such as additional libraries and link paths
+ USERLDFLAGS =
+@@ -24,16 +24,17 @@
+ #no changes necessary below this line
+ ####
+
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
+-CXXFLAGS = $(USERCXXFLAGS)
+-LDFLAGS = $(USERLDFLAGS)
++CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
++CXXFLAGS ?= -O3
++CXXFLAGS += $(USERCXXFLAGS)
++LDFLAGS += $(USERLDFLAGS)
+
+ #default target is Linux
+ all: all_linux
+
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
++++ irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
+@@ -5,8 +5,9 @@
+ Sources = main.cpp
+
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
+-CXXFLAGS = -O3 -ffast-math
++CPPFLAGS += -I/usr/include/irrlicht
++CXXFLAGS ?= -O3
++CXXFLAGS += -ffast-math
+ #CXXFLAGS = -g -Wall
+
+ #default target is Linux
+@@ -17,14 +18,14 @@
+ endif
+
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
++all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+
+ all_linux all_win32:
+ $(warning Building...)
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
new file mode 100644
index 00000000..c243d64
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch
@@ -0,0 +1,46 @@
+--- 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
+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
+ 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
+-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
+-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
+-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
+ 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
+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
+
+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions
+ EXTRAOBJ =
+@@ -61,18 +57,16 @@
+
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
++CXXINCS = -I../../include
+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
++CXXFLAGS += -Wall -fno-exceptions -fno-rtti
+ ifndef NDEBUG
+-CXXFLAGS += -g -D_DEBUG
+-else
+-CXXFLAGS += -fexpensive-optimizations -O3
++CXXFLAGS += -D_DEBUG
+ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
+ endif
+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+
+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC
+ sharedlib sharedlib_osx: CFLAGS += -fPIC
+@@ -88,7 +82,7 @@
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+ sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+
+ #OSX specific options
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
new file mode 100644
index 00000000..6036ea3
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000..9f9e240
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 00000000..fa018e3
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
@@ -0,0 +1,74 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
@ 2017-12-08 18:47 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2017-12-08 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 24918749d0774c6acdfbbf5c5678bf44623a03dd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 18:24:47 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 18:47:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24918749
dev-games/irrlicht: [QA] Move patches to distfiles
Closes: https://bugs.gentoo.org/620552
dev-games/irrlicht/Manifest | 6 +-
.../irrlicht/files/irrlicht-1.8.1-config.patch | 29 -
.../irrlicht/files/irrlicht-1.8.1-demoMake.patch | 764 ---------------------
.../irrlicht/files/irrlicht-1.8.1-gentoo.patch | 46 --
.../irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch | 15 -
.../irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch | 40 --
.../irrlicht/files/irrlicht-1.8.4-config.patch | 29 -
.../irrlicht/files/irrlicht-1.8.4-demoMake.patch | 764 ---------------------
.../irrlicht/files/irrlicht-1.8.4-gentoo.patch | 46 --
.../irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch | 15 -
.../irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch | 40 --
dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild | 15 +-
dev-games/irrlicht/irrlicht-1.8.4.ebuild | 13 +-
13 files changed, 19 insertions(+), 1803 deletions(-)
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index cfe019b0f8f..c445c75f669 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,2 +1,4 @@
-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
+DIST irrlicht-1.8.1-patchset.tar.bz2 4799 BLAKE2B e97d28f2d03b0a80310306bdb8dfaad08e1ded88733e9d4c8a820d9744f05d1fbfef66c08f4cf5634271cab55edaef6b5cb679c983193aea9d07c83108c1f2aa SHA512 08784867cee6cb478a47da4b69d80105fc574eb48ee159cde412e7ca163b30e46de927e1489ab7a78adbcac4b38fa57936869cd043735e5737eb8136200fd341
+DIST irrlicht-1.8.1.zip 24167632 BLAKE2B f97e863802814a8c2c87263093429c4b3939dd26ca894c22b12f610d10cbd1231eb077e798b977544e4c1d5870d176083831d862ac933b17973916aff1b2684e SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb
+DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602
+DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
deleted file mode 100644
index 5cb2a75b787..00000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/IrrCompileConfig.h
-+++ 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.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
deleted file mode 100644
index 27f553dfdb2..00000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-demoMake.patch
+++ /dev/null
@@ -1,764 +0,0 @@
---- examples/Demo/Makefile
-+++ examples/Demo/Makefile
-@@ -2,8 +2,9 @@
- Target = Demo
- Sources = CDemo.cpp CMainMenu.cpp main.cpp
-
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -Wall -O3 -ffast-math
-+CXXFLAGS ?= -O3
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS += -Wall -ffast-math
-
- ifeq ($(HOSTTYPE), x86_64)
- LIBSELECT=64
-@@ -13,7 +14,7 @@
-
- # target specific settings
- all_linux: SYSTEM=Linux
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
-
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
---- examples/14.Win32Window/Makefile
-+++ examples/14.Win32Window/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/12.TerrainRendering/Makefile
-+++ examples/12.TerrainRendering/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/11.PerPixelLighting/Makefile
-+++ examples/11.PerPixelLighting/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/08.SpecialFX/Makefile
-+++ examples/08.SpecialFX/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/06.2DGraphics/Makefile
-+++ examples/06.2DGraphics/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/04.Movement/Makefile
-+++ examples/04.Movement/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/16.Quake3MapShader/Makefile
-+++ examples/16.Quake3MapShader/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/15.LoadIrrFile/Makefile
-+++ examples/15.LoadIrrFile/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/02.Quake3Map/Makefile
-+++ examples/02.Quake3Map/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,7 +18,7 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
- static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
-@@ -25,7 +25,7 @@
- static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc
- static_win32 all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32 static_win32:
- $(warning Building...)
---- examples/19.MouseAndJoystick/Makefile
-+++ examples/19.MouseAndJoystick/Makefile
-@@ -5,9 +5,10 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
-+CPPFLAGS += -I/usr/include/irrlicht
- #CXXFLAGS = -O3 -ffast-math
--CXXFLAGS = -g -Wall
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -Wall
-
- #default target is Linux
- all: all_linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/13.RenderToTexture/Makefile
-+++ examples/13.RenderToTexture/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/10.Shaders/Makefile
-+++ examples/10.Shaders/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/09.Meshviewer/Makefile
-+++ examples/09.Meshviewer/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/21.Quake3Explorer/Makefile
-+++ examples/21.Quake3Explorer/Makefile
-@@ -5,9 +5,10 @@
- Sources = main.cpp sound.cpp q3factory.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
-+CPPFLAGS += -I/usr/include/irrlicht
- #CXXFLAGS = -O3 -ffast-math
-+CXXFLAGS ?= -O3
--CXXFLAGS = -g -Wall
-+CXXFLAGS += -Wall
-
- #default target is Linux
- all: all_linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/03.CustomSceneNode/Makefile
-+++ examples/03.CustomSceneNode/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/20.ManagedLights/Makefile
-+++ examples/20.ManagedLights/Makefile
-@@ -5,9 +5,10 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
-+CPPFLAGS += -I/usr/include/irrlicht
- #CXXFLAGS = -O3 -ffast-math
-+CXXFLAGS ?= -O3
--CXXFLAGS = -g -Wall
-+CXXFLAGS += -Wall
-
- #default target is Linux
- all: all_linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/05.UserInterface/Makefile
-+++ examples/05.UserInterface/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/01.HelloWorld/Makefile
-+++ examples/01.HelloWorld/Makefile
-@@ -7,15 +7,15 @@
- # List of source files, separated by spaces
- Sources := main.cpp
- # Path to Irrlicht directory, should contain include/ and lib/
--IrrlichtHome := ../..
-+IrrlichtHome := /usr
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
--BinPath = ../../bin/$(SYSTEM)
-+BinPath = ../../bin
-
- # general compiler settings (might need to be set when compiling the lib, too)
- # preprocessor flags, e.g. defines and include paths
- USERCPPFLAGS =
- # compiler flags such as optimization flags
--USERCXXFLAGS = -O3 -ffast-math
-+USERCXXFLAGS = -ffast-math
- #USERCXXFLAGS = -g -Wall
- # linker flags such as additional libraries and link paths
- USERLDFLAGS =
-@@ -24,16 +24,17 @@
- #no changes necessary below this line
- ####
-
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
--CXXFLAGS = $(USERCXXFLAGS)
--LDFLAGS = $(USERLDFLAGS)
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
-+CXXFLAGS ?= -O3
-+CXXFLAGS += $(USERCXXFLAGS)
-+LDFLAGS += $(USERLDFLAGS)
-
- #default target is Linux
- all: all_linux
-
- # target specific settings
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32 static_win32: SUF=.exe
---- examples/18.SplitScreen/Makefile
-+++ examples/18.SplitScreen/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/07.Collision/Makefile
-+++ examples/07.Collision/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- examples/24.CursorControl/Makefile
-+++ examples/24.CursorControl/Makefile
-@@ -7,15 +7,15 @@
- # List of source files, separated by spaces
- Sources := main.cpp
- # Path to Irrlicht directory, should contain include/ and lib/
--IrrlichtHome := ../..
-+IrrlichtHome := /usr
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
--BinPath = ../../bin/$(SYSTEM)
-+BinPath = ../../bin
-
- # general compiler settings (might need to be set when compiling the lib, too)
- # preprocessor flags, e.g. defines and include paths
- USERCPPFLAGS =
- # compiler flags such as optimization flags
--USERCXXFLAGS = -O3 -ffast-math
-+USERCXXFLAGS = -ffast-math
- #USERCXXFLAGS = -g -Wall
- # linker flags such as additional libraries and link paths
- USERLDFLAGS =
-@@ -24,16 +24,17 @@
- #no changes necessary below this line
- ####
-
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
--CXXFLAGS = $(USERCXXFLAGS)
--LDFLAGS = $(USERLDFLAGS)
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
-+CXXFLAGS ?= -O3
-+CXXFLAGS += $(USERCXXFLAGS)
-+LDFLAGS += $(USERLDFLAGS)
-
- #default target is Linux
- all: all_linux
-
- # target specific settings
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32 static_win32: SUF=.exe
---- examples/25.XmlHandling/Makefile
-+++ examples/25.XmlHandling/Makefile
-@@ -7,15 +7,15 @@
- # List of source files, separated by spaces
- Sources := main.cpp
- # Path to Irrlicht directory, should contain include/ and lib/
--IrrlichtHome := ../..
-+IrrlichtHome := /usr
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
--BinPath = ../../bin/$(SYSTEM)
-+BinPath = ../../bin
-
- # general compiler settings (might need to be set when compiling the lib, too)
- # preprocessor flags, e.g. defines and include paths
- USERCPPFLAGS =
- # compiler flags such as optimization flags
--USERCXXFLAGS = -O3 -ffast-math
-+USERCXXFLAGS = -ffast-math
- #USERCXXFLAGS = -g -Wall
- # linker flags such as additional libraries and link paths
- USERLDFLAGS =
-@@ -24,16 +24,17 @@
- #no changes necessary below this line
- ####
-
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
--CXXFLAGS = $(USERCXXFLAGS)
--LDFLAGS = $(USERLDFLAGS)
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
-+CXXFLAGS ?= -O3
-+CXXFLAGS += $(USERCXXFLAGS)
-+LDFLAGS += $(USERLDFLAGS)
-
- #default target is Linux
- all: all_linux
-
- # target specific settings
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32 static_win32: SUF=.exe
---- examples/26.OcclusionQuery/Makefile
-+++ examples/26.OcclusionQuery/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
deleted file mode 100644
index ccbf2cfb921..00000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- source/Irrlicht/Makefile
-+++ 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
- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
- 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
--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
--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
--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
- 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
--BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
-
- # Next variable is for additional scene nodes etc. of customized Irrlicht versions
- EXTRAOBJ =
-@@ -61,18 +57,16 @@
-
- ###############
- #Compiler flags
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-+CXXINCS = -I../../include
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
-+CXXFLAGS += -Wall -fno-exceptions -fno-rtti
- ifndef NDEBUG
--CXXFLAGS += -g -D_DEBUG
--else
--CXXFLAGS += -fexpensive-optimizations -O3
-+CXXFLAGS += -D_DEBUG
- endif
- ifdef PROFILE
- CXXFLAGS += -pg
- endif
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC
- sharedlib sharedlib_osx: CFLAGS += -fPIC
-@@ -88,7 +82,7 @@
- LIB_PATH = ../../lib/$(SYSTEM)
- INSTALL_DIR = /usr/local/lib
- sharedlib install: SHARED_LIB = libIrrlicht.so
--sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
-+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz
- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
-
- #OSX specific options
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch
deleted file mode 100644
index 90ed828d1a9..00000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-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
-
---- source/Irrlicht/CImageLoaderJPG.cpp
-+++ 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.1-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch
deleted file mode 100644
index e90ff36443a..00000000000
--- a/dev-games/irrlicht/files/irrlicht-1.8.1-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.1/source/Irrlicht/COpenGLExtensionHandler.h
-+++ irrlicht-1.8.1/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/files/irrlicht-1.8.4-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch
deleted file mode 100644
index 0c51ffe884b..00000000000
--- 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
index e46841d8f43..00000000000
--- 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 @@
- Target = Demo
- Sources = CDemo.cpp CMainMenu.cpp main.cpp
-
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -Wall -O3 -ffast-math
-+CXXFLAGS ?= -O3
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS += -Wall -ffast-math
-
- ifeq ($(HOSTTYPE), x86_64)
- LIBSELECT=64
-@@ -13,7 +14,7 @@
-
- # target specific settings
- all_linux: SYSTEM=Linux
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
-
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm
---- irrlicht-1.8.4/examples/14.Win32Window/Makefile
-+++ irrlicht-1.8.4/examples/14.Win32Window/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
-+++ irrlicht-1.8.4/examples/12.TerrainRendering/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
-+++ irrlicht-1.8.4/examples/11.PerPixelLighting/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/08.SpecialFX/Makefile
-+++ irrlicht-1.8.4/examples/08.SpecialFX/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/06.2DGraphics/Makefile
-+++ irrlicht-1.8.4/examples/06.2DGraphics/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/04.Movement/Makefile
-+++ irrlicht-1.8.4/examples/04.Movement/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
-+++ irrlicht-1.8.4/examples/16.Quake3MapShader/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
-+++ irrlicht-1.8.4/examples/15.LoadIrrFile/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/02.Quake3Map/Makefile
-+++ irrlicht-1.8.4/examples/02.Quake3Map/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,7 +18,7 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
- static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
-@@ -25,7 +25,7 @@
- static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc
- static_win32 all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32 static_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
-+++ irrlicht-1.8.4/examples/19.MouseAndJoystick/Makefile
-@@ -5,9 +5,10 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
-+CPPFLAGS += -I/usr/include/irrlicht
- #CXXFLAGS = -O3 -ffast-math
--CXXFLAGS = -g -Wall
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -Wall
-
- #default target is Linux
- all: all_linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
-+++ irrlicht-1.8.4/examples/13.RenderToTexture/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/10.Shaders/Makefile
-+++ irrlicht-1.8.4/examples/10.Shaders/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/09.Meshviewer/Makefile
-+++ irrlicht-1.8.4/examples/09.Meshviewer/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
-+++ irrlicht-1.8.4/examples/21.Quake3Explorer/Makefile
-@@ -5,9 +5,10 @@
- Sources = main.cpp sound.cpp q3factory.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
-+CPPFLAGS += -I/usr/include/irrlicht
- #CXXFLAGS = -O3 -ffast-math
-+CXXFLAGS ?= -O3
--CXXFLAGS = -g -Wall
-+CXXFLAGS += -Wall
-
- #default target is Linux
- all: all_linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
-+++ irrlicht-1.8.4/examples/03.CustomSceneNode/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/20.ManagedLights/Makefile
-+++ irrlicht-1.8.4/examples/20.ManagedLights/Makefile
-@@ -5,9 +5,10 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
-+CPPFLAGS += -I/usr/include/irrlicht
- #CXXFLAGS = -O3 -ffast-math
-+CXXFLAGS ?= -O3
--CXXFLAGS = -g -Wall
-+CXXFLAGS += -Wall
-
- #default target is Linux
- all: all_linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/05.UserInterface/Makefile
-+++ irrlicht-1.8.4/examples/05.UserInterface/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/01.HelloWorld/Makefile
-+++ irrlicht-1.8.4/examples/01.HelloWorld/Makefile
-@@ -7,15 +7,15 @@
- # List of source files, separated by spaces
- Sources := main.cpp
- # Path to Irrlicht directory, should contain include/ and lib/
--IrrlichtHome := ../..
-+IrrlichtHome := /usr
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
--BinPath = ../../bin/$(SYSTEM)
-+BinPath = ../../bin
-
- # general compiler settings (might need to be set when compiling the lib, too)
- # preprocessor flags, e.g. defines and include paths
- USERCPPFLAGS =
- # compiler flags such as optimization flags
--USERCXXFLAGS = -O3 -ffast-math
-+USERCXXFLAGS = -ffast-math
- #USERCXXFLAGS = -g -Wall
- # linker flags such as additional libraries and link paths
- USERLDFLAGS =
-@@ -24,16 +24,17 @@
- #no changes necessary below this line
- ####
-
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
--CXXFLAGS = $(USERCXXFLAGS)
--LDFLAGS = $(USERLDFLAGS)
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
-+CXXFLAGS ?= -O3
-+CXXFLAGS += $(USERCXXFLAGS)
-+LDFLAGS += $(USERLDFLAGS)
-
- #default target is Linux
- all: all_linux
-
- # target specific settings
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32 static_win32: SUF=.exe
---- irrlicht-1.8.4/examples/18.SplitScreen/Makefile
-+++ irrlicht-1.8.4/examples/18.SplitScreen/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/07.Collision/Makefile
-+++ irrlicht-1.8.4/examples/07.Collision/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,13 +18,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
---- irrlicht-1.8.4/examples/24.CursorControl/Makefile
-+++ irrlicht-1.8.4/examples/24.CursorControl/Makefile
-@@ -7,15 +7,15 @@
- # List of source files, separated by spaces
- Sources := main.cpp
- # Path to Irrlicht directory, should contain include/ and lib/
--IrrlichtHome := ../..
-+IrrlichtHome := /usr
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
--BinPath = ../../bin/$(SYSTEM)
-+BinPath = ../../bin
-
- # general compiler settings (might need to be set when compiling the lib, too)
- # preprocessor flags, e.g. defines and include paths
- USERCPPFLAGS =
- # compiler flags such as optimization flags
--USERCXXFLAGS = -O3 -ffast-math
-+USERCXXFLAGS = -ffast-math
- #USERCXXFLAGS = -g -Wall
- # linker flags such as additional libraries and link paths
- USERLDFLAGS =
-@@ -24,16 +24,17 @@
- #no changes necessary below this line
- ####
-
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
--CXXFLAGS = $(USERCXXFLAGS)
--LDFLAGS = $(USERLDFLAGS)
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
-+CXXFLAGS ?= -O3
-+CXXFLAGS += $(USERCXXFLAGS)
-+LDFLAGS += $(USERLDFLAGS)
-
- #default target is Linux
- all: all_linux
-
- # target specific settings
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32 static_win32: SUF=.exe
---- irrlicht-1.8.4/examples/25.XmlHandling/Makefile
-+++ irrlicht-1.8.4/examples/25.XmlHandling/Makefile
-@@ -7,15 +7,15 @@
- # List of source files, separated by spaces
- Sources := main.cpp
- # Path to Irrlicht directory, should contain include/ and lib/
--IrrlichtHome := ../..
-+IrrlichtHome := /usr
- # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
--BinPath = ../../bin/$(SYSTEM)
-+BinPath = ../../bin
-
- # general compiler settings (might need to be set when compiling the lib, too)
- # preprocessor flags, e.g. defines and include paths
- USERCPPFLAGS =
- # compiler flags such as optimization flags
--USERCXXFLAGS = -O3 -ffast-math
-+USERCXXFLAGS = -ffast-math
- #USERCXXFLAGS = -g -Wall
- # linker flags such as additional libraries and link paths
- USERLDFLAGS =
-@@ -24,16 +24,17 @@
- #no changes necessary below this line
- ####
-
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
--CXXFLAGS = $(USERCXXFLAGS)
--LDFLAGS = $(USERLDFLAGS)
-+CPPFLAGS += -I/usr/include/irrlicht $(USERCPPFLAGS)
-+CXXFLAGS ?= -O3
-+CXXFLAGS += $(USERCXXFLAGS)
-+LDFLAGS += $(USERLDFLAGS)
-
- #default target is Linux
- all: all_linux
-
- # target specific settings
--all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
--all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
-+all_linux: LDFLAGS += -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32 static_win32: SUF=.exe
---- irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
-+++ irrlicht-1.8.4/examples/26.OcclusionQuery/Makefile
-@@ -5,8 +5,9 @@
- Sources = main.cpp
-
- # general compiler settings
--CPPFLAGS = -I../../include -I/usr/X11R6/include
--CXXFLAGS = -O3 -ffast-math
-+CPPFLAGS += -I/usr/include/irrlicht
-+CXXFLAGS ?= -O3
-+CXXFLAGS += -ffast-math
- #CXXFLAGS = -g -Wall
-
- #default target is Linux
-@@ -17,14 +18,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor
-+all_linux: LDFLAGS += -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg
- all_linux clean_linux: SYSTEM=Linux
- all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
- all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32 clean_win32: SUF=.exe
- # name of the binary - only valid for targets which set SYSTEM
--DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
-+DESTPATH = ../../bin/$(Target)$(SUF)
-
- all_linux all_win32:
- $(warning Building...)
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
index d40a7da1874..00000000000
--- 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
- IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
- 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
--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
--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
--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
- 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
--BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
-
- # Next variable is for additional scene nodes etc. of customized Irrlicht versions
- EXTRAOBJ =
-@@ -61,18 +57,16 @@
-
- ###############
- #Compiler flags
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-+CXXINCS = -I../../include
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
--CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
-+CXXFLAGS += -Wall -fno-exceptions -fno-rtti
- ifndef NDEBUG
--CXXFLAGS += -g -D_DEBUG
--else
--CXXFLAGS += -fexpensive-optimizations -O3
-+CXXFLAGS += -D_DEBUG
- endif
- ifdef PROFILE
- CXXFLAGS += -pg
- endif
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-+CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC
- sharedlib sharedlib_osx: CFLAGS += -fPIC
-@@ -88,7 +82,7 @@
- LIB_PATH = ../../lib/$(SYSTEM)
- INSTALL_DIR = /usr/local/lib
- sharedlib install: SHARED_LIB = libIrrlicht.so
--sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
-+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -ljpeg -lpng -lbz2 -lz
- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
-
- #OSX specific options
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
index 2c6f7ddeb93..00000000000
--- 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
index 145d543b8ad..00000000000
--- 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.1-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
index 12713536b7e..ed347462168 100644
--- a/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,8 @@ inherit eutils multilib 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"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="ZLIB"
SLOT="0"
@@ -32,11 +33,11 @@ src_prepare() {
edos2unix include/IrrCompileConfig.h
epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-config.patch \
- "${FILESDIR}"/${P}-demoMake.patch \
- "${FILESDIR}"/${P}-mesa-10.x.patch \
- "${FILESDIR}"/${P}-jpeg-9a.patch
+ "${WORKDIR}"/${P}-patchset/${P}-gentoo.patch \
+ "${WORKDIR}"/${P}-patchset/${P}-config.patch \
+ "${WORKDIR}"/${P}-patchset/${P}-demoMake.patch \
+ "${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch \
+ "${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
sed -i \
-e 's:\.\./\.\./media:../media:g' \
diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
index 6b5499de12e..28387a3eab4 100644
--- a/dev-games/irrlicht/irrlicht-1.8.4.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.4.ebuild
@@ -6,7 +6,8 @@ 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"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
+ https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
LICENSE="ZLIB"
SLOT="0"
@@ -27,11 +28,11 @@ DEPEND="${RDEPEND}
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 )
+PATCHES=( "${WORKDIR}"/${P}-patchset/${P}-gentoo.patch
+ "${WORKDIR}"/${P}-patchset/${P}-config.patch
+ "${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
+ "${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
+ "${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch )
DOCS=( changes.txt readme.txt )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
@ 2020-09-06 5:55 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-09-06 5:55 UTC (permalink / raw
To: gentoo-commits
commit: d898cc0eff0b92fb6ab034dcfc0a9b50dee2d59d
Author: William Breathitt Gray <vilhelm.gray <AT> gmail <DOT> com>
AuthorDate: Sat Sep 5 13:28:29 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 05:55:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d898cc0e
dev-games/irrlicht: Add patch to remove sys/sysctl.h include
Closes: https://bugs.gentoo.org/736342
Signed-off-by: William Breathitt Gray <vilhelm.gray <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17426
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/irrlicht-1.8.4-remove-sys-sysctl.h.patch | 38 ++++++++++++++++++++++
dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch
new file mode 100644
index 00000000000..2e5fc63e6f8
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch
@@ -0,0 +1,38 @@
+From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 9 Apr 2017 22:20:19 +0200
+Subject: [PATCH] remove sys/sysctl.h
+
+With musl irrlicht doesn't build due to missing sys/sysctl.h
+
+fatal error: sys/sysctl.h: No such file or directory
+
+From [1]
+"sysctl does not work, and NEVER worked. using it is bogus.
+it was a bogus experimental syscall that was deprecated before
+it was ever used (basically, a broken binary version of
+/proc/sys, without any stability between kernel versions for
+what the binary constants meant)."
+
+[1] https://devsonacid.wordpress.com/tag/musl/
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ source/Irrlicht/COSOperator.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
+index 0899d1d..ccf5ef5 100644
+--- a/source/Irrlicht/COSOperator.cpp
++++ b/source/Irrlicht/COSOperator.cpp
+@@ -13,7 +13,6 @@
+ #include <unistd.h>
+ #ifndef _IRR_SOLARIS_PLATFORM_
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #endif
+ #endif
+
+--
+2.9.3
+
diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
index 938b141e5e0..8a74c20ddcf 100644
--- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
+ "${FILESDIR}/${P}-remove-sys-sysctl.h.patch"
)
DOCS=( changes.txt readme.txt )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
@ 2023-10-07 19:04 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2023-10-07 19:04 UTC (permalink / raw
To: gentoo-commits
commit: c0b729c45e1864c6181aa3a077db47a5f68c344a
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Oct 7 19:04:26 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 7 19:04:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b729c4
dev-games/irrlicht: Fix C++17 does not allow register storage class
* also update EAPI 7 -> 8
Closes: https://github.com/gentoo/gentoo/pull/33236
Closes: https://bugs.gentoo.org/894764
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/irrlicht-1.8.4-drop-register.patch | 33 ++++++++++++++++++++++
...ht-1.8.4-r1.ebuild => irrlicht-1.8.4-r2.ebuild} | 32 ++++++++++-----------
2 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-drop-register.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-drop-register.patch
new file mode 100644
index 000000000000..532b14f2503e
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-drop-register.patch
@@ -0,0 +1,33 @@
+Bug: https://bugs.gentoo.org/894764
+
+--- a/source/Irrlicht/CColorConverter.cpp
++++ b/source/Irrlicht/CColorConverter.cpp
+@@ -165,7 +165,7 @@
+ out += lineWidth * height;
+
+ u32 x;
+- register u32 c;
++ u32 c;
+ for (u32 y=0; y < (u32) height; ++y)
+ {
+ if (flip)
+--- a/source/Irrlicht/CMY3DHelper.h
++++ b/source/Irrlicht/CMY3DHelper.h
+@@ -269,7 +269,7 @@
+ unsigned char *out_buf, int out_buf_size)
+ {
+ // we start out with 3 repeating bytes
+- register int len = 3;
++ int len = 3;
+
+ unsigned char ch;
+
+@@ -328,7 +328,7 @@
+ //-----------------------------------------------------------
+ void flush_outbuf(unsigned char *out_buf, int out_buf_size)
+ {
+- register int pos=0;
++ int pos=0;
+
+ if(!outbuf_cnt)
+ return; // nothing to do */
diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild
similarity index 77%
rename from dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
rename to dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild
index 1cca76678df5..88d3925ec77c 100644
--- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit toolchain-funcs
DESCRIPTION="open source high performance realtime 3D engine written in C++"
HOMEPAGE="https://irrlicht.sourceforge.io/"
-SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
+SRC_URI="
+ mirror://sourceforge/irrlicht/${P}.zip
https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+S="${WORKDIR}/${P}/source/${PN^}"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="amd64 ~riscv x86"
-IUSE="debug doc static-libs"
+IUSE="debug doc"
-RDEPEND="app-arch/bzip2
+RDEPEND="
+ app-arch/bzip2
~dev-games/irrlicht-headers-${PV}
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/jpeg:0
+ media-libs/libpng:=
+ sys-libs/zlib:=
+ media-libs/libjpeg-turbo:=
virtual/opengl
x11-libs/libX11
x11-libs/libXxf86vm"
@@ -26,14 +30,13 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto"
BDEPEND="app-arch/unzip"
-S=${WORKDIR}/${P}/source/${PN^}
-
PATCHES=(
"${WORKDIR}"/${P}-patchset/${P}-gentoo.patch
"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
- "${FILESDIR}/${P}-remove-sys-sysctl.h.patch"
+ "${FILESDIR}"/${P}-remove-sys-sysctl.h.patch
+ "${FILESDIR}"/${P}-drop-register.patch
)
DOCS=( changes.txt readme.txt )
@@ -62,13 +65,12 @@ src_prepare() {
src_compile() {
tc-export CXX CC AR
- emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "")
+ emake NDEBUG=$(usev !debug 1) sharedlib
}
src_install() {
cd "${WORKDIR}"/${P} || die
- use static-libs && dolib.a lib/Linux/libIrrlicht.a
dolib.so lib/Linux/libIrrlicht.so*
# create library symlinks
@@ -78,7 +80,5 @@ src_install() {
einstalldocs
# don't do these with einstalldocs because they shouldn't be compressed
- if use doc ; then
- dodoc -r examples media
- fi
+ use doc && dodoc -r examples media
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-10-07 19:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-07 19:04 [gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-09-06 5:55 Joonas Niilola
2017-12-08 18:47 Michał Górny
2016-09-09 13:32 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox