diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-24 22:02:20 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-24 22:02:20 +0000 |
| commit | 83e776e2291177d204a76c90a57ec091c22b2f63 (patch) | |
| tree | 9f755da75fe7098c200089d328ef3108ce557599 /graphics | |
| parent | Properly support png 1.5 (diff) | |
Allow building with either giflib 4 or 5
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/imlib2/Makefile | 2 | ||||
| -rw-r--r-- | graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 943099ebd2e3..6206c06ccff4 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -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 diff --git a/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c b/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c new file mode 100644 index 000000000000..1006cbc397d2 --- /dev/null +++ b/graphics/imlib2/files/patch-src_modules_loaders_loader__gif.c @@ -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); |