commit: e8f175c5a67c0f6d56e17cef6a43f6ebda03e343 Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Sat Mar 13 04:58:56 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 21:02:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e8f175c5
dev-games/irrlicht: remove from overlay Package-Manager: Portage-3.0.17, Repoman-3.0.2 Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> Closes: https://github.com/gentoo/musl/pull/393 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-games/irrlicht/Manifest | 1 - .../irrlicht/files/irrlicht-1.8.1-sysctl.patch | 15 - .../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 | 73 -- dev-games/irrlicht/metadata.xml | 21 - 9 files changed, 1004 deletions(-) diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest deleted file mode 100644 index d2d128c..0000000 --- a/dev-games/irrlicht/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-sysctl.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-sysctl.patch deleted file mode 100644 index 76b9028..0000000 --- a/dev-games/irrlicht/files/irrlicht-1.8.1-sysctl.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur irrlicht-1.8.1.orig/source/Irrlicht/COSOperator.cpp irrlicht-1.8.1/source/Irrlicht/COSOperator.cpp ---- irrlicht-1.8.1.orig/source/Irrlicht/COSOperator.cpp 2016-08-14 18:44:42.231442788 -0700 -+++ irrlicht-1.8.1/source/Irrlicht/COSOperator.cpp 2016-08-14 18:50:25.149101101 -0700 -@@ -13,9 +13,11 @@ - #include <unistd.h> - #ifndef _IRR_SOLARIS_PLATFORM_ - #include <sys/types.h> -+#ifndef __linux__ - #include <sys/sysctl.h> - #endif - #endif -+#endif - - #if defined(_IRR_COMPILE_WITH_X11_DEVICE_) - #include "CIrrDeviceLinux.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 0c51ffe..0000000 --- a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- irrlicht-1.8.4/include/IrrCompileConfig.h -+++ irrlicht-1.8.4/include/IrrCompileConfig.h -@@ -245,7 +245,7 @@ - //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. - /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. - This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ --#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ -+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ - #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ - #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ - #endif -@@ -261,7 +261,7 @@ - //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. - /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. - This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ --#define _IRR_USE_NON_SYSTEM_LIB_PNG_ -+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ - #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ - #undef _IRR_USE_NON_SYSTEM_LIB_PNG_ - #endif -@@ -598,7 +598,7 @@ - /** If this is commented out, Irrlicht will try to compile using the zlib - installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is - defined. */ --#define _IRR_USE_NON_SYSTEM_ZLIB_ -+//#define _IRR_USE_NON_SYSTEM_ZLIB_ - #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_ - #undef _IRR_USE_NON_SYSTEM_ZLIB_ - #endif diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch deleted file mode 100644 index e46841d..0000000 --- a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch +++ /dev/null @@ -1,764 +0,0 @@ ---- irrlicht-1.8.4/examples/Demo/Makefile -+++ irrlicht-1.8.4/examples/Demo/Makefile -@@ -2,8 +2,9 @@ - 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 d40a7da..0000000 --- a/dev-games/irrlicht/files/irrlicht-1.8.4-gentoo.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- irrlicht-1.8.4/source/Irrlicht/Makefile -+++ irrlicht-1.8.4/source/Irrlicht/Makefile -@@ -46,11 +46,7 @@ - IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o - 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 2c6f7dd..0000000 --- a/dev-games/irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=520746 - -http://code.metager.de/source/diff/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp?r2=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404823&r1=%2Firrlicht%2Fsource%2FIrrlicht%2FCImageLoaderJPG.cpp%404320 - ---- irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp -+++ irrlicht-1.8.4/source/Irrlicht/CImageLoaderJPG.cpp -@@ -66,7 +66,7 @@ - boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) - { - // DO NOTHING -- return 1; -+ return TRUE; - } - - diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch deleted file mode 100644 index 145d543..0000000 --- a/dev-games/irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 -From: hiker <henrichsjo...@mgail.com> -Date: Wed, 26 Feb 2014 11:13:03 +1100 -Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation - problems. - ---- irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h -+++ irrlicht-1.8.4/source/Irrlicht/COpenGLExtensionHandler.h -@@ -21,6 +21,7 @@ - #endif - #include <GL/gl.h> - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #endif - #include "wglext.h" -@@ -35,6 +36,7 @@ - #endif - #include <OpenGL/gl.h> - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #endif - #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) -@@ -48,6 +50,7 @@ - #define NO_SDL_GLEXT - #include <SDL/SDL_video.h> - #include <SDL/SDL_opengl.h> -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #else - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -@@ -60,6 +63,7 @@ - #include <GL/gl.h> - #include <GL/glx.h> - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h - #include "glxext.h" diff --git a/dev-games/irrlicht/irrlicht-1.8.4.ebuild b/dev-games/irrlicht/irrlicht-1.8.4.ebuild deleted file mode 100644 index 9f6a383..0000000 --- a/dev-games/irrlicht/irrlicht-1.8.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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-base/xorg-proto" - -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 - "${FILESDIR}"/${PN}-1.8.1-sysctl.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 -} diff --git a/dev-games/irrlicht/metadata.xml b/dev-games/irrlicht/metadata.xml deleted file mode 100644 index d7f0def..0000000 --- a/dev-games/irrlicht/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>ga...@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <longdescription> -The Irrlicht Engine is an open source high performance realtime 3D engine written in -C++. It is completely cross-platform, using D3D, OpenGL and its own software renderer, -and has all of the state-of-the-art features which can be found in commercial 3d -engines. -We've got a huge active community, and there are lots of games in development that use -the engine. You can find enhancements for Irrlicht all over the web, like alternative -terrain renderers, portal renderers, world layers, tutorials, editors, bindings for -perl, ruby, python, and so on. And best of all: It's completely free. -</longdescription> - <upstream> - <remote-id type="sourceforge">irrlicht</remote-id> - </upstream> -</pkgmetadata>
