head 1.3; access; symbols pkgsrc-2026Q2:1.3.0.122 pkgsrc-2026Q2-base:1.3 pkgsrc-2026Q1:1.3.0.120 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.118 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.116 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.114 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.112 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.110 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.108 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.106 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.104 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.102 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.100 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.98 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.96 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.94 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.92 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.90 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.88 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.86 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.84 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.82 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.80 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.78 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.76 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.72 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.52 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.74 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.70 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.68 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.66 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.64 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.62 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.60 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.58 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.56 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.54 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.50 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.48 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.46 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.44 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.42 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.40 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.38 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.36 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.34 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.32 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.30 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.28 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.26 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.24 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.22 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.20 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.18 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.16 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.14 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.12 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.10 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.8 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.4 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.2.0.8 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.6 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.4 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.2 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.1.0.2 pkgsrc-2010Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2011.04.05.11.32.46; author wiz; state Exp; branches; next 1.2; 1.2 date 2010.06.13.22.44.24; author wiz; state Exp; branches 1.2.8.1; next 1.1; 1.1 date 2010.03.03.07.07.40; author wiz; state Exp; branches; next ; 1.2.8.1 date 2011.04.06.22.17.41; author tron; state Exp; branches; next ; desc @@ 1.3 log @Fix build with png-1.5. @ text @$NetBSD: patch-ab,v 1.2 2010/06/13 22:44:24 wiz Exp $ Fix build with png-1.5. Last chunk: ? --- src/renderer/r_image.c.orig 2008-04-25 16:15:02.000000000 +0000 +++ src/renderer/r_image.c @@@@ -254,7 +254,7 @@@@ static int R_LoadPNG (const char *name, png_set_palette_to_rgb(png_ptr); /* convert 1-2-4 bits grayscale images to 8 bits grayscale */ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr); @@@@ -268,32 +268,32 @@@@ static int R_LoadPNG (const char *name, row_pointers = png_get_rows(png_ptr, info_ptr); rowptr = 0; - img = VID_TagAlloc(vid_imagePool, info_ptr->width * info_ptr->height * 4, 0); + img = VID_TagAlloc(vid_imagePool, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr) * 4, 0); if (pic) *pic = img; - if (info_ptr->channels == 4) { - for (i = 0; i < info_ptr->height; i++) { - memcpy (img + rowptr, row_pointers[i], info_ptr->rowbytes); - rowptr += info_ptr->rowbytes; + if (png_get_channels(png_ptr, info_ptr) == 4) { + for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { + memcpy (img + rowptr, row_pointers[i], png_get_rowbytes(png_ptr, info_ptr)); + rowptr += png_get_rowbytes(png_ptr, info_ptr); } } else { uint32_t j; - memset(img, 255, info_ptr->width * info_ptr->height * 4); - for (rowptr = 0, i = 0; i < info_ptr->height; i++) { - for (j = 0; j < info_ptr->rowbytes; j += info_ptr->channels) { - memcpy(img + rowptr, row_pointers[i] + j, info_ptr->channels); + memset(img, 255, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr) * 4); + for (rowptr = 0, i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { + for (j = 0; j < png_get_rowbytes(png_ptr, info_ptr); j += png_get_channels(png_ptr, info_ptr)) { + memcpy(img + rowptr, row_pointers[i] + j, png_get_channels(png_ptr, info_ptr)); rowptr += 4; } } } if (width) - *width = info_ptr->width; + *width = png_get_image_width(png_ptr, info_ptr); if (height) - *height = info_ptr->height; - samples = info_ptr->channels; + *height = png_get_image_height(png_ptr, info_ptr); + samples = png_get_channels(png_ptr, info_ptr); png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); @@@@ -651,17 +651,6 @@@@ static void jpg_skip_input_data (j_decom cinfo->src->bytes_in_buffer -= (size_t) num_bytes; } -static void jpeg_mem_src (j_decompress_ptr cinfo, byte * mem, int len) -{ - cinfo->src = (struct jpeg_source_mgr *) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(struct jpeg_source_mgr)); - cinfo->src->init_source = jpg_null; - cinfo->src->fill_input_buffer = jpg_fill_input_buffer; - cinfo->src->skip_input_data = jpg_skip_input_data; - cinfo->src->resync_to_restart = jpeg_resync_to_restart; - cinfo->src->term_source = jpg_null; - cinfo->src->bytes_in_buffer = len; - cinfo->src->next_input_byte = mem; -} /** * @@sa R_LoadTGA @ 1.2 log @Bump PKGREVISION for libpng shlib name change. Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x. @ text @d1 5 a5 1 $NetBSD: patch-ab,v 1.1 2010/03/03 07:07:40 wiz Exp $ d18 45 @ 1.2.8.1 log @Pullup ticket #3400 - requested by wiz audio/gqmpeg-devel: build fix devel/teem: build fix games/ufoai: build fix graphics/tuxpaint: build fix lang/kaffe: build fix sysutils/xnc: build fix wm/afterstep: build fix www/chimera: build fix www/mMosaic: build fix x11/xcursorgen: build fix Revisions pulled up: - audio/gqmpeg-devel/distinfo 1.5 - audio/gqmpeg-devel/patches/patch-src_ui__pixbuf__save.c 1.1 - devel/teem/distinfo 1.6 - devel/teem/patches/patch-ad 1.2 - games/ufoai/distinfo 1.5 - games/ufoai/patches/patch-ab 1.3 - graphics/tuxpaint/distinfo 1.21 - graphics/tuxpaint/patches/patch-ab 1.5 - lang/kaffe/distinfo 1.30 - lang/kaffe/patches/patch-libraries_clib_awt_X_imgpng.c 1.1 - sysutils/xnc/distinfo 1.8 - sysutils/xnc/patches/patch-src_lib_image2_sdl__image_IMG__png.c 1.1 - wm/afterstep/distinfo 1.13 - wm/afterstep/patches/patch-libAfterImage_export.c 1.1 - wm/afterstep/patches/patch-libAfterImage_import.c 1.1 - www/chimera/distinfo 1.9 - www/chimera/patches/patch-ad 1.5 - www/mMosaic/distinfo 1.11 - www/mMosaic/patches/patch-ai 1.2 - www/mMosaic/patches/patch-src_MIME.c 1.1 - x11/xcursorgen/distinfo 1.3 - x11/xcursorgen/patches/patch-xcursorgen.c 1.1 --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 08:09:47 UTC 2011 Modified Files: pkgsrc/audio/gqmpeg-devel: distinfo Added Files: pkgsrc/audio/gqmpeg-devel/patches: patch-src_ui__pixbuf__save.c Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 11:04:40 UTC 2011 Modified Files: pkgsrc/graphics/tuxpaint: distinfo pkgsrc/graphics/tuxpaint/patches: patch-ab Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 11:07:00 UTC 2011 Modified Files: pkgsrc/x11/xcursorgen: distinfo Added Files: pkgsrc/x11/xcursorgen/patches: patch-xcursorgen.c Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 11:27:29 UTC 2011 Modified Files: pkgsrc/devel/teem: distinfo pkgsrc/devel/teem/patches: patch-ad Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 11:32:46 UTC 2011 Modified Files: pkgsrc/games/ufoai: distinfo pkgsrc/games/ufoai/patches: patch-ab Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 11:49:51 UTC 2011 Modified Files: pkgsrc/lang/kaffe: distinfo Added Files: pkgsrc/lang/kaffe/patches: patch-libraries_clib_awt_X_imgpng.c Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 11:56:30 UTC 2011 Modified Files: pkgsrc/sysutils/xnc: distinfo Added Files: pkgsrc/sysutils/xnc/patches: patch-src_lib_image2_sdl__image_IMG__png.c Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 12:02:00 UTC 2011 Modified Files: pkgsrc/wm/afterstep: distinfo Added Files: pkgsrc/wm/afterstep/patches: patch-libAfterImage_export.c patch-libAfterImage_import.c Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 12:16:39 UTC 2011 Modified Files: pkgsrc/www/chimera: distinfo pkgsrc/www/chimera/patches: patch-ad Log Message: Fix build with png-1.5. --- Module Name: pkgsrc Committed By: wiz Date: Tue Apr 5 12:27:06 UTC 2011 Modified Files: pkgsrc/www/mMosaic: distinfo pkgsrc/www/mMosaic/patches: patch-ai Added Files: pkgsrc/www/mMosaic/patches: patch-src_MIME.c Log Message: Fix build with png-1.5 and avoid conflict with getline() on NetBSD. @ text @d1 1 a1 5 $NetBSD$ Fix build with png-1.5. Last chunk: ? a13 45 @@@@ -268,32 +268,32 @@@@ static int R_LoadPNG (const char *name, row_pointers = png_get_rows(png_ptr, info_ptr); rowptr = 0; - img = VID_TagAlloc(vid_imagePool, info_ptr->width * info_ptr->height * 4, 0); + img = VID_TagAlloc(vid_imagePool, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr) * 4, 0); if (pic) *pic = img; - if (info_ptr->channels == 4) { - for (i = 0; i < info_ptr->height; i++) { - memcpy (img + rowptr, row_pointers[i], info_ptr->rowbytes); - rowptr += info_ptr->rowbytes; + if (png_get_channels(png_ptr, info_ptr) == 4) { + for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { + memcpy (img + rowptr, row_pointers[i], png_get_rowbytes(png_ptr, info_ptr)); + rowptr += png_get_rowbytes(png_ptr, info_ptr); } } else { uint32_t j; - memset(img, 255, info_ptr->width * info_ptr->height * 4); - for (rowptr = 0, i = 0; i < info_ptr->height; i++) { - for (j = 0; j < info_ptr->rowbytes; j += info_ptr->channels) { - memcpy(img + rowptr, row_pointers[i] + j, info_ptr->channels); + memset(img, 255, png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr) * 4); + for (rowptr = 0, i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { + for (j = 0; j < png_get_rowbytes(png_ptr, info_ptr); j += png_get_channels(png_ptr, info_ptr)) { + memcpy(img + rowptr, row_pointers[i] + j, png_get_channels(png_ptr, info_ptr)); rowptr += 4; } } } if (width) - *width = info_ptr->width; + *width = png_get_image_width(png_ptr, info_ptr); if (height) - *height = info_ptr->height; - samples = info_ptr->channels; + *height = png_get_image_height(png_ptr, info_ptr); + samples = png_get_channels(png_ptr, info_ptr); png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); @ 1.1 log @Fix build with latest jpeg. @ text @d1 1 a1 1 $NetBSD$ d5 9 @