diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-31 00:19:09 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-31 00:19:09 +0000 |
commit | 3323d1a6a299c48f796be491e907d830c4f8c6a8 (patch) | |
tree | 6d2e394849be0007f60ffdff3bc8d6237f074949 /dev-games/irrlicht | |
parent | old (diff) | |
download | historical-3323d1a6a299c48f796be491e907d830c4f8c6a8.tar.gz historical-3323d1a6a299c48f796be491e907d830c4f8c6a8.tar.bz2 historical-3323d1a6a299c48f796be491e907d830c4f8c6a8.zip |
old
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Diffstat (limited to 'dev-games/irrlicht')
-rw-r--r-- | dev-games/irrlicht/ChangeLog | 8 | ||||
-rw-r--r-- | dev-games/irrlicht/Manifest | 8 | ||||
-rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.7.3-config.patch | 29 | ||||
-rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch | 572 | ||||
-rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch | 46 | ||||
-rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch | 40 | ||||
-rw-r--r-- | dev-games/irrlicht/irrlicht-1.7.3.ebuild | 60 |
7 files changed, 8 insertions, 755 deletions
diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog index f6eb9c8d0759..93ea46cbd149 100644 --- a/dev-games/irrlicht/ChangeLog +++ b/dev-games/irrlicht/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-games/irrlicht # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.60 2013/01/26 11:49:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.61 2013/01/31 00:15:24 mr_bones_ Exp $ + + 31 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> + -files/irrlicht-1.7.3-config.patch, -files/irrlicht-1.7.3-demoMake.patch, + -files/irrlicht-1.7.3-gentoo.patch, -files/irrlicht-1.7.3-libpng15.patch, + -irrlicht-1.7.3.ebuild: + old 26 Jan 2013; Agostino Sarubbo <ago@gentoo.org> irrlicht-1.8.ebuild: Stable for ppc, wrt bug #453388 diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest index 12722755a0d2..c8e2787f16e7 100644 --- a/dev-games/irrlicht/Manifest +++ b/dev-games/irrlicht/Manifest @@ -1,13 +1,7 @@ -AUX irrlicht-1.7.3-config.patch 1452 SHA256 462261491e7e07656b2bccf5ffef3cb5a04326e4ec43416391758adbfc0f81c4 SHA512 a6d7f4b8a7f1a962e57c99756655a757dda253d7d54ea5d2db55476ef90a4ec30bf9a343ff0b4d04a0b3f780b2a7f791e09bd3740bcb7e642ed95d22f64bc884 WHIRLPOOL 6405eb52832672c2e2133958efbcc082d893480dae8ef7f20fc657415a817625589f7180d4a242064e3aef51872c5569c06c85bded7e2e0c54ed453e79bc0dd2 -AUX irrlicht-1.7.3-demoMake.patch 19873 SHA256 f4686dceb39913fb26035f970e999dff7b8dd82e87de6b999f3dfb5aacf846d0 SHA512 f7f931f46239e2f63fcf408f5b8edabd477614fd8893fc3a15a0105790f99f8dc3107544faa2a6281ac909184137c2e85ed42428cdf5dba3ebf70e41d0af057d WHIRLPOOL 441a95a9624002b8c8ba99eb6b03723c67117d4ccb497afde833b89b496f0fe8b640f88dd1caa525f3710375b3ca313c5635b83708ad2ccd420eac91382ced02 -AUX irrlicht-1.7.3-gentoo.patch 3719 SHA256 2f9424314ed9b1845741f0df85839cf5293de74dcb796a67c7f0dd6e74613fa0 SHA512 5abd64f0f832d7cff834d38044e51ee5c1c3e3a8569b21bed7418c2fdf1190bc8ee2d75ea53a7243c612c2d63629d39c560e2b1ab731c615887977702319fa72 WHIRLPOOL 3f05bf15e3ae0f0dee81908f8850d611a51e924e81e09bfe37622124ff0c682accad4ba79ddc7a1c0aa56b76d0fc13dd236603656741fb29460290029d882626 -AUX irrlicht-1.7.3-libpng15.patch 1205 SHA256 79d71023e8af56aca5a9c6e2402163f9da547d5b62f8dcf8633b855d47add9a5 SHA512 c7a2c14b71a9a425282f79630288e8d1173f1c993ed630cec335aa795813816878f0a903c36cddbe32eb9662d43d6fb4d829bf6b5c592d044cc0115e341de601 WHIRLPOOL 3aff335547905cdd5d4052ecaed7f4046fd685f6f5aea93fb55eb86917095a383a753bec90df53e81a4ee3090585b15662044991a282b9a995ac30ad7932409b AUX irrlicht-1.8-config.patch 1302 SHA256 34e1b4184cb499ef8d245b8f97e8a4e8cd88f03f4eecddeff661c97a44f24ab2 SHA512 3c08639425517af9e0dcad919b80ce049e42ded399bf81354f824c425e4355c033b4574f0e76a926cbccc471b06e80ac73ae94232fa1db2b3d2f7da3fa5a840d WHIRLPOOL e9d2f51fc9665826170123daab4d1d4691e6740d2ce92d676ccb18df432ce7c3dfa2a2134b2543cb42968d1a0acfe97c1ac4a775c460c93cf7ac46865b68a633 AUX irrlicht-1.8-demoMake.patch 27382 SHA256 e8d5ee8145f4bda5ee2ff78b9300a2f47e1c287481cbc490a382e74813fcea61 SHA512 72ef258a578620c2b927ca258b105e25fd96971a63d82715a3a68363aa335c0ff6bf0e983c6b1385a6fd9c9c1505e9472970cd3c3b48c2c592d6ca09f897971f WHIRLPOOL c1e4f4419dcae706e5c9189672505b8572ed813eaa4efed2a6f82c89d59d1d2d9777fbd5f0e1904cce7c955db8f924ef1da873cc0621be88167191d2fea7227b AUX irrlicht-1.8-gentoo.patch 3432 SHA256 45dd91f42f88677f475d466a02c786e3d8e0729fb7da8e8285584f1e33729f2f SHA512 3a4b7a16ce6900e9afef9fdc2fdcd766155d593febc85093da840e683a1c147dc5a664e9581a87b5707fa36deb9e749c2daeb5e4d9929af07f4429dc5518d1af WHIRLPOOL 3bc3e9817958bb0f1c8816bb92ef1639b6a98280c0a34c758e4da3a2e255e03c234b2884927ffef05c92d640d92c109646e6a6f93c6c4d9a031390a16f5fd5af -DIST irrlicht-1.7.3.zip 16344294 SHA256 7230c1210a169944f815a79a975fabf2c0db0d3181dd62345b9fac9095ae026d SHA512 554c1b09ea9f591eb8f4346b8b66df15d3bd7339f29bfaadc076121ba7a5771116f15ec977e4fd226b346dd8c176dc7903dcfb4002c0a5a80671cbaafe54cab8 WHIRLPOOL 53bcdb60a2ed38e04cc77a91d6f61d8a5c0725a6c91b900748d7b8435a1b3e89ba33b41874d0f57c763a33e4617e79fac8f9e2890728a08f451e6448e4962d85 DIST irrlicht-1.8.zip 23674513 SHA256 f8756c3cf83f16f41eb1eca8f4ebb530f0e8fd572443905e3d8eb8f09445a642 SHA512 07aa6e49252f073e352fbd715b77d171b6d25d22e6b0faccaf7328b28693e6851f37498cfb4094f7b09d122170c491571431bf8f698828e82c2aa9d7ff792af7 WHIRLPOOL b021cc06fb216a9add40ad70beac22f41f2902f0b053713491c80057c04f05f9f45e19c282c109850235d7db89675ffaa7f5170b0b83f2b8918a0915ee43837d -EBUILD irrlicht-1.7.3.ebuild 1413 SHA256 c8c63650da7108dc768c632c384b0fed96dd41442be653fa1422ec4d52f95825 SHA512 c7f29f50d846c81492e17cc8c2cd01b5516c6b7a4dd43b05bbd777580c96ace310ac3cb1287b95dfb78c390970b6a09bc3a65536d2596bc6f97a596ac8e9c328 WHIRLPOOL 0e449e2236107ac21d600124eb9ec3de2a9a2a1ff9e1f285e5b5de171f6eb617b18192308f0af3f6f0ec4439871d00b8368ea9885584b0f2db4e7db1fd47f98f EBUILD irrlicht-1.8.ebuild 1600 SHA256 3d3a92d1c5c06149036a64c389c8247853d2125f8d3967b00f402ae6e233e38e SHA512 0458b893621fb811c2a615b2b9afae806b16714ad11c35025e771ff7650513d2ff54345dc4733c266d4a6e525324d7419347193b5d41512596d3f89ee97bdbea WHIRLPOOL 8eb1c66dc9e0f244242d27883f1e0cee6966f93083996ed8f6890bfb75879bc324d3238bc8e16c1d684e576c9f86ea78c293b0d3873bfe3cdb48ba720c345afe -MISC ChangeLog 9833 SHA256 ded0aee3c3b61cf7a063702512ce4e96788fac01946ac2aaa289fbac4eb25cc6 SHA512 d2ba172026b52a37f7fe4922a44a9c1ac0b02af3b13bf6e8b41c60205e560da7505fa54a991499e133c490134de560e07c8ad14e0ccd7fe74751f8a25644fd5a WHIRLPOOL dccfe92c3926ee8b40b052f0ec918d8d0b72417c40565b7b93cf116652644727c4f5bb8b2b8e496957f105c3890ad74449666971fbaf73178bd196f710eb3a5c +MISC ChangeLog 10079 SHA256 fbc59b1e3e3207a86e213dbedb308547dc9b53cd285dbe49f4e27f624bf79722 SHA512 02aea934a14f46f859b6c7a6ecb7b535feb1dd96d8e1f4c13b385437654f0e2db5187c965bc237b4b65589e1e85bedd96b9eed9957d7d312fec9d30b9f19369b WHIRLPOOL 677aed565d6a71c2ac29047c0173c76e236359e618a2dfdb4a44d4e95b38bb14784fb2bf7d50b84478e50985ffc1c06322e57a2596e9c3335f85d40e6ea8744c MISC metadata.xml 790 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc SHA512 d4006cf3f5afcb96934d074360aaa49e35249ecf346965bd170704947ae6a194ef6daa8f4bff7cf473bbbab4f658f978a5398e3a1efda8ce034314637903719a WHIRLPOOL 6cc67212be3a7109e97e0fa471f83ea6d73e01d5ac49f45e62b89d6dbd28d2e861d4179a22f5a7ac53fe0835c7b9d92d2d22c56e9b07a8ac72b189db1e318d0b diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch deleted file mode 100644 index da553ed8ab58..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- include/IrrCompileConfig.h.old -+++ include/IrrCompileConfig.h -@@ -176,7 +176,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_ - - - //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng. -@@ -187,7 +187,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_ - - - //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9 -@@ -348,7 +348,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_ - //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives - #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ - //! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch deleted file mode 100644 index a8f4aace8d0a..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.7.3-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/files/irrlicht-1.7.3-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch deleted file mode 100644 index e23c98f243ae..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- irrlicht-1.7.2.orig/source/Irrlicht/CImageLoaderPNG.cpp -+++ irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp -@@ -162,7 +162,7 @@ - if (BitDepth < 8)
- {
- if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA)
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- else
- png_set_packing(png_ptr);
- }
---- irrlicht-1.7.2.orig/source/Irrlicht/Makefile -+++ irrlicht-1.7.2/source/Irrlicht/Makefile -@@ -39,11 +39,7 @@ - IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.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 =
-@@ -54,18 +50,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
- ifndef NDEBUG
- CXXFLAGS += -g -D_DEBUG
--else
--CXXFLAGS += -fexpensive-optimizations -O3
- 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
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch deleted file mode 100644 index a1426bf2907b..000000000000 --- a/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- source/Irrlicht/CImageLoaderPNG.cpp -+++ source/Irrlicht/CImageLoaderPNG.cpp -@@ -28,7 +28,7 @@ - static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file reading
-@@ -37,7 +37,7 @@ - png_size_t check;
-
- // changed by zola {
-- io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;
-+ io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->read((void*)data,(u32)length);
- // }
-
---- source/Irrlicht/CImageWriterPNG.cpp -+++ source/Irrlicht/CImageWriterPNG.cpp -@@ -35,7 +35,7 @@ - static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file writing
-@@ -43,7 +43,7 @@ - {
- png_size_t check;
-
-- io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;
-+ io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->write((const void*)data,(u32)length);
-
- if (check != length)
diff --git a/dev-games/irrlicht/irrlicht-1.7.3.ebuild b/dev-games/irrlicht/irrlicht-1.7.3.ebuild deleted file mode 100644 index 55acb2faf608..000000000000 --- a/dev-games/irrlicht/irrlicht-1.7.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.3.ebuild,v 1.4 2012/08/08 19:51:00 ranger 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/irrlicht/${P}.zip" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc" - -RDEPEND="virtual/jpeg - media-libs/libpng - app-arch/bzip2 - virtual/opengl - x11-libs/libX11" -DEPEND="${RDEPEND} - app-arch/unzip - x11-proto/xproto - x11-proto/xf86vidmodeproto" - -S=${WORKDIR}/${P}/source/Irrlicht - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - cd ../.. - edos2unix include/IrrCompileConfig.h - epatch \ - "${FILESDIR}"/${P}-config.patch \ - "${FILESDIR}"/${P}-demoMake.patch \ - "${FILESDIR}"/${P}-libpng15.patch - - sed -i \ - -e 's:\.\./\.\./media:../media:g' \ - $(grep -rl '\.\./\.\./media' examples) \ - || die 'sed failed' -} - -src_compile() { - tc-export CXX CC AR - emake sharedlib staticlib || die "emake failed" -} - -src_install() { - cd ../.. - dolib.a lib/Linux/libIrrlicht.a || die - dolib.so lib/Linux/libIrrlicht.so* || die - insinto /usr/include/${PN} - doins include/* || die - dodoc changes.txt readme.txt - if use doc ; then - insinto /usr/share/doc/${PF} - doins -r examples media || die - fi -} |