From owner-svn-ports-all@FreeBSD.ORG  Fri Dec 26 16:11:25 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 78FA6AC2;
 Fri, 26 Dec 2014 16:11:25 +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 64CC72650;
 Fri, 26 Dec 2014 16:11:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBQGBPgW084133;
 Fri, 26 Dec 2014 16:11:25 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBQGBPhU084110;
 Fri, 26 Dec 2014 16:11:25 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201412261611.sBQGBPhU084110@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 26 Dec 2014 16:11:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375631 - head/games/gracer/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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Dec 2014 16:11:25 -0000

Author: antoine
Date: Fri Dec 26 16:11:24 2014
New Revision: 375631
URL: https://svnweb.freebsd.org/changeset/ports/375631
QAT: https://qat.redports.org/buildarchive/r375631/

Log:
  Allow building with either giflib 4.2 or 5.0

Modified:
  head/games/gracer/files/patch-gr_texture.c

Modified: head/games/gracer/files/patch-gr_texture.c
==============================================================================
--- head/games/gracer/files/patch-gr_texture.c	Fri Dec 26 16:00:00 2014	(r375630)
+++ head/games/gracer/files/patch-gr_texture.c	Fri Dec 26 16:11:24 2014	(r375631)
@@ -1,6 +1,18 @@
---- common/gr_texture.c.orig	2000-03-01 05:27:18.000000000 +0100
-+++ common/gr_texture.c	2012-05-03 20:29:17.000000000 +0200
-@@ -419,7 +419,7 @@
+--- common/gr_texture.c.orig	2000-03-01 04:27:18 UTC
++++ common/gr_texture.c
+@@ -274,7 +274,11 @@ read_gif_file (GrTexture *texture, char 
+   int index;
+   int width, height;
+ 
++#if GIFLIB_MAJOR >= 5
++  file = DGifOpenFileName (filename, NULL);
++#else
+   file = DGifOpenFileName (filename);
++#endif
+   if (!file)
+     return -1;
+ 
+@@ -419,7 +423,7 @@ read_png_file (GrTexture *texture, char 
    if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) {
      goto ERROR;
    }
@@ -9,7 +21,7 @@
      goto ERROR;
    }
  
-@@ -431,7 +431,7 @@
+@@ -431,7 +435,7 @@ read_png_file (GrTexture *texture, char 
    if (!info_ptr) {
      goto ERROR;
    }