summaryrefslogtreecommitdiff
path: root/packages/media-libs/imlib2
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2011-10-20 17:11:14 +0200
committerAvatar Elias Pipping <pipping@exherbo.org> 2011-10-21 17:48:29 +0200
commit6b51389f91e6557f4961f065e736b16063dc5e25 (patch)
treee664d274a897e6d25908d48e74c03c4da6914ec3 /packages/media-libs/imlib2
parent49b19e3d84eb223d1369dae0704343b5d858e590 (diff)
downloadmedia-6b51389f91e6557f4961f065e736b16063dc5e25.tar.gz
media-6b51389f91e6557f4961f065e736b16063dc5e25.tar.xz
imlib2: fix building with libpng-1.5
Diffstat (limited to 'packages/media-libs/imlib2')
-rw-r--r--packages/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch77
-rw-r--r--packages/media-libs/imlib2/imlib2-1.4.4.exheres-02
2 files changed, 79 insertions, 0 deletions
diff --git a/packages/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch b/packages/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch
new file mode 100644
index 00000000..d0fe30f5
--- /dev/null
+++ b/packages/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch
@@ -0,0 +1,77 @@
+Source: Thomas Klausner (http://sourceforge.net/mailarchive/message.php?msg_id=26972342)
+Upstream: partially (http://trac.enlightenment.org/e/changeset/57170/trunk/imlib2/src/modules/loaders/loader_png.c)
+Reason: compile failure using libpng-1.5
+
+$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $
+--- src/modules/loaders/loader_png.c.orig 2010-02-08 00:29:06.000000000 -0800
++++ src/modules/loaders/loader_png.c 2010-02-08 00:34:14.000000000 -0800
+@@ -58,7 +58,7 @@
+ fclose(f);
+ return 0;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(f);
+@@ -238,7 +238,7 @@
+ png_structp png_ptr;
+ png_infop info_ptr;
+ DATA32 *ptr;
+- int x, y, j;
++ int x, y, j, interlace;
+ png_bytep row_ptr, data = NULL;
+ png_color_8 sig_bit;
+ int pl = 0;
+@@ -265,7 +265,7 @@
+ png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+ return 0;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(f);
+ png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
+@@ -274,11 +274,11 @@
+ }
+
+ /* check whether we should use interlacing */
++ interlace = PNG_INTERLACE_NONE;
+ if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val)
+ {
+ #ifdef PNG_WRITE_INTERLACING_SUPPORTED
+- png_ptr->interlaced = PNG_INTERLACE_ADAM7;
+- num_passes = png_set_interlace_handling(png_ptr);
++ interlace = PNG_INTERLACE_ADAM7;
+ #endif
+ }
+
+@@ -286,7 +286,7 @@
+ if (im->flags & F_HAS_ALPHA)
+ {
+ png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8,
+- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
++ PNG_COLOR_TYPE_RGB_ALPHA, interlace,
+ PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ #ifdef WORDS_BIGENDIAN
+ png_set_swap_alpha(png_ptr);
+@@ -297,7 +297,7 @@
+ else
+ {
+ png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB,
+- png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE,
++ interlace, PNG_COMPRESSION_TYPE_BASE,
+ PNG_FILTER_TYPE_BASE);
+ data = malloc(im->w * 3 * sizeof(char));
+ }
+@@ -344,6 +344,10 @@
+ png_set_shift(png_ptr, &sig_bit);
+ png_set_packing(png_ptr);
+
++#ifdef PNG_WRITE_INTERLACING_SUPPORTED
++ num_passes = png_set_interlace_handling(png_ptr);
++#endif
++
+ for (pass = 0; pass < num_passes; pass++)
+ {
+ ptr = im->data;
diff --git a/packages/media-libs/imlib2/imlib2-1.4.4.exheres-0 b/packages/media-libs/imlib2/imlib2-1.4.4.exheres-0
index 59fbb40e..049b5ce5 100644
--- a/packages/media-libs/imlib2/imlib2-1.4.4.exheres-0
+++ b/packages/media-libs/imlib2/imlib2-1.4.4.exheres-0
@@ -25,6 +25,8 @@ DEPENDENCIES="
X? ( x11-libs/libXext )
"
+DEFAULT_SRC_PREPARE_PATCHES=( -p0 "${FILES}"/${PNV}-libpng-1.5.patch )
+
# --enable-amd64 segfaults
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-visibility-hiding