Date: Thu, 12 Nov 2015 15:28:50 +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: r401358 - head/misc/magicpoint/files Message-ID: <201511121528.tACFSoKG068301@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Thu Nov 12 15:28:50 2015 New Revision: 401358 URL: https://svnweb.freebsd.org/changeset/ports/401358 Log: Allow building with giflib 5.1 PR: 204492 Modified: head/misc/magicpoint/files/patch-gif.c Modified: head/misc/magicpoint/files/patch-gif.c ============================================================================== --- head/misc/magicpoint/files/patch-gif.c Thu Nov 12 15:21:10 2015 (r401357) +++ head/misc/magicpoint/files/patch-gif.c Thu Nov 12 15:28:50 2015 (r401358) @@ -120,11 +120,16 @@ exit(-1); } } -@@ -180,7 +229,11 @@ gifLoad(fullname, name, verbose) +@@ -179,8 +228,16 @@ gifLoad(fullname, name, verbose) + pixline[x] = GifRow[x]; } ++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5 ++ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) { ++#else if (DGifCloseFile(GifFile) == GIF_ERROR) { - PrintGifError(); ++#endif +#if GIFLIB_MAJOR >= 5 + localPrintGifError(GifFile->Error); +#else @@ -133,7 +138,7 @@ exit(-1); } -@@ -196,7 +249,11 @@ gifIdent(fullname, name) +@@ -196,11 +253,19 @@ gifIdent(fullname, name) GifFileType *gifp; int ret; @@ -145,3 +150,11 @@ if (gifp == NULL) ret = 0; else { ++#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5 ++ DGifCloseFile(gifp, NULL); ++#else + DGifCloseFile(gifp); ++#endif + tellAboutImage(name); + ret = 1; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511121528.tACFSoKG068301>