svn commit: r375489 - in head/graphics/imlib2: . files

[Antoine Brodin]

Author: antoine
Date: Wed Dec 24 22:02:20 2014
New Revision: 375489
URL: https://svnweb.freebsd.org/changeset/ports/375489
QAT: https://qat.redports.org/buildarchive/r375489/

Log:
  Allow building with either giflib 4 or 5

Added:
  head/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c   (contents, props changed)
Modified:
  head/graphics/imlib2/Makefile

Modified: head/graphics/imlib2/Makefile
==============================================================================
--- head/graphics/imlib2/Makefile	Wed Dec 24 21:53:51 2014	(r375488)
+++ head/graphics/imlib2/Makefile	Wed Dec 24 22:02:20 2014	(r375489)
@@ -64,7 +64,7 @@ PLIST_SUB+=	JPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 PLIST_SUB+=	PNG=""
 .else
 CONFIGURE_ARGS+=	--without-png

Added: head/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c	Wed Dec 24 22:02:20 2014	(r375489)
@@ -0,0 +1,14 @@
+--- src/modules/loaders/loader_gif.c.orig	2013-12-21 10:16:10 UTC
++++ src/modules/loaders/loader_gif.c
+@@ -36,7 +36,11 @@ load(ImlibImage * im, ImlibProgressFunct
+ #endif
+    if (fd < 0)
+       return 0;
++#if GIFLIB_MAJOR >= 5
++   gif = DGifOpenFileHandle(fd, NULL);
++#else
+    gif = DGifOpenFileHandle(fd);
++#endif
+    if (!gif)
+      {
+         close(fd);