diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 03:18:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 03:18:02 +0000 |
| commit | 63c0414ea0523576e5435115c813836fb90b4d89 (patch) | |
| tree | 66420dda3bfc3bf3ba55280d76e98ee4391c3b16 /dev-games | |
| parent | Add multilib deps for USE="mp3 scanner" #382125 by Jonathan-Christofer Demay. (diff) | |
| download | gentoo-2-63c0414ea0523576e5435115c813836fb90b4d89.tar.gz gentoo-2-63c0414ea0523576e5435115c813836fb90b4d89.tar.bz2 gentoo-2-63c0414ea0523576e5435115c813836fb90b4d89.zip | |
Fix building with libpng15 wrt #378287 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/irrlicht/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch | 40 | ||||
| -rw-r--r-- | dev-games/irrlicht/irrlicht-1.7.2.ebuild | 5 |
3 files changed, 48 insertions, 3 deletions
diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog index 1d8dc8aca2e3..eb26fed33bae 100644 --- a/dev-games/irrlicht/ChangeLog +++ b/dev-games/irrlicht/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-games/irrlicht # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.50 2011/04/12 06:40:10 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.51 2011/09/15 03:18:02 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> irrlicht-1.7.2.ebuild, + +files/irrlicht-1.7.2-libpng15.patch: + Fix building with libpng15 wrt #378287 by Diego Elio Pettenò 12 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> files/irrlicht-1.7.2-gcc46.patch: diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch new file mode 100644 index 000000000000..a1426bf2907b --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch @@ -0,0 +1,40 @@ +--- 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.2.ebuild b/dev-games/irrlicht/irrlicht-1.7.2.ebuild index fb89de0dab23..31c93b98a8c9 100644 --- a/dev-games/irrlicht/irrlicht-1.7.2.ebuild +++ b/dev-games/irrlicht/irrlicht-1.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.5 2011/04/08 03:21:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.6 2011/09/15 03:18:02 ssuominen Exp $ EAPI=2 inherit eutils toolchain-funcs @@ -33,7 +33,8 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-config.patch \ "${FILESDIR}"/${P}-demoMake.patch \ - "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-gcc46.patch \ + "${FILESDIR}"/${P}-libpng15.patch sed -i \ -e 's:\.\./\.\./media:../media:g' \ |