diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 10:43:37 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 10:43:37 +0000 |
| commit | 5468f55689134c912530c58c163c54124fed853b (patch) | |
| tree | a31468658f67d27f76b019c1c8f4299b047eac92 /media-libs/libkate | |
| parent | Add testing for dev-python/httplib2-0.6.0. (diff) | |
| download | gentoo-2-5468f55689134c912530c58c163c54124fed853b.tar.gz gentoo-2-5468f55689134c912530c58c163c54124fed853b.tar.bz2 gentoo-2-5468f55689134c912530c58c163c54124fed853b.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libkate')
| -rw-r--r-- | media-libs/libkate/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libkate/files/libkate-0.3.7-libpng14.patch | 38 | ||||
| -rw-r--r-- | media-libs/libkate/libkate-0.3.7.ebuild | 11 |
3 files changed, 53 insertions, 2 deletions
diff --git a/media-libs/libkate/ChangeLog b/media-libs/libkate/ChangeLog index 46b87e257c40..12dae231372a 100644 --- a/media-libs/libkate/ChangeLog +++ b/media-libs/libkate/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libkate # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/ChangeLog,v 1.45 2010/02/24 19:33:08 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/ChangeLog,v 1.46 2010/03/08 10:43:36 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> libkate-0.3.7.ebuild, + +files/libkate-0.3.7-libpng14.patch: + Fix building with libpng14. 24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> libkate-0.3.7.ebuild: Rename USE wxwindows to wxwidgets wrt #306291. diff --git a/media-libs/libkate/files/libkate-0.3.7-libpng14.patch b/media-libs/libkate/files/libkate-0.3.7-libpng14.patch new file mode 100644 index 000000000000..e93ac757b1e6 --- /dev/null +++ b/media-libs/libkate/files/libkate-0.3.7-libpng14.patch @@ -0,0 +1,38 @@ +http://code.google.com/p/libkate/issues/detail?id=15 + +--- tools/kpng.c ++++ tools/kpng.c +@@ -179,13 +179,13 @@ + } + } + +- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr,&info_ptr,NULL); + fclose(f); + + return 0; + + error: +- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); ++ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); + if (f) fclose(f); + return -1; + } +@@ -224,7 +224,7 @@ + if (w) *w=png_get_image_width(png_ptr,info_ptr); + if (h) *h=png_get_image_height(png_ptr,info_ptr); + +- png_destroy_read_struct(&png_ptr,&info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr,&info_ptr,NULL); + + /* now read the whole file as a binary blob */ + fseek(f,0,SEEK_END); +@@ -246,7 +246,7 @@ + return 0; + + error: +- if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:png_infopp_NULL,png_infopp_NULL); ++ if (png_ptr) png_destroy_read_struct(&png_ptr,info_ptr?&info_ptr:NULL,NULL); + if (f) fclose(f); + return -1; + } diff --git a/media-libs/libkate/libkate-0.3.7.ebuild b/media-libs/libkate/libkate-0.3.7.ebuild index 3746115c13c8..0d963ad791b0 100644 --- a/media-libs/libkate/libkate-0.3.7.ebuild +++ b/media-libs/libkate/libkate-0.3.7.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.3.7.ebuild,v 1.8 2010/02/24 19:33:08 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libkate/libkate-0.3.7.ebuild,v 1.9 2010/03/08 10:43:36 ssuominen Exp $ + +inherit eutils DESCRIPTION="Codec for karaoke and text encapsulation for Ogg" HOMEPAGE="http://code.google.com/p/libkate/" @@ -22,6 +24,13 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} wxwidgets? ( =dev-python/wxpython-2.8* media-libs/liboggz )" +src_unpack() { + unpack ${A} + cd "${S}" + has_version ">=media-libs/libpng-1.4" && epatch \ + "${FILESDIR}"/${P}-libpng14.patch +} + src_compile() { use wxwidgets || sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure econf $(use_enable doc) --docdir=/usr/share/doc/${PF} |