diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libkate/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libkate/Manifest | 5 | ||||
| -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 |
4 files changed, 56 insertions, 4 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/Manifest b/media-libs/libkate/Manifest index 7ac6ea934e67..8a6f5a353a03 100644 --- a/media-libs/libkate/Manifest +++ b/media-libs/libkate/Manifest @@ -1,4 +1,5 @@ +AUX libkate-0.3.7-libpng14.patch 1083 RMD160 7c44551df5ff7dfaff645cc54b722eea879498ea SHA1 8306759bf08334a6d3116d4f85d71efc739e0d88 SHA256 66ef41f59aeabae04cc36dc865c00120419879281cd9e42aae5fad775b711537 DIST libkate-0.3.7.tar.gz 728239 RMD160 c3a09bb5804364522ea52db355edadf9b25c5975 SHA1 08ab5837d12b09ff36c213be17cfb0597dd8d9b0 SHA256 b9af203bb731de961807ad13820911fab57230d42da877336cf98c12c11c3c51 -EBUILD libkate-0.3.7.ebuild 1060 RMD160 59bd4edc43cd77fb1dd871f816d48ff39a4ae725 SHA1 0d7f9cb19c0bc9dfd3df2caa30e96bf731d7f2dd SHA256 f0e510e1c773d49bb16ec6fa1264a52225e97e3454847a652eeeb4b53d7fdb15 -MISC ChangeLog 5806 RMD160 da8fa3554cd8acd6d011f0c30042938803c39467 SHA1 5fa256b9c50ce5259786d89a6fcff9c34521b52b SHA256 e010e92aebbc5f2fc0035881042e86d8d7a6d19dd084997043cfe707d65802d2 +EBUILD libkate-0.3.7.ebuild 1205 RMD160 f6b0fb7a8f71e7833b62258f51ce4aab2e6174ad SHA1 f6bc03d074a883dbdd57a1b0c6c2f469d3049d34 SHA256 eae26d2646410e7d2e87b487fc8e6bbf988d9cc58a518e773280496ba5e32515 +MISC ChangeLog 5952 RMD160 888ac46f906acc9f9d503cddf4e458317ad1bcfc SHA1 2143bad64b5d36ef6165fa6119062ff7f0540e1b SHA256 38955cda92ebef5825e1ddc6fc1704061e5def343848f1fd7aeb3d7279887472 MISC metadata.xml 895 RMD160 965d9cb4ddffaeb63805c6f45c3633cf64d45350 SHA1 74d627d9ef6d081e81589767d33a2724c258f7ad SHA256 c21a36a5f2d2c114213f7ab83d9dc6c5bbbce8f31969f1d31bb0270ea6302d85 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} |