From owner-svn-ports-all@freebsd.org  Thu Nov 12 15:21:11 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 C1CD7A2CC16;
 Thu, 12 Nov 2015 15:21:11 +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 854E81E7A;
 Thu, 12 Nov 2015 15:21:11 +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 tACFLAEX066039;
 Thu, 12 Nov 2015 15:21:10 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tACFLAZf066038;
 Thu, 12 Nov 2015 15:21:10 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201511121521.tACFLAZf066038@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:21:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r401357 - head/multimedia/mplayer2/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:21:11 -0000

Author: antoine
Date: Thu Nov 12 15:21:10 2015
New Revision: 401357
URL: https://svnweb.freebsd.org/changeset/ports/401357

Log:
  Allow building with giflib 5.1
  
  PR:		204492

Modified:
  head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c

Modified: head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c
==============================================================================
--- head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c	Thu Nov 12 15:16:07 2015	(r401356)
+++ head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c	Thu Nov 12 15:21:10 2015	(r401357)
@@ -75,11 +75,16 @@
      free(priv);
      return NULL;
    }
-@@ -301,7 +301,7 @@ static void demux_close_gif(demuxer_t* d
+@@ -300,8 +300,12 @@ static void demux_close_gif(demuxer_t* d
+ {
    gif_priv_t *priv = demuxer->priv;
    if (!priv) return;
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++  if (priv->gif && DGifCloseFile(priv->gif, NULL) == GIF_ERROR)
++#else
    if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
 -    PrintGifError();
++#endif
 +    printf("%s\n", GifErrorString(GIF_ERROR));
    free(priv->refimg);
    free(priv);