Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Nov 2015 16:07:45 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401362 - head/emulators/vice/files
Message-ID:  <201511121607.tACG7jNJ079995@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Nov 12 16:07:45 2015
New Revision: 401362
URL: https://svnweb.freebsd.org/changeset/ports/401362

Log:
  Allow building with giflib 5.1
  
  PR:		204492

Added:
  head/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c   (contents, props changed)

Added: head/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/vice/files/patch-src_gfxoutputdrv_gifdrv.c	Thu Nov 12 16:07:45 2015	(r401362)
@@ -0,0 +1,50 @@
+--- src/gfxoutputdrv/gifdrv.c.orig	2012-07-25 23:46:05 UTC
++++ src/gfxoutputdrv/gifdrv.c
+@@ -114,7 +114,11 @@ static int gifdrv_open(screenshot_t *scr
+   if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
+       EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
+   {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    EGifCloseFile(sdata->fd, NULL);
++#else
+     EGifCloseFile(sdata->fd);
++#endif
+     VICE_FreeMapObject(gif_colors);
+     lib_free(sdata->data);
+     lib_free(sdata->ext_filename);
+@@ -145,7 +149,11 @@ static int gifdrv_close(screenshot_t *sc
+ 
+     sdata = screenshot->gfxoutputdrv_data;
+ 
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    EGifCloseFile(sdata->fd, NULL);
++#else
+     EGifCloseFile(sdata->fd);
++#endif
+     VICE_FreeMapObject(gif_colors);
+ 
+     /* for some reason giflib will create a file with unexpected
+@@ -184,7 +192,11 @@ static char *gifdrv_memmap_ext_filename;
+ 
+ static int gifdrv_close_memmap(void)
+ {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++  EGifCloseFile(gifdrv_memmap_fd, NULL);
++#else
+   EGifCloseFile(gifdrv_memmap_fd);
++#endif
+   VICE_FreeMapObject(gif_colors);
+   lib_free(gifdrv_memmap_ext_filename);
+ 
+@@ -231,7 +243,11 @@ static int gifdrv_open_memmap(const char
+   if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+       EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
+   {
++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
++    EGifCloseFile(gifdrv_memmap_fd);
++#else
+     EGifCloseFile(gifdrv_memmap_fd);
++#endif
+     VICE_FreeMapObject(gif_colors);
+     lib_free(gifdrv_memmap_ext_filename);
+     return -1;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511121607.tACG7jNJ079995>