From owner-svn-ports-all@FreeBSD.ORG Thu Dec 25 13:57:08 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD8D0706; Thu, 25 Dec 2014 13:57:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A99FF64701; Thu, 25 Dec 2014 13:57:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBPDv8QW022724; Thu, 25 Dec 2014 13:57:08 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBPDv80T022721; Thu, 25 Dec 2014 13:57:08 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201412251357.sBPDv80T022721@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 25 Dec 2014 13:57:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375557 - in head/games/r1q2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Dec 2014 13:57:08 -0000 Author: bapt Date: Thu Dec 25 13:57:07 2014 New Revision: 375557 URL: https://svnweb.freebsd.org/changeset/ports/375557 QAT: https://qat.redports.org/buildarchive/r375557/ Log: Properly support png 1.5 Added: head/games/r1q2/files/patch-ref__gl_gl__image.c (contents, props changed) Deleted: head/games/r1q2/files/patch-ref_gl__gl_image.c Modified: head/games/r1q2/Makefile Modified: head/games/r1q2/Makefile ============================================================================== --- head/games/r1q2/Makefile Thu Dec 25 13:53:36 2014 (r375556) +++ head/games/r1q2/Makefile Thu Dec 25 13:57:07 2014 (r375557) @@ -65,9 +65,8 @@ PLIST_SUB+= GAME="@comment " USE_GL= gl USE_SDL= sdl LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng15.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png ALL_TARGET+= ref_gl -CFLAGS+= -I${LOCALBASE}/include/libpng15 PLIST_SUB+= REF_GL="" .else PLIST_SUB+= REF_GL="@comment " Added: head/games/r1q2/files/patch-ref__gl_gl__image.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/r1q2/files/patch-ref__gl_gl__image.c Thu Dec 25 13:57:07 2014 (r375557) @@ -0,0 +1,85 @@ +--- ref_gl/gl_image.c.orig 2014-12-25 13:55:16 UTC ++++ ref_gl/gl_image.c +@@ -721,7 +721,7 @@ void LoadPNG (const char *name, byte **p + + png_read_info(png_ptr, info_ptr); + +- if (info_ptr->height > MAX_TEXTURE_DIMENSIONS) ++ if (png_get_image_height(png_ptr, info_ptr) > MAX_TEXTURE_DIMENSIONS) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + ri.FS_FreeFile (PngFileBuffer.Buffer); +@@ -729,28 +729,28 @@ void LoadPNG (const char *name, byte **p + return; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_palette_to_rgb (png_ptr); + png_set_filler(png_ptr, 0xFF, PNG_FILLER_AFTER); + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) + png_set_filler(png_ptr, 0xFF, PNG_FILLER_AFTER); + +- if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY) && info_ptr->bit_depth < 8) +- png_set_gray_1_2_4_to_8(png_ptr); ++ if ((png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) && png_get_bit_depth(png_ptr, info_ptr) < 8) ++ 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); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) + png_set_gray_to_rgb(png_ptr); + +- if (info_ptr->bit_depth == 16) ++ if (png_get_bit_depth(png_ptr, info_ptr) == 16) + png_set_strip_16(png_ptr); + +- if (info_ptr->bit_depth < 8) ++ if (png_get_bit_depth(png_ptr, info_ptr) < 8) + png_set_packing(png_ptr); + + if (png_get_gAMA(png_ptr, info_ptr, &file_gamma)) +@@ -760,15 +760,15 @@ void LoadPNG (const char *name, byte **p + + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + +- *pic = malloc (info_ptr->height * rowbytes); ++ *pic = malloc (png_get_image_height(png_ptr, info_ptr) * rowbytes); + +- for (i = 0; i < info_ptr->height; i++) ++ for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) + row_pointers[i] = *pic + i*rowbytes; + + png_read_image(png_ptr, row_pointers); + +- *width = info_ptr->width; +- *height = info_ptr->height; ++ *width = png_get_image_width(png_ptr, info_ptr); ++ *height = png_get_image_height(png_ptr, info_ptr); + + png_read_end(png_ptr, end_info); + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); +@@ -1520,7 +1520,7 @@ void EXPORT jpg_skip_input_data(j_decomp + cinfo->src->bytes_in_buffer -= (size_t) num_bytes; + } + +-void jpeg_mem_src (j_decompress_ptr cinfo, byte *mem, int len) ++void local_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; +@@ -1561,7 +1561,7 @@ void LoadJPG (const char *filename, byte + + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_decompress(&cinfo); +- jpeg_mem_src(&cinfo, rawdata, rawsize); ++ local_jpeg_mem_src(&cinfo, rawdata, rawsize); + jpeg_read_header(&cinfo, true); + jpeg_start_decompress(&cinfo); +