summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-03-19 20:07:35 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-03-19 20:07:35 +0000
commitc7872f60d16ca43b9331b0fb4f60a7d5e8b40515 (patch)
tree61e87a3cbe976a053e0140f8c02911268deaa2af /dev-games/irrlicht
parentold (diff)
downloadgentoo-2-c7872f60d16ca43b9331b0fb4f60a7d5e8b40515.tar.gz
gentoo-2-c7872f60d16ca43b9331b0fb4f60a7d5e8b40515.tar.bz2
gentoo-2-c7872f60d16ca43b9331b0fb4f60a7d5e8b40515.zip
old
(Portage version: 2.1.7.17/cvs/Linux i686)
Diffstat (limited to 'dev-games/irrlicht')
-rw-r--r--dev-games/irrlicht/Manifest4
-rw-r--r--dev-games/irrlicht/files/irrlicht-1.6.1-config.patch26
-rw-r--r--dev-games/irrlicht/files/irrlicht-1.6.1-demoMake.patch572
-rw-r--r--dev-games/irrlicht/irrlicht-1.6.1.ebuild68
4 files changed, 0 insertions, 670 deletions
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 059444eb7176..866ccbe6b6c6 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,14 +1,10 @@
AUX irrlicht-1.5.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
AUX irrlicht-1.5.1-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
-AUX irrlicht-1.6.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
-AUX irrlicht-1.6.1-demoMake.patch 19873 RMD160 61ad654a0824a1bde18a26ff642de412082166dd SHA1 582b60ef94fe93d458322429b4622da6e122ada2 SHA256 f4686dceb39913fb26035f970e999dff7b8dd82e87de6b999f3dfb5aacf846d0
AUX irrlicht-1.7.1-config.patch 1524 RMD160 605b3e87e1a979614cd47e1d9939d75556e744a4 SHA1 70a01ddfe947f8abf4a8b23f195eba7a1928158b SHA256 57da1c0af56b5a2145e3befa16c227f2222aeccd2fe050bd93d484a22643ab1d
AUX irrlicht-1.7.1-demoMake.patch 19873 RMD160 61ad654a0824a1bde18a26ff642de412082166dd SHA1 582b60ef94fe93d458322429b4622da6e122ada2 SHA256 f4686dceb39913fb26035f970e999dff7b8dd82e87de6b999f3dfb5aacf846d0
DIST irrlicht-1.5.1.zip 22514017 RMD160 2296568336dc9d506b59c1204c137526391fe3e5 SHA1 6110f398f4ed3850e0c5237629aa48050fb95fec SHA256 b5518bdb3fa8098ca92795a4bb03d19596b81103797fbaca199fc546d3c07070
-DIST irrlicht-1.6.1.zip 22299175 RMD160 8b342f676cdb867ee6cbe964b939f961b700a704 SHA1 68b19c43e63960c6c94cc57ada879fbcb4b5fc30 SHA256 be26182cc4b9edb6d1e355cb4a6b99508333209b563f393c6dfcf5ca295f4df9
DIST irrlicht-1.7.1.zip 19542368 RMD160 7125d2ed59627c84181a22172c6f270e41758e2e SHA1 077603b157b35637d2496ac5bb97a97b5109b384 SHA256 489fe899e900944b8d898da6fda537ed2f8fcf590eb35b93d8ad9d1151ebe79f
EBUILD irrlicht-1.5.1.ebuild 1372 RMD160 6d39f2f581b8e908ac685212fd7225841640982e SHA1 eb58b8d9ea0b5c3364b0678c0735a3849c4c96da SHA256 fe451866873e0484783ec8dca6ff0bddc856ed6518024a2b7305ac26faa3ac59
-EBUILD irrlicht-1.6.1.ebuild 1599 RMD160 49cf7c8a3ceb52bd204918b84acd99ea93117ca4 SHA1 97aade423d0ca55cfa10e374bcfa4975e8a7e50e SHA256 f42194ee86d993f1dada93c565f99d7b68d783e8ed36a704f7d5cf30baae2d51
EBUILD irrlicht-1.7.1.ebuild 1611 RMD160 2791973c74a208b06f8d9d51caf53836080ecb0a SHA1 a30ecadf912274d2b61165be6354e9fe2849c248 SHA256 adc2480efcc638a86125049b3b65a5004f97aaa23935c4c6d4efc12e417a72e2
MISC ChangeLog 6505 RMD160 5a584a6b0ac8f608cb83d0454b62713bde5464df SHA1 8dcb7a0690e5d86e38de0fbb8d6fe30ae7a05956 SHA256 6397488fad70a89dd6c7412b80456c39ea35ed543e65571d7f0fb969b6f996c0
MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
diff --git a/dev-games/irrlicht/files/irrlicht-1.6.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.6.1-config.patch
deleted file mode 100644
index fbb1cab1ac7b..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.6.1-config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- include/IrrCompileConfig.h
-+++ include/IrrCompileConfig.h
-@@ -113,7 +113,6 @@
- //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
- /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
- This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
--#define _IRR_USE_NON_SYSTEM_ZLIB_
-
-
- //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
-@@ -124,7 +123,6 @@
- //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
- /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
- This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
--#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
-
-
- //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
-@@ -135,7 +133,6 @@
- //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
- /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
- This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
--#define _IRR_USE_NON_SYSTEM_LIB_PNG_
-
-
- //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
diff --git a/dev-games/irrlicht/files/irrlicht-1.6.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.6.1-demoMake.patch
deleted file mode 100644
index a8f4aace8d0a..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.6.1-demoMake.patch
+++ /dev/null
@@ -1,572 +0,0 @@
---- examples/Demo/Makefile
-+++ examples/Demo/Makefile
-@@ -2,7 +2,7 @@
- Target = Demo
- Sources = CDemo.cpp CMainMenu.cpp main.cpp
-
--CPPFLAGS = -I../../include -I/usr/X11R6/include
-+CPPFLAGS = -I/usr/include/irrlicht
- CXXFLAGS = -Wall -O3 -ffast-math
-
- ifeq ($(HOSTTYPE), x86_64)
-@@ -13,7 +13,7 @@
-
- # target specific settings
- all_linux: SYSTEM=Linux
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg
-
- all_win32 clean_win32: SYSTEM=Win32-gcc
- all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm
---- examples/14.Win32Window/Makefile
-+++ examples/14.Win32Window/Makefile
-@@ -5,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,14 +17,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,7 +17,7 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,14 +17,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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 = -g -Wall
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,14 +17,14 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,9 +7,9 @@
- # 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
-@@ -24,7 +24,7 @@
- #no changes necessary below this line
- ####
-
--CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
-+CPPFLAGS = -I/usr/include/irrlicht $(USERCPPFLAGS)
- CXXFLAGS = $(USERCXXFLAGS)
- LDFLAGS = $(USERLDFLAGS)
-
-@@ -32,8 +32,8 @@
- 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
-+all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
-+all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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,7 +5,7 @@
- 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
-
-@@ -17,13 +17,13 @@
- endif
-
- # target specific settings
--all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
-+all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
- 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...)
diff --git a/dev-games/irrlicht/irrlicht-1.6.1.ebuild b/dev-games/irrlicht/irrlicht-1.6.1.ebuild
deleted file mode 100644
index 706257291a67..000000000000
--- a/dev-games/irrlicht/irrlicht-1.6.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.6.1.ebuild,v 1.2 2010/03/09 06:27:40 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="http://irrlicht.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
-
-RDEPEND="media-libs/jpeg
- media-libs/libpng
- virtual/opengl
- virtual/glu
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- app-arch/unzip
- x11-proto/xproto
- x11-proto/xf86vidmodeproto"
-
-S=${WORKDIR}/${P}/source/Irrlicht
-
-src_prepare() {
- cd "${WORKDIR}"/${P}
- epatch \
- "${FILESDIR}"/${P}-config.patch \
- "${FILESDIR}"/${P}-demoMake.patch
-
- sed -i \
- -e 's:\.\./\.\./media:../media:g' \
- $(grep -rl '\.\./\.\./media' examples) \
- || die 'sed failed'
-
- cd "${S}"
- sed -i \
- -e '/^CXXFLAGS/s:=:+=:' \
- -e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
- -e '/^ZLIBOBJ/d' \
- -e '/^JPEGLIBOBJ/d' \
- -e '/^LIBPNGOBJ/d' \
- Makefile || die "sed failed"
-
- sed -i \
- -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
- CImageLoaderPNG.cpp || die
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
- cd ../..
- dolib.a lib/Linux/libIrrlicht.a || die "dolib.a failed"
- insinto /usr/include/${PN}
- doins include/* || die "doins failed"
- dodoc changes.txt readme.txt
- if use doc ; then
- insinto /usr/share/doc/${PF}
- doins -r examples media || die "doins failed"
- fi
-}