head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.6
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.4
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.2
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q3:1.4.0.6
	pkgsrc-2011Q3-base:1.4
	pkgsrc-2011Q2:1.4.0.4
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2011Q1:1.4.0.2
	pkgsrc-2011Q1-base:1.4
	pkgsrc-2009Q4:1.3.0.16
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.14
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.12
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.10
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.8
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.6
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.4
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.2
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.1.0.4
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.2
	pkgsrc-2007Q1-base:1.1;
locks; strict;
comment	@# @;


1.5
date	2011.11.07.12.14.15;	author drochner;	state dead;
branches;
next	1.4;

1.4
date	2011.01.14.10.02.54;	author wiz;	state Exp;
branches;
next	1.3;

1.3
date	2007.09.18.19.18.11;	author drochner;	state dead;
branches;
next	1.2;

1.2
date	2007.08.02.21.35.14;	author tnn;	state Exp;
branches;
next	1.1;

1.1
date	2007.03.14.16.10.43;	author yyamano;	state Exp;
branches;
next	;


desc
@@


1.5
log
@update to 1.4.5
changes:
-bugfixes
-cleanup, spelling fixes
@
text
@$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $

Fix build with png-1.5.

--- 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;
@


1.4
log
@Fix build with png-1.5. From John Bowler.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@update to 1.4.0
changes: security fixes, and a few crashes fixed
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.2 2007/08/02 21:35:14 tnn Exp $
d3 44
a46 3
--- configure.orig	2006-09-29 03:02:33.000000000 +0900
+++ configure
@@@@ -21224,6 +21224,7 @@@@ esac
d48 21
a68 4
 case $host_os in
   solaris*) mmx="no";;
+  darwin*) mmx="no";;
 esac
d70 7
a76 1
 # Check whether --enable-mmx was given.
@


1.2
log
@- Add SUBST fragment to deal with hardcoded .so library suffix in image.c.
- While here, remove hunk "Avoid regenerating within pkgsrc" from patch-af.
  (caught by pkglint)
- Bump revision
@
text
@d1 1
a1 1
$NetBSD: patch-af,v 1.1 2007/03/14 16:10:43 yyamano Exp $
@


1.1
log
@PR pkg/35521.
Apply patch provided by naoto at morishima.net to make this buld on Darwin/intel.
@
text
@d1 1
a1 1
$NetBSD$
a12 9
@@@@ -25410,6 +25411,8 @@@@ do
   case $ac_option in
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+	: Avoid regenerating within pkgsrc
+	exit 0
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     echo "$ac_cs_version"; exit ;;
@