diff options
Diffstat (limited to 'dev-games/irrlicht')
| -rw-r--r-- | dev-games/irrlicht/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.8-config.patch | 29 | ||||
| -rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.8-demoMake.patch | 764 | ||||
| -rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch | 40 | ||||
| -rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.8-r2-gentoo.patch | 46 | ||||
| -rw-r--r-- | dev-games/irrlicht/irrlicht-1.8-r2.ebuild | 70 |
6 files changed, 7 insertions, 950 deletions
diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog index 1add7662b46a..4ea3cd5cba3c 100644 --- a/dev-games/irrlicht/ChangeLog +++ b/dev-games/irrlicht/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-games/irrlicht # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.74 2015/02/21 12:26:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.75 2015/03/12 18:40:23 mr_bones_ Exp $ + + 12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> + -files/irrlicht-1.8-config.patch, -files/irrlicht-1.8-demoMake.patch, + -files/irrlicht-1.8-mesa-10.x.patch, -files/irrlicht-1.8-r2-gentoo.patch, + -irrlicht-1.8-r2.ebuild: + old 21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> irrlicht-1.8.1.ebuild: Stable for ppc, wrt bug #539484 diff --git a/dev-games/irrlicht/files/irrlicht-1.8-config.patch b/dev-games/irrlicht/files/irrlicht-1.8-config.patch deleted file mode 100644 index 5cb2a75b7872..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-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-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8-demoMake.patch deleted file mode 100644 index 27f553dfdb21..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-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-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8-mesa-10.x.patch deleted file mode 100644 index e90ff36443a0..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-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-r2-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.8-r2-gentoo.patch deleted file mode 100644 index ccbf2cfb921e..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.8-r2-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/irrlicht-1.8-r2.ebuild b/dev-games/irrlicht/irrlicht-1.8-r2.ebuild deleted file mode 100644 index 003f0d045431..000000000000 --- a/dev-games/irrlicht/irrlicht-1.8-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8-r2.ebuild,v 1.6 2014/04/29 23:20:15 hasufell Exp $ - -EAPI=5 -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" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug doc static-libs" - -RDEPEND="virtual/jpeg - 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/Irrlicht - -src_prepare() { - cd "${WORKDIR}"/${P} || die - edos2unix include/IrrCompileConfig.h - - epatch \ - "${FILESDIR}"/${PF}-gentoo.patch \ - "${FILESDIR}"/${P}-config.patch \ - "${FILESDIR}"/${P}-demoMake.patch \ - "${FILESDIR}"/${P}-mesa-10.x.patch - - sed -i \ - -e 's:\.\./\.\./media:../media:g' \ - $(grep -rl '\.\./\.\./media' examples) \ - || die 'sed failed' -} - -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.1.8.0 /usr/$(get_libdir)/libIrrlicht.so.1.8 - dosym libIrrlicht.so.1.8.0 /usr/$(get_libdir)/libIrrlicht.so - - insinto /usr/include/${PN} - doins include/* - - dodoc changes.txt readme.txt - if use doc ; then - insinto /usr/share/doc/${PF} - doins -r examples media - fi -} |