Add libpng-1.5 patch. Thanks to Samuli Suominen <ssuominen@gentoo.org>. Bug #384481

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

diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index 23419e9d502d4748fa5b75bdf29e22e39690cf32..cabfef79a1f8ddf78b62c1366fed8781c0bee00f 100644 (file)
--- a/sys-apps/tuxonice-userui/ChangeLog
+++ b/sys-apps/tuxonice-userui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/tuxonice-userui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.21 2011/08/15 11:33:07 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.22 2011/09/26 15:34:41 hwoarang Exp $
+
+  26 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
+  tuxonice-userui-1.0.ebuild, +files/tuxonice-userui-1.0-libpng15.patch:
+  Add libpng-1.5 patch. Thanks to Samuli Suominen <ssuominen@gentoo.org>. Bug
+  #384481
 
   15 Aug 2011; Krzysztof Pawlik <nelchael@gentoo.org>
   tuxonice-userui-1.0.ebuild:

diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
index fca755ced28484b7dd406e9368248c43db7bcf0c..51c506ddbf4b8996129b356e4b43284762f8a60d 100644 (file)
--- a/sys-apps/tuxonice-userui/Manifest
+++ b/sys-apps/tuxonice-userui/Manifest
@@ -2,18 +2,25 @@
 Hash: SHA512
 
 AUX tuxonice-userui-1.0-Makefiles.patch 1438 RMD160 4178677bbf596c2db145dfc4de8bf6840ac7a5b5 SHA1 7f4a0894eba5463757d1f6a8918bd0f70fd620da SHA256 a615252845a09af805b12c987cad459162dc98b6987c25123e68113d12339223
+AUX tuxonice-userui-1.0-libpng15.patch 3368 RMD160 536b3477ebb995de71b0e9f7ec7d0a5685fe8ad4 SHA1 2d2615bfc213d21d251ca1a5c299a343e15ddebe SHA256 c6b46ca700a70359755dafa9536daa4c7aca1c2fa5e12e9e0df1d220e8a31341
 DIST tuxonice-userui-1.0.tar.gz 66922 RMD160 b6e7708e5f1f3368c96833346e19d2c9127a99c5 SHA1 31f0bf3f7dff1d8eff153e5027886bee677e181d SHA256 2da4a5eb4597fce89a43cac5e794e19a000e324a5873a54c6b0848e1b481942f
-EBUILD tuxonice-userui-1.0.ebuild 1716 RMD160 5a622ed8fdaf3f2dde78160dffd51525ee7bed4d SHA1 22c5d992e4a83ddb8e7a619891a1d730de9124f5 SHA256 98d959b668b6318a3b4c97e57d86f6970a62017529770b22c23ffb2c3c0a2c1c
-MISC ChangeLog 8017 RMD160 59b5567a561120a6fd09213a845bcc03cff87e71 SHA1 18b44934f92bc3360bb88acfaa24e3b2dd7a3381 SHA256 97a7506099e4fb97ffa4699782669b202c687ac8fc42b3ea85183c5310417ce5
+EBUILD tuxonice-userui-1.0.ebuild 1718 RMD160 c823068a4f49185f8828b59ca5132d03bd1d9d69 SHA1 511715b7bb72754c72bbf0cd3003530260f6df07 SHA256 44f13b0bdce1e77ee31a30bd5474958901c37ebfcb8f2ea95fcb8019b500a47f
+MISC ChangeLog 8232 RMD160 652847efe64f0e3681d92cbeea655a5936e0810d SHA1 2be7929e775059327ff4a3770b436a426bcabc2a SHA256 d616aff202bad003a81d608b558e0bc77b5bc9147b2803d5285250eeb423d78f
 MISC metadata.xml 339 RMD160 fb235b57aa04c8d6aed76a25d85f1c4af05286ff SHA1 2667b453daf29896079179e8aea974a96d0dc1f4 SHA256 1fb14f262f3b9470228ed11d8f9e05ed83a10f4dd643cea230075b9a33d873a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOSQQCAAoJEBZyv1r2qA5GS8sIAJFJILGWZyKuneBnSL/pF931
-+suVwTLtkIZyR1xF9n44i6X+97+f/bGNyaEBLEV/JFoV0iLwRiJONHh+rCYnYl+V
-g3vY5OC+R2KrwUSZ4UhXMIdIG3DQ/VPQ9FHME2tI1Gsxx3lcDBPPQNyV3LM02lzw
-uVbZdHdeH+t7ShoNI2EGw9/wdSSeZP5c71K00Yr8kpxlQvFtayQrw4MReqRvRzwn
-G9qTVz2zePvqcvOtrSDa4BRnYCFHvhSaLkD97vktxyjcC2BTZQU2YQPplCQYZ1vc
-rpwdWE9ROORVFYyac9T2hXZZCWaK6NV1ysda0HPMRMYLT+yv+S7RKuEVtH4Lu4c=
-=1QXV
+iQIcBAEBCgAGBQJOgJtnAAoJEPqDWhW0r/LCkbUP/1I1u7rTOaLJ6sadkagvUI8e
+krhsDScGtq3R7YR1vrPoVnyb9bSr+yMU7t6yzyE9PtRknYLzVhJ+6jZxM7OlzGNH
++1XSsWw9hq30Gwa8TiTwCXRaNuW9U75gDEn2SSPv30uLcif1boms4cLOeibBXj9w
+7LQY+x4hFYhkE6P8+/60OzyeXuht20LA6zQIYteqcDvGHv0imnyAPz500ld2o3zE
+upAqlGxfRic7l9xajlUx0H8Lkes072CUmMA8ELokqADF/Hz7DqJFXA7yrCv22u+U
+0HVjd5P1Eooe4E1WlQ1t0dCG3vgdAKmiCW1NmkDT0lDtCd3TPm4an1HiLBcK1XZ8
+sQVPJKbz/whdBdqk7LweizH4S9FtOuYm0fxp+EuAZMbX2S/27FwZmbjX6f3vvLXi
+6JerZKxOCvS8oE9ltbHGHdZC96gsah5SHOv6TfZbvMAdpMj7ljjPVcshMvahFpBR
+a473yV21r/LO9rhTDcnb5Yg/XndrH3tFLWDpX9EMp9sFsM/QLB8kkgJ+/DHmTU9/
+KNQUUNs5s6GG0652giwJ3RxoLMes8TEitgmkDxzOCeylkA5TUaClqE0mrmBmYp3U
+v7YudCAxjbdvD3MoqzDNOLYJwpyiW4bLyCEL7RUbuqXiRnztRvJrWlnl1T6o4bWj
+OdWYq5Gl0QFwYRHbp+X0
+=ILrO
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-libpng15.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-libpng15.patch
new file mode 100644 (file)
index 0000000..bfe6d0a
--- /dev/null
+++ b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-libpng15.patch
@@ -0,0 +1,88 @@
+--- fbsplash/image.c   
++++ fbsplash/image.c   
+@@ -112,29 +112,29 @@ 
+       png_init_io(png_ptr, fp);
+       png_read_info(png_ptr, info_ptr);
+ 
+-      if (cmap && info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) {
++      if (cmap && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) {
+               printerr("Could not read file %s. Not a palette-based image.\n", filename);
+               goto failed;
+       }
+ 
+-      if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+-          info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++      if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY ||
++          png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
+               png_set_gray_to_rgb(png_ptr);
+ 
+-      if (info_ptr->bit_depth == 16)
++      if (png_get_bit_depth(png_ptr, info_ptr) == 16)
+               png_set_strip_16(png_ptr);
+ 
+-      if (!want_alpha && info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
++      if (!want_alpha && png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
+               png_set_strip_alpha(png_ptr);
+ 
+ #ifndef TARGET_KERNEL 
+-      if (!(info_ptr->color_type & PNG_COLOR_MASK_ALPHA) & want_alpha) {
++      if (!(png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA) & want_alpha) {
+               png_set_add_alpha(png_ptr, 0xff, PNG_FILLER_AFTER);
+       }
+ #endif
+       png_read_update_info(png_ptr, info_ptr);
+ 
+-      if (!cmap && info_ptr->color_type != PNG_COLOR_TYPE_RGB && info_ptr->color_type != PNG_COLOR_TYPE_RGBA) {
++      if (!cmap && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGB && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGBA) {
+               printerr("Could not read file %s. Not an RGB image.\n", filename);
+               goto failed;
+       }
+@@ -150,12 +150,12 @@ 
+ 
+       rowbytes = png_get_rowbytes(png_ptr, info_ptr); 
+ 
+-      if ((width && *width && info_ptr->width != *width) || (height && *height && info_ptr->height != *height)) {
++      if ((width && *width && png_get_image_width(png_ptr, info_ptr) != *width) || (height && *height && png_get_image_height(png_ptr, info_ptr) != *height)) {
+               printerr("Image size mismatch: %s.\n", filename);
+               goto failed;
+       } else {
+-              *width = info_ptr->width;
+-              *height = info_ptr->height;
++              *width = png_get_image_width(png_ptr, info_ptr);
++              *height = png_get_image_height(png_ptr, info_ptr);
+       }
+ 
+       *data = malloc(fb_var.xres * fb_var.yres * bytespp);
+@@ -171,11 +171,11 @@ 
+               goto failed;
+       }
+       
+-      for (i = 0; i < info_ptr->height; i++) {
++      for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) {
+               if (cmap) {
+-                      row_pointer = *data + info_ptr->width * i;
++                      row_pointer = *data + png_get_image_width(png_ptr, info_ptr) * i;
+               } else if (want_alpha) {
+-                      row_pointer = *data + info_ptr->width * i * 4;
++                      row_pointer = *data + png_get_image_width(png_ptr, info_ptr) * i * 4;
+               } else {
+                       row_pointer = buf;
+               }
+@@ -184,7 +184,7 @@ 
+               
+               if (cmap) {
+                       int h = 256 - cmap->len;
+-                      t = *data + info_ptr->width * i;
++                      t = *data + png_get_image_width(png_ptr, info_ptr) * i;
+ 
+                       if (h) {
+                               /* Move the colors up by 'h' offset. This is used because fbcon
+@@ -196,7 +196,7 @@ 
+               
+               /* We only need to convert the image if we the alpha channel is not required */ 
+               } else if (!want_alpha) {
+-                      truecolor2fb((truecolor*)buf, *data + info_ptr->width * bytespp * i, info_ptr->width, i, 0);
++                      truecolor2fb((truecolor*)buf, *data + png_get_image_width(png_ptr, info_ptr) * bytespp * i, png_get_image_width(png_ptr, info_ptr), i, 0);
+               }
+       }
+ 

diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild
index ff854f4d2c5cce0887e070e73b25408090110d3a..9d3f9c116adc5e6bc89b593543a8de3245df7d20 100644 (file)
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.0.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/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild,v 1.8 2011/08/15 11:33:07 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/tuxonice-userui-1.0.ebuild,v 1.9 2011/09/26 15:34:41 hwoarang Exp $
 
 EAPI="2"
 
@@ -17,15 +17,15 @@ KEYWORDS="amd64 x86"
 IUSE="fbsplash"
 DEPEND="fbsplash? ( >=media-gfx/splashutils-1.5.2.1
        media-libs/libmng[lcms]
-       || ( >=media-libs/libpng-1.4.4[static-libs]
-               <media-libs/libpng-1.4.4:0 )
+       >=media-libs/libpng-1.4.8[static-libs]
        media-libs/freetype[static-libs]
        app-arch/bzip2[static]
        media-libs/lcms:0[static-libs] )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       epatch "${FILESDIR}/${P}-Makefiles.patch"
+       epatch "${FILESDIR}/${P}-Makefiles.patch" \
+               "${FILESDIR}"/${P}-libpng15.patch
 
        sed -i -e 's/-lfreetype/-lfreetype -lbz2/' "${S}/Makefile" || die
 }