fix build with libpng 1.5

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

4 files changed, 37 insertions, 8 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index ea242d4acb0f..277961cff3ef 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xine-ui
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.173 2010/05/30 18:41:54 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.174 2011/02/16 14:56:39 aballier Exp $
+
+  16 Feb 2011; Alexis Ballier <aballier@gentoo.org> xine-ui-0.99.6.ebuild,
+  +files/xine-ui-0.99.6-libpng15.patch:
+  fix build with libpng 1.5
 
   30 May 2010; Raúl Porcel <armin76@gentoo.org> xine-ui-0.99.6.ebuild:
   alpha/sparc stable wrt #317143
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 29d25b5b4c92..84a2951759bb 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xine-ui-0.99.6-libpng15.patch 573 RMD160 ccc7e340d16900ea238ae1f2fb948982a67baa86 SHA1 bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14 SHA256 dacd942a6a07cfb72858c2ad1fcd43382513c24575e5a8f96a016a5ccb4b8117
 DIST xine-ui-0.99.6.tar.xz 1797144 RMD160 b5d27f112d2ebb861d18be684c17c5fe0e7b7fbd SHA1 abbdb331898c14025ee6b132f63ab7d3c1b5b31e SHA256 4eb1e3eb6c2ebba70f2e215a15d8b99bb3e2b0449c94105dc16e963a99a59ef3
-EBUILD xine-ui-0.99.6.ebuild 2216 RMD160 25be9ba264121b2c44b6faeec56367f926d06000 SHA1 77c0d7aeb4a4922342bd0ab03dc22f26f3c74022 SHA256 0c818b172bf00c5d77dceba8c63252671e76f752a84b0495be0ffb3e59796744
-MISC ChangeLog 26531 RMD160 7dbdc015ce4d505f9aeb262eee31b74f8f85034b SHA1 4b5f87ce649c487a54d7fcf7183b25cbd6118a1a SHA256 c5593ad864a2be8305a81b4d3b6436deb3cccafdb4c20d6d0eb79df443bdc1e8
+EBUILD xine-ui-0.99.6.ebuild 2263 RMD160 5b4096c2a2818ed943806085ff394bc2e2b17a44 SHA1 1600de3cce949e42684450e2ff5d17dfe72058b5 SHA256 a6b0188daad5e60ea82a3880062f84091b6fb80d026cb150a7e8b69850e20db0
+MISC ChangeLog 26676 RMD160 917365c632d09875ae16225ac783adb66ace26d2 SHA1 ce65f236fbc621b31524d88e7b5e7112849d706b SHA256 0796b42d66dc78e084b4afd2efabe05b6a761c7203cbb353febded061f70d7c6
 MISC metadata.xml 314 RMD160 2d0d208be3d3423e72e81e07d4e52855d84decdc SHA1 4a5be7be171c292f138e645ecc3719912e00375e SHA256 7d249cbdf83d624b16eca3d7a1dd04db70b4f168197c904397d76f86200e96da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1b5a0ACgkQvFcC4BYPU0onBQCeJI8EjHJ+BMFlx7Bntg4/fFp7
+qKwAn2Y+X0wIZ6wA9emr1yCMU8SLOk1V
+=FUWo
+-----END PGP SIGNATURE-----
diff --git a/media-video/xine-ui/files/xine-ui-0.99.6-libpng15.patch b/media-video/xine-ui/files/xine-ui-0.99.6-libpng15.patch
new file mode 100644
index 000000000000..6a5fb5522bd7
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.6-libpng15.patch
@@ -0,0 +1,13 @@
+Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c
+===================================================================
+--- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
++++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c
+@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id,
+       png_destroy_read_struct(&png_ptr, NULL, NULL);
+       return NULL;
+     }
+-  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
++  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
+     {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       return NULL;
diff --git a/media-video/xine-ui/xine-ui-0.99.6.ebuild b/media-video/xine-ui/xine-ui-0.99.6.ebuild
index 478857810ba6..06251da64a4e 100644
--- a/media-video/xine-ui/xine-ui-0.99.6.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.6.ebuild,v 1.11 2010/05/30 18:41:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.6.ebuild,v 1.12 2011/02/16 14:56:39 aballier Exp $
 
 EAPI=3
-inherit fdo-mime gnome2-utils
+inherit fdo-mime gnome2-utils eutils
 
 DESCRIPTION="Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
 
-RDEPEND=">=media-libs/libpng-1.2.40
+RDEPEND=">=media-libs/libpng-1.4
 	>=media-libs/xine-lib-1.1.17[aalib?,libcaca?]
 	aalib? ( media-libs/aalib )
 	curl? ( >=net-misc/curl-7.10.2 )
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	rm -f misc/xine-bugreport
+	epatch "${FILESDIR}/${P}-libpng15.patch"
 }
 
 src_configure() {