xine-ui fix for libpng 1.4

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 27 insertions, 10 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 1f0c05d4256a..0aa80c649309 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xine-ui
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.165 2008/10/15 12:01:34 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.166 2010/02/15 22:28:19 hanno Exp $
+
+  15 Feb 2010; Hanno Boeck <hanno@gentoo.org> xine-ui-0.99.5-r2.ebuild,
+  +files/xine-ui-0.99.5-libpng14.patch:
+  Fix for libpng 1.4.
 
   15 Oct 2008; Diego Pettenò <flameeyes@gentoo.org>
   xine-ui-0.99.5-r2.ebuild:
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index fb44688981bc..4d92713fc525 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xine-ui-0.99.5-libpng14.patch 366 RMD160 8ee1438d54c717f5ba87452a86aa789a7c456389 SHA1 88083818f8ff9eb71be484e5e4fdcabda925c9d8 SHA256 e500592651266debc8e7e1d6e319a5e9bd5597592fd2d2cab7976c6d5d446f38
 AUX xine-ui-0.99.5-new_libcaca_api.patch 1330 RMD160 3db1bca5b148e4ee035bcc3fd630f430bef75395 SHA1 3405a375e1618f510b6ca15fb161fd3e55ce75b1 SHA256 376efa9b23ff2a0de79e64943818b1f041ba6b4bafd76257a37edfb27bd0743d
 DIST xine-ui-0.99.5.tar.gz 2606481 RMD160 64cb69549d88d904d986ea7dd7b36a51d5b91756 SHA1 4f452516319f31cda01d08ea2779f195933af0bb SHA256 1368aa9cfd70433d14efde5bf0e70911f80f9463a026192c1f133a339be25e1e
 EBUILD xine-ui-0.99.5-r1.ebuild 2609 RMD160 750093e85741edb95d58bf75ea34a14fd6ee7e03 SHA1 522fa58f9bb53a110082af8415512a98013ee1d7 SHA256 8165fc350abf55170a244c90143328b585cc351d06b08aee9a3b1c8eefc01bdb
-EBUILD xine-ui-0.99.5-r2.ebuild 2062 RMD160 f5b8fe72837519acf5bc5412ec2c58c94efb3b40 SHA1 1aaa489ff5e952937272489155f32ac5c09e85d7 SHA256 bc982850d6259ac1da4596c501eedc8957a5ccde028e24ac0a5e169b607f920f
-MISC ChangeLog 25610 RMD160 54e0875a628b3e29d9b3c70aa9b1bc1c3fb0f1ba SHA1 dba3aa5de1f21c076b29c5c12c2861ded4f975c8 SHA256 33e463dbdd0de8fbe0d8cafb3d01a43ced1b121e04c2e2b195f8050cbe78f5cd
+EBUILD xine-ui-0.99.5-r2.ebuild 2100 RMD160 c30588b7546952b850568ed125d9b0c4f48115a8 SHA1 8138f611f65aa7aefbeb0cb9965de07ca56422d3 SHA256 e54cb620eff7e8cfee0bf9becca4bd706d6637ddbfb6d0db0fc2bd8ff97d2342
+MISC ChangeLog 25741 RMD160 19cf491aac90c6e889c32569f804e09fd963f4ca SHA1 6e8422cbc997eaa0c68bd8f4f4d56cb0fed8b1e9 SHA256 f4efbc7591ec356442fe6fc2f3037a9effe5090fe0672a192915fbe8a961ce35
 MISC metadata.xml 314 RMD160 2d0d208be3d3423e72e81e07d4e52855d84decdc SHA1 4a5be7be171c292f138e645ecc3719912e00375e SHA256 7d249cbdf83d624b16eca3d7a1dd04db70b4f168197c904397d76f86200e96da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkj126QACgkQAiZjviIA2XhGHgCbB3YPIYDjeILTB/IA/f1TdrUe
-cCEAn1RiUPw+9f48hfAifocDyWSJZ1KZ
-=TN5g
+iEYEARECAAYFAkt5yogACgkQr2QksT29OyDM+ACgiWsKdBl/Pmab9BBnqeSAasCy
+6i0An0mOn/HuQyUa0NuNxQ28v6kot6gl
+=1VFW
 -----END PGP SIGNATURE-----
diff --git a/media-video/xine-ui/files/xine-ui-0.99.5-libpng14.patch b/media-video/xine-ui/files/xine-ui-0.99.5-libpng14.patch
new file mode 100644
index 000000000000..4f0d5e14a8f0
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.5-libpng14.patch
@@ -0,0 +1,11 @@
+--- xine-ui-0.99.5/src/xitk/Imlib-light/load.c	Mon Jul 14 22:44:10 2003
++++ xine-ui-0.99.5-new/src/xitk/Imlib-light/load.c	Sat Jan 30 04:37:54 2010
+@@ -193,7 +193,7 @@
+     return 0;
+   fread(buf, 1, 8, f);
+   rewind(f);
+-  return (int)png_check_sig(buf, 8);
++  return (int) !png_sig_cmp(buf, 0, 8);
+ }
+ 
+ ImlibImage * Imlib_load_image(ImlibData * id, char *file) {
diff --git a/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild b/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild
index dca9792678e9..f4e38bc532fe 100644
--- a/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild,v 1.2 2008/10/15 12:01:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild,v 1.3 2010/02/15 22:28:19 hanno Exp $
 
 EAPI=2
 
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-new_libcaca_api.patch"
+	epatch "${FILESDIR}/${P}-libpng14.patch"
 	AT_M4DIR="m4" eautoreconf
 
 	rm misc/xine-bugreport