summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/splashutils/ChangeLog7
-rw-r--r--media-gfx/splashutils/Manifest15
-rw-r--r--media-gfx/splashutils/files/splashutils-1.5.4.3-libpng15_compat.patch96
-rw-r--r--media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild3
4 files changed, 117 insertions, 4 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 8511126e0d52..16e93067b8d7 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/splashutils
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.187 2011/03/26 22:01:16 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.188 2011/05/08 15:30:15 spock Exp $
+
+ 08 May 2011; Michał Januszewski <spock@gentoo.org>
+ splashutils-1.5.4.3-r3.ebuild,
+ +files/splashutils-1.5.4.3-libpng15_compat.patch:
+ Add a patch for libpng-1.5 compatiblity (bug #361333).
26 Mar 2011; Michał Januszewski <spock@gentoo.org>
splashutils-1.5.4.3-r3.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 6121165f8a4a..cc30fb1c3148 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX initrd.splash-cmp-str-instead-of-int.patch 452 RMD160 7748d8c9fba1fcfd28bd12a97fbff6bbb98d5f59 SHA1 a13535bece9be0810cb33d34635ff133c804655e SHA256 a87df58a23b12eee65058f9bd326e354cdccf32048cbc8446b2ad72942da2f30
AUX splashutils-1.5.4.3-daemon-exit-signal.patch 2764 RMD160 cbfc7e4139fbf9f7b28a53da5ff53f5420c4c5fd SHA1 5e30fa7c4d76ad559f13795b022d45169a2bee71 SHA256 8d7d17ae6591f3de0bde18c537166710b1eac0f6aeb1507aecdf8d6a3d1553eb
AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 RMD160 d60bdea6625c9ce4d42d281c38888b8bcb823525 SHA1 31b831b79ea3944a52d0ca9fd45891c73170c758 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8
AUX splashutils-1.5.4.3-libjpeg.patch 1693 RMD160 d26031ef3f618bca870431dc1c2fdeba443dca23 SHA1 1c557e9db5a93470e8c6fcde6d63ade1f75fc3bc SHA256 83d9a0ededa96c213a3120c45969d6b8f00e97f2104a221541badd67f82259c7
+AUX splashutils-1.5.4.3-libpng15_compat.patch 3925 RMD160 457a04fa2344cf044e705b531057e1cf4b2dfb4a SHA1 27d89960bdbd1cf72446cafc87f5c70a89b1855c SHA256 bbecf8f385c59bf4dbe0f760ff59996c37facb0f05f7c960701ad2c496e8956b
AUX splashutils-1.5.4.3-makefile.patch 1257 RMD160 1fb565cb543efe438f5c47cf490aa3cffe07d559 SHA1 011baf9ea9c1313edb3045dc7a52c28d3b84c83e SHA256 6ca31fc77f75bda368642da7effbaa0fd3c69bce86c9e04bfe55b9ab4d259cf3
AUX splashutils-1.5.4.3-nondefault-runlevel.patch 894 RMD160 7c337e018858e091106ed3dbc71212ebaa213d39 SHA1 dbf40c7ef79ea62e113a087b3784dfd8aaea3f31 SHA256 c462ef5e4c2514bad9a5aca78cce923109bcb0cff5a292286e74b2f1e8ec457f
AUX splashutils-1.5.4.3-openrc-effects.patch 2261 RMD160 ad5b78025b1a2520a1b44a43f3afe1fc131ab54e SHA1 72d03fd782faf611399ea9e0217af6d6739731a8 SHA256 ea416ce53c805241b05bfff48439c4c26dbbb717001356ec08f8820ff8baec09
@@ -18,6 +22,13 @@ DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94
DIST splashutils-gentoo-1.0.16.tar.bz2 15568 RMD160 f4831c381ac875b5bf9ad9ff527ae2e6cfd2b5d5 SHA1 6756807056c94f4dcc99f73489039dced6aecf4b SHA256 f9c51f442b5a638ac68a731925da57c3402d9506f160681fc01bf80e396d409d
DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-EBUILD splashutils-1.5.4.3-r3.ebuild 8202 RMD160 d66fe051973ea8cb33495a4588a965c5b5f6a904 SHA1 23bcd62e381b1b0c1e792f4c802f7df67855a25f SHA256 670f8efcb42dc86e192850e0f43e80fbfda2d74030a72e55f9eab94bde8287b3
-MISC ChangeLog 34020 RMD160 f9fbb1dce75969f6f7b77a0a977e0765f9e49bb2 SHA1 d106dd02d4457c61b7b6bc3e38b3a90ba5de0d98 SHA256 8cee06af4bbebac24d11431d22804e955ecc9f1c5be270e0ea64997436fec1d7
+EBUILD splashutils-1.5.4.3-r3.ebuild 8262 RMD160 18e07da06cd1bab529f567e2819cdb904dd34a5f SHA1 464f49fed2b3372b7f359dfddb07bddd58e292d5 SHA256 02b31d9f2d651f3ea4806f6dce72654a94c5a302389f4543ec0dcd45b70cccd1
+MISC ChangeLog 34217 RMD160 571c64a39eaa4218db4fb1d0d7a8f2a1a0bc5c98 SHA1 0edc27742ecffc41d0903ca92ce07f39bb2f00c2 SHA256 b7ff44ce9ae17561e5b436fea6509842d3543fa7f42c7321b8074c990009d5d4
MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3GtyEACgkQchej4aZK9/eprQCfQIgS9EFsmc3qKwtSW+cC4gjv
+RWEAniKN+gKMDYoyQJEQL3oEcYsZG9Oq
+=BDiE
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-libpng15_compat.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-libpng15_compat.patch
new file mode 100644
index 000000000000..fb962aefbcb2
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-libpng15_compat.patch
@@ -0,0 +1,96 @@
+commit 1b760b583f1faa0d3114440a6746cbefa36dd797
+Author: AlphatPC <AlphatPC@gmail.com>
+Date: Sun May 8 17:18:03 2011 +0200
+
+ Use libpng accessor functions (for libpng-1.5 compat).
+
+diff --git a/core/src/image.c b/core/src/image.c
+index 6973575..4fb21a9 100644
+--- a/core/src/image.c
++++ b/core/src/image.c
+@@ -61,27 +61,27 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap *
+ 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)
+ return -2;
+
+- 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)
+ return -3;
+
+ if (cmap) {
+@@ -93,12 +93,12 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap *
+
+ 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)) {
+ iprint(MSG_ERROR, "Image size mismatch: %s.\n", filename);
+ return -2;
+ } 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(theme->xres * theme->yres * fbd.bytespp);
+@@ -114,11 +114,11 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap *
+ return -4;
+ }
+
+- 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;
+ }
+@@ -127,7 +127,7 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap *
+
+ 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
+@@ -139,8 +139,8 @@ static int load_png(stheme_t *theme, char *filename, u8 **data, struct fb_cmap *
+
+ /* We only need to convert the image if the alpha channel is not required */
+ } else if (!want_alpha) {
+- u8 *tmp = *data + info_ptr->width * bytespp * i;
+- rgba2fb((rgbacolor*)buf, tmp, tmp, info_ptr->width, i, 0, 0xff);
++ u8 *tmp = *data + png_get_image_width(png_ptr, info_ptr) * bytespp * i;
++ rgba2fb((rgbacolor*)buf, tmp, tmp, png_get_image_width(png_ptr, info_ptr), i, 0, 0xff);
+ }
+ }
+
diff --git a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
index 39a18c963492..50bc202a6f1d 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.3-r3.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/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.13 2011/03/27 07:09:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.14 2011/05/08 15:30:15 spock Exp $
EAPI="2"
@@ -89,6 +89,7 @@ src_prepare() {
epatch "${FILESDIR}"/splashutils-1.5.4.3-makefile.patch
epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_geninitramfs.patch
epatch "${FILESDIR}"/splashutils-1.5.4.3-libjpeg.patch
+ epatch "${FILESDIR}"/splashutils-1.5.4.3-libpng15_compat.patch
epatch "${FILESDIR}"/splashutils-1.5.4.3-daemon-exit-signal.patch
epatch "${FILESDIR}"/splashutils-1.5.4.3-splash-functions.patch
epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_util.patch