From owner-svn-ports-all@freebsd.org  Thu Nov 12 15:47:57 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86EA4A2D1C7;
 Thu, 12 Nov 2015 15:47:57 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 43B411DBA;
 Thu, 12 Nov 2015 15:47:57 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tACFluFI074192;
 Thu, 12 Nov 2015 15:47:56 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tACFluMx074191;
 Thu, 12 Nov 2015 15:47:56 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201511121547.tACFluMx074191@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 12 Nov 2015 15:47:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401361 - head/graphics/swftools/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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Nov 2015 15:47:57 -0000

Author: antoine
Date: Thu Nov 12 15:47:56 2015
New Revision: 401361
URL: https://svnweb.freebsd.org/changeset/ports/401361

Log:
  Allow building with giflib 5.1
  
  PR:		204492

Modified:
  head/graphics/swftools/files/patch-gif2swf.c

Modified: head/graphics/swftools/files/patch-gif2swf.c
==============================================================================
--- head/graphics/swftools/files/patch-gif2swf.c	Thu Nov 12 15:41:21 2015	(r401360)
+++ head/graphics/swftools/files/patch-gif2swf.c	Thu Nov 12 15:47:56 2015	(r401361)
@@ -49,7 +49,19 @@
          return t;
      }
  
-@@ -488,7 +515,11 @@ int CheckInputFile(char *fname, char **r
+@@ -455,7 +482,11 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c
+ 
+     free(pal);
+     free(imagedata);
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    DGifCloseFile(gft, NULL);
++#else
+     DGifCloseFile(gft);
++#endif
+ 
+     return t;
+ }
+@@ -488,7 +519,11 @@ int CheckInputFile(char *fname, char **r
      }
      fclose(fi);
  
@@ -61,7 +73,7 @@
          fprintf(stderr, "%s is not a GIF file!\n", fname);
          return -1;
      }
-@@ -499,7 +530,11 @@ int CheckInputFile(char *fname, char **r
+@@ -499,7 +534,11 @@ int CheckInputFile(char *fname, char **r
          global.max_image_height = gft->SHeight;
  
      if (DGifSlurp(gft) != GIF_OK) { 
@@ -74,3 +86,15 @@
          return -1;
      }
      // After DGifSlurp() call, gft->ImageCount become available
+@@ -518,7 +557,11 @@ int CheckInputFile(char *fname, char **r
+             fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0);
+     }
+ 
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    DGifCloseFile(gft, NULL);
++#else
+     DGifCloseFile(gft);
++#endif
+ 
+     return 0;
+ }