Sun Feb 6 15:50:04 2011 UTC ()
Fix build with png-1.5.


(wiz)
diff -r1.2 -r1.3 pkgsrc/multimedia/gpac/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/gpac/patches/patch-ad
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/gpac/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gpac/distinfo 2010/06/13 22:45:05 1.2
+++ pkgsrc/multimedia/gpac/distinfo 2011/02/06 15:50:04 1.3
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.2 2010/06/13 22:45:05 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2011/02/06 15:50:04 wiz Exp $
2 2
3SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 3SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8
4RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f 4RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f
5Size (gpac-0.4.5.tar.gz) = 4269054 bytes 5Size (gpac-0.4.5.tar.gz) = 4269054 bytes
6SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9 6SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9
7SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4 7SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4
8SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac 8SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac
9SHA1 (patch-ad) = 5d50a3477f3a4459825f19c848454f6cdfb8a1fd 9SHA1 (patch-ad) = 32eac449b1b108937f9a723d7c4ba622182cf9ed
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/gpac/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/multimedia/gpac/patches/Attic/patch-ad 2010/06/13 22:45:05 1.1
+++ pkgsrc/multimedia/gpac/patches/Attic/patch-ad 2011/02/06 15:50:04 1.2
@@ -1,13 +1,131 @@ @@ -1,13 +1,131 @@
1$NetBSD: patch-ad,v 1.1 2010/06/13 22:45:05 wiz Exp $ 1$NetBSD: patch-ad,v 1.2 2011/02/06 15:50:04 wiz Exp $
 2
 3Fix build with png-1.5.
2 4
3--- src/media_tools/img.c.orig 2008-12-01 17:39:36.000000000 +0000 5--- src/media_tools/img.c.orig 2008-12-01 17:39:36.000000000 +0000
4+++ src/media_tools/img.c 6+++ src/media_tools/img.c
5@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi 7@@ -388,7 +388,7 @@ typedef struct
 8
 9 static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 10 {
 11- GFpng *ctx = (GFpng*)png_ptr->io_ptr;
 12+ GFpng *ctx = (GFpng*)png_get_io_ptr(png_ptr);
 13
 14 if (ctx->pos + length > ctx->size) {
 15 png_error(png_ptr, "Read Error");
 16@@ -399,7 +399,11 @@ static void user_read_data(png_structp p
 17 }
 18 static void user_error_fn(png_structp png_ptr,png_const_charp error_msg)
 19 {
 20+#if (PNG_LIBPNG_VER < 10500)
 21 longjmp(png_ptr->jmpbuf, 1);
 22+#else
 23+ png_longjmp(png_ptr, 1);
 24+#endif
 25 }
 26
 27 GF_EXPORT
 28@@ -409,7 +413,10 @@ GF_Err gf_img_png_dec(char *png, u32 png
 29 png_struct *png_ptr;
 30 png_info *info_ptr;
 31 png_byte **rows;
 32- u32 i, stride, bpp;
 33+ u32 i, stride;
 34+ png_bytep trans_alpha;
 35+ int num_trans;
 36+ png_color_16p trans_color;
 37
 38 if ((png_size<8) || png_sig_cmp(png, 0, 8) ) return GF_NON_COMPLIANT_BITSTREAM;
 39
 40@@ -424,7 +431,7 @@ GF_Err gf_img_png_dec(char *png, u32 png
 41 png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
 42 return GF_IO_ERR;
 43 }
 44- if (setjmp(png_ptr->jmpbuf)) {
 45+ if (setjmp(png_jmpbuf(png_ptr))) {
 46 png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
 47 png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
 48 return GF_IO_ERR;
 49@@ -435,30 +442,30 @@ GF_Err gf_img_png_dec(char *png, u32 png
 50 png_read_info(png_ptr, info_ptr);
 51
 52 /*unpaletize*/
 53- if (info_ptr->color_type==PNG_COLOR_TYPE_PALETTE) {
 54+ if (png_get_color_type(png_ptr, info_ptr)==PNG_COLOR_TYPE_PALETTE) {
 55 png_set_expand(png_ptr);
 56 png_read_update_info(png_ptr, info_ptr);
 57 }
 58- if (info_ptr->num_trans) {
 59+ png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
 60+ if (num_trans) {
 61 png_set_tRNS_to_alpha(png_ptr);
 62 png_read_update_info(png_ptr, info_ptr);
 63 }
 64
 65- bpp = info_ptr->pixel_depth / 8;
 66- *width = info_ptr->width;
 67- *height = info_ptr->height;
 68+ *width = png_get_image_width(png_ptr, info_ptr);
 69+ *height = png_get_image_height(png_ptr, info_ptr);
 70
 71- switch (info_ptr->pixel_depth) {
 72- case 8:
 73+ switch (png_get_color_type(png_ptr, info_ptr)) {
 74+ case PNG_COLOR_TYPE_GRAY:
 75 *pixel_format = GF_PIXEL_GREYSCALE;
 76 break;
 77- case 16:
 78+ case PNG_COLOR_TYPE_GRAY_ALPHA:
 79 *pixel_format = GF_PIXEL_ALPHAGREY;
 80 break;
 81- case 24:
 82+ case PNG_COLOR_TYPE_RGB:
 83 *pixel_format = GF_PIXEL_RGB_24;
 84 break;
 85- case 32:
 86+ case PNG_COLOR_TYPE_RGB_ALPHA:
 87 *pixel_format = GF_PIXEL_RGBA;
 88 break;
 89 default:
 90@@ -469,18 +476,18 @@ GF_Err gf_img_png_dec(char *png, u32 png
 91 }
 92
 93 /*new cfg, reset*/
 94- if (*dst_size != info_ptr->width * info_ptr->height * bpp) {
 95- *dst_size = info_ptr->width * info_ptr->height * bpp;
 96+ if (*dst_size != png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr)) {
 97+ *dst_size = png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr);
 98 png_destroy_info_struct(png_ptr,(png_infopp) & info_ptr);
 99 png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
 100 return GF_BUFFER_TOO_SMALL;
 101 }
 102- *dst_size = info_ptr->width * info_ptr->height * bpp;
 103+ *dst_size = png_get_rowbytes(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr);
 104
 105 /*read*/
 106 stride = png_get_rowbytes(png_ptr, info_ptr);
 107- rows = (png_bytepp) malloc(sizeof(png_bytep) * info_ptr->height);
 108- for (i=0; i<info_ptr->height; i++) {
 109+ rows = (png_bytepp) malloc(sizeof(png_bytep) * png_get_image_height(png_ptr, info_ptr));
 110+ for (i=0; i<png_get_image_height(png_ptr, info_ptr); i++) {
 111 rows[i] = dst + i*stride;
 112 }
 113 png_read_image(png_ptr, rows);
 114@@ -495,7 +502,7 @@ GF_Err gf_img_png_dec(char *png, u32 png
 115
 116 void my_png_write(png_structp png, png_bytep data, png_size_t size)
 117 {
 118- GFpng *p = (GFpng *)png->io_ptr;
 119+ GFpng *p = (GFpng *)png_get_io_ptr(png);
 120 memcpy(p->buffer+p->pos, data, sizeof(char)*size);
 121 p->pos += size;
 122 }
 123@@ -551,7 +558,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
6 /* Allocate/initialize the image information data. REQUIRED */ 124 /* Allocate/initialize the image information data. REQUIRED */
7 info_ptr = png_create_info_struct(png_ptr); 125 info_ptr = png_create_info_struct(png_ptr);
8 if (info_ptr == NULL) { 126 if (info_ptr == NULL) {
9- png_destroy_write_struct(&png_ptr, png_infopp_NULL); 127- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
10+ png_destroy_write_struct(&png_ptr, NULL); 128+ png_destroy_write_struct(&png_ptr, NULL);
11 return GF_IO_ERR; 129 return GF_IO_ERR;
12 } 130 }
13  131