diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 09:14:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 09:14:02 +0000 |
| commit | 5ac13af81ce61c716bd11ba5250dc1ef926dc353 (patch) | |
| tree | f9bee231aa3baef52db271962dbb7d62dfc06575 /media-libs/libsfml | |
| parent | Fixed test faulure in case vips was build without tiff support, bug #381607#c... (diff) | |
| download | gentoo-2-5ac13af81ce61c716bd11ba5250dc1ef926dc353.tar.gz gentoo-2-5ac13af81ce61c716bd11ba5250dc1ef926dc353.tar.bz2 gentoo-2-5ac13af81ce61c716bd11ba5250dc1ef926dc353.zip | |
Fix building with libpng15 wrt #378411 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libsfml')
| -rw-r--r-- | media-libs/libsfml/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libsfml/files/libsfml-1.6-libpng15.patch | 20 | ||||
| -rw-r--r-- | media-libs/libsfml/libsfml-1.6-r1.ebuild | 10 |
3 files changed, 31 insertions, 5 deletions
diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog index 3364750b745d..5bd1ef63ec22 100644 --- a/media-libs/libsfml/ChangeLog +++ b/media-libs/libsfml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsfml # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.6 2011/09/10 10:56:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/ChangeLog,v 1.7 2011/09/14 09:14:02 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> libsfml-1.6-r1.ebuild, + +files/libsfml-1.6-libpng15.patch: + Fix building with libpng15 wrt #378411 by Diego Elio Pettenò 10 Sep 2011; Tim Harder <radhermit@gentoo.org> libsfml-1.6-r1.ebuild, +files/libsfml-1.6-gcc46.patch: diff --git a/media-libs/libsfml/files/libsfml-1.6-libpng15.patch b/media-libs/libsfml/files/libsfml-1.6-libpng15.patch new file mode 100644 index 000000000000..46be00ebd0e0 --- /dev/null +++ b/media-libs/libsfml/files/libsfml-1.6-libpng15.patch @@ -0,0 +1,20 @@ +--- src/SFML/Graphics/ImageLoader.cpp ++++ src/SFML/Graphics/ImageLoader.cpp +@@ -44,7 +44,7 @@ + void PngErrorHandler(png_structp Png, png_const_charp Message)
+ {
+ std::cerr << "Failed to write PNG image. Reason : " << Message << std::endl;
+- longjmp(Png->jmpbuf, 1);
++ longjmp(png_jmpbuf(Png), 1);
+ }
+ }
+
+@@ -289,7 +289,7 @@ + }
+
+ // For proper error handling...
+- if (setjmp(Png->jmpbuf))
++ if (setjmp(png_jmpbuf(Png)))
+ {
+ png_destroy_write_struct(&Png, &PngInfo);
+ return false;
diff --git a/media-libs/libsfml/libsfml-1.6-r1.ebuild b/media-libs/libsfml/libsfml-1.6-r1.ebuild index 73fddcc7594f..f16505362dfc 100644 --- a/media-libs/libsfml/libsfml-1.6-r1.ebuild +++ b/media-libs/libsfml/libsfml-1.6-r1.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/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.3 2011/09/10 10:56:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsfml/libsfml-1.6-r1.ebuild,v 1.4 2011/09/14 09:14:02 ssuominen Exp $ EAPI=4 @@ -18,7 +18,7 @@ IUSE="debug doc examples static-libs" DEPEND="media-libs/freetype:2 media-libs/glew - media-libs/libpng + >=media-libs/libpng-1.4 media-libs/libsndfile media-libs/mesa media-libs/openal @@ -31,9 +31,11 @@ RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} src_prepare() { - epatch "${FILESDIR}"/${P}-destdir.patch \ + epatch \ + "${FILESDIR}"/${P}-destdir.patch \ "${FILESDIR}"/${P}-deps-and-flags.patch \ - "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-gcc46.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_compile() { |