From owner-svn-ports-head@FreeBSD.ORG Fri Dec 26 17:59:27 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9E1A904; Fri, 26 Dec 2014 17:59:26 +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 BC6E3665EA; Fri, 26 Dec 2014 17:59:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBQHxQWL034809; Fri, 26 Dec 2014 17:59:26 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBQHxQCg034806; Fri, 26 Dec 2014 17:59:26 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412261759.sBQHxQCg034806@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 26 Dec 2014 17:59:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375644 - head/graphics/ming/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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Dec 2014 17:59:27 -0000 Author: antoine Date: Fri Dec 26 17:59:25 2014 New Revision: 375644 URL: https://svnweb.freebsd.org/changeset/ports/375644 QAT: https://qat.redports.org/buildarchive/r375644/ Log: Allow building with either giflib 4.2 or 5.0 Added: head/graphics/ming/files/ head/graphics/ming/files/patch-src_blocks_gifdbl.c (contents, props changed) head/graphics/ming/files/patch-util_gif2dbl.c (contents, props changed) head/graphics/ming/files/patch-util_gif2mask.c (contents, props changed) Added: head/graphics/ming/files/patch-src_blocks_gifdbl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ming/files/patch-src_blocks_gifdbl.c Fri Dec 26 17:59:25 2014 (r375644) @@ -0,0 +1,26 @@ +--- src/blocks/gifdbl.c.orig 2010-10-10 07:19:23 UTC ++++ src/blocks/gifdbl.c +@@ -227,7 +227,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro + SWFDBLBitmapData ret; + struct dbl_data gifdata; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpenFileName(fileName, NULL)) == NULL) ++#else + if((file = DGifOpenFileName(fileName)) == NULL) ++#endif + return NULL; + if(!readGif(file, &gifdata)) + return NULL; +@@ -246,7 +250,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro + SWFDBLBitmapData ret; + struct dbl_data gifdata; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpen(input, (InputFunc) gifReadFunc, NULL)) == NULL) ++#else + if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL) ++#endif + return NULL; + if(!readGif(file, &gifdata)) + return NULL; Added: head/graphics/ming/files/patch-util_gif2dbl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ming/files/patch-util_gif2dbl.c Fri Dec 26 17:59:25 2014 (r375644) @@ -0,0 +1,14 @@ +--- util/gif2dbl.c.orig 2013-06-08 14:08:51 UTC ++++ util/gif2dbl.c +@@ -59,7 +59,11 @@ unsigned char *readGif(char *fileName, i + unsigned char *p; + int i, nColors, size, alpha, bgColor, alignedWidth; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpenFileName(fileName, NULL)) == NULL) ++#else + if((file = DGifOpenFileName(fileName)) == NULL) ++#endif + error("Error opening file"); + + if(DGifSlurp(file) != GIF_OK) Added: head/graphics/ming/files/patch-util_gif2mask.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ming/files/patch-util_gif2mask.c Fri Dec 26 17:59:25 2014 (r375644) @@ -0,0 +1,14 @@ +--- util/gif2mask.c.orig 2013-06-08 14:08:51 UTC ++++ util/gif2mask.c +@@ -28,7 +28,11 @@ unsigned char *readGif(char *fileName, i + unsigned char *data; + int i, nColors, size; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpenFileName(fileName, NULL)) == NULL) ++#else + if((file = DGifOpenFileName(fileName)) == NULL) ++#endif + error("Error opening file"); + + if(DGifSlurp(file) != GIF_OK)