summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/libpano13/Makefile6
-rw-r--r--graphics/libpano13/buildlink3.mk4
-rw-r--r--graphics/libpano13/distinfo11
-rw-r--r--graphics/libpano13/patches/patch-aa4
-rw-r--r--graphics/libpano13/patches/patch-png.c98
5 files changed, 11 insertions, 112 deletions
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index 16513054328..6bcb8879fd7 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2011/01/13 13:36:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2011/10/03 09:50:36 adam Exp $
-DISTNAME= libpano13-2.9.17
-PKGREVISION= 1
+DISTNAME= libpano13-2.9.18
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=panotools/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://panotools.sourceforge.net/
COMMENT= Cross-platform library behind Panorama Tools and other stitchers
-
LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/graphics/libpano13/buildlink3.mk b/graphics/libpano13/buildlink3.mk
index a8067ef6a3f..b0c78c78931 100644
--- a/graphics/libpano13/buildlink3.mk
+++ b/graphics/libpano13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2011/01/13 13:36:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2011/10/03 09:50:36 adam Exp $
BUILDLINK_TREE+= libpano13
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpano13
LIBPANO13_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libpano13+= libpano13>=2.9.17
-BUILDLINK_ABI_DEPENDS.libpano13+= libpano13>=2.9.17nb1
+BUILDLINK_ABI_DEPENDS.libpano13+= libpano13>=2.9.18
BUILDLINK_PKGSRCDIR.libpano13?= ../../graphics/libpano13
.include "../../mk/jpeg.buildlink3.mk"
diff --git a/graphics/libpano13/distinfo b/graphics/libpano13/distinfo
index ce17f7ff674..f180492e934 100644
--- a/graphics/libpano13/distinfo
+++ b/graphics/libpano13/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2011/02/14 23:48:17 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/10/03 09:50:36 adam Exp $
-SHA1 (libpano13-2.9.17.tar.gz) = 418689985ea622bc234cd4eccec42180c12821b2
-RMD160 (libpano13-2.9.17.tar.gz) = 3a54295bfadbbd32009a8628968c723c7017f2df
-Size (libpano13-2.9.17.tar.gz) = 2735157 bytes
-SHA1 (patch-aa) = 021c84a642170c26f075f4bb5deba2bc2875fdc9
-SHA1 (patch-png.c) = e89f2b84f3929246b7cf405dd4687b35ea55d576
+SHA1 (libpano13-2.9.18.tar.gz) = 23849bdbdfc9176a2b53d157e58bd24aa0e7276e
+RMD160 (libpano13-2.9.18.tar.gz) = 2309dc8d932a5ea80cb4b22bffa3e9d39539aa58
+Size (libpano13-2.9.18.tar.gz) = 2723032 bytes
+SHA1 (patch-aa) = ac998990f4210e13eebd79826573dd13b039d77d
diff --git a/graphics/libpano13/patches/patch-aa b/graphics/libpano13/patches/patch-aa
index a5945f4aa76..deb36e82253 100644
--- a/graphics/libpano13/patches/patch-aa
+++ b/graphics/libpano13/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/08/20 20:07:29 adam Exp $
+$NetBSD: patch-aa,v 1.2 2011/10/03 09:50:36 adam Exp $
--- configure.orig 2009-08-19 17:44:26.000000000 +0200
+++ configure
-@@ -19311,7 +19311,7 @@ case "${host_os}" in
+@@ -10605,7 +10605,7 @@ case "${host_os}" in
;;
*)
PANO_WIN32_RESOURCE=
diff --git a/graphics/libpano13/patches/patch-png.c b/graphics/libpano13/patches/patch-png.c
deleted file mode 100644
index 307e7095a23..00000000000
--- a/graphics/libpano13/patches/patch-png.c
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-png.c,v 1.3 2011/02/14 23:48:17 wiz Exp $
-
-Fix build with png-1.5.
-https://bugs.launchpad.net/panotools/+bug/719076
-
---- png.c.orig 2008-01-02 14:46:28.000000000 +0000
-+++ png.c
-@@ -56,7 +56,7 @@ int writePNG( Image *im, fullPath *sfile
- }
-
- /* set error handling */
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* If we get here, we had a problem reading the file */
- fclose(outfile);
-@@ -68,14 +68,15 @@ int writePNG( Image *im, fullPath *sfile
- png_init_io(png_ptr, outfile);
-
- FourToThreeBPP( im );
-- info_ptr->width = im->width;
-- info_ptr->height = im->height;
-- info_ptr->bit_depth = (im->bitsPerPixel > 32 ? 16 : 8);
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+ png_set_IHDR(png_ptr, info_ptr, im->width, im->height,
-+ (im->bitsPerPixel > 32 ? 16 : 8), PNG_COLOR_TYPE_RGB,
-+ 0, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+
-+#if 0
- info_ptr->channels = (png_byte)(im->bitsPerPixel / info_ptr->bit_depth);
- info_ptr->pixel_depth = (png_byte)(im->bitsPerPixel);
- info_ptr->rowbytes = im->bytesPerLine;
-- info_ptr->interlace_type= 0;
-+#endif
-
- png_write_info(png_ptr, info_ptr);
-
-@@ -120,6 +121,7 @@ int readPNG ( Image *im, fullPath *sfile
- png_bytep *row_pointers;
- int row;
- unsigned long dataSize;
-+ int color_type;
-
- #ifdef __Mac__
- unsigned char the_pcUnixFilePath[256];//added by Kekus Digital
-@@ -165,7 +167,7 @@ int readPNG ( Image *im, fullPath *sfile
- }
-
- /* set error handling if you are using the setjmp/longjmp method */
-- if (setjmp(png_ptr->jmpbuf))
-+ if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -182,9 +184,10 @@ int readPNG ( Image *im, fullPath *sfile
- /* read the file information */
- png_read_info(png_ptr, info_ptr);
-
-- if( info_ptr->color_type != PNG_COLOR_TYPE_RGB &&
-- info_ptr->color_type != PNG_COLOR_TYPE_PALETTE &&
-- info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA)
-+ color_type = png_get_color_type(png_ptr, info_ptr);
-+ if( color_type != PNG_COLOR_TYPE_RGB &&
-+ color_type != PNG_COLOR_TYPE_PALETTE &&
-+ color_type != PNG_COLOR_TYPE_RGB_ALPHA)
- {
- PrintError(" Only rgb images supported");
- png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -194,24 +197,17 @@ int readPNG ( Image *im, fullPath *sfile
-
-
- /* expand paletted colors into true RGB triplets */
-- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+ if (color_type == PNG_COLOR_TYPE_PALETTE)
- png_set_expand(png_ptr);
-
-
- SetImageDefaults( im );
-
-- im->width = info_ptr->width;
-- im->height = info_ptr->height;
-- im->bytesPerLine = info_ptr->rowbytes;
-- im->bitsPerPixel = info_ptr->pixel_depth;
-+ im->width = png_get_image_width(png_ptr, info_ptr);
-+ im->height = png_get_image_height(png_ptr, info_ptr);
-+ im->bytesPerLine = png_get_rowbytes(png_ptr, info_ptr);
- im->dataSize = im->height * im->bytesPerLine;
-- if( im->bitsPerPixel == 24 )
-- dataSize = im->width * im->height * 4;
-- else if( im->bitsPerPixel == 48 )
-- dataSize = im->width * im->height * 8;
-- else
-- dataSize = im->width * im->height * im->bitsPerPixel/8;
--
-+ im->bitsPerPixel = 8 * im->bytesPerLine / im->width;
-
- im->data = (unsigned char**)mymalloc( (dataSize > im->dataSize ? dataSize : im->dataSize) );
- if( im->data == NULL ){
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 03:32:12 +0000