imlib2: Update graphics/imlib to 1.5.1

pkgsrc changes:
- Remove lround patches: lround is no longer used
- Remove #ifndef blocks to rip out XShm support.  Unfortunately
  the logic is much more convoluted now and #ifndef parts of the code
  no longer scale.
  Please note that this can break support on Interix!

Changes:
1.5.1
*****
Kim Woelders (13):
 - Fix build without HAVE_X11_SHM_FD (T6752)
 - XPM loader: Fix potential use of uninitialized value (T6746)
 - BMP loader: Fix infinite loop with invalid bmp images (T6749)
 - PNM loader: Simplify (fixing ASCII format parsing issues T6751)
 - BMP loader: Fix warnings found with -O3
 - Maximum image dimension should be 32767, not 32766
 - PNG loader: Correct various error handling cases
 - Add missing const to imlib_apply_filter() script argument
 - Warning fixes in imlib2_... programs
 - imlib2_view: Limit window dimensions to 32767
 - grab.c: Fix gcc8 warning
 - imlib2_conv.c: Fix gcc8 warning
 - 1.5.1.

1.5.0
*****
Alexander Volkov (3):
 - put a check for shared memory inside __imlib_ShmGetXImage()
 - introduce __imlib_ShmDestroyXImage() instead of __imlib_ShmDetach()
 - Add support for MIT-SHM FD-passing

Kim Woelders (19):
 - XPM loader: Fix incorrect image invalidation.
 - Make some more functions static.
 - Introduce __imlib_LoadImageData()
 - Remove redundant CAST_IMAGE()
 - imlib2_grab: Always use imlib_create_scaled_image_from_drawable() to grab image
 - imlib_create_scaled_image_from_drawable(): speed up 1:1 case
 - imlib_create_scaled_image_from_drawable(): Drop shape handling if unshaped
 - Indent
 - Autofoo cosmetics
 - Strip trailing whitespace, cosmetics
 - Fix potential OOB memory access if border elements are negative
 - Fix potential OOB memory access if border sizes exceed image dimensions
 - Introduce IMLIB2_SHM_OPT to enable overriding/testing SHM modes
 - Add IMLIB2_XIMAGE_CACHE_COUNT to enable testing the ximage cache
 - Refactor the XImage cache
 - Add imlib_get_cache_used()
 - Expose XImage cache control functions
 - Drop -Waggregate-return
 - 1.5.0.

6 files changed, 7 insertions, 172 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 4f6a2fcf3e8..f107c893251 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2018/07/04 13:40:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.76 2018/11/29 13:58:58 leot Exp $
 
-DISTNAME=	imlib2-1.4.10
+DISTNAME=	imlib2-1.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 21b0dd1fb99..14bb8de4235 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.38 2018/01/25 20:13:08 leot Exp $
+$NetBSD: distinfo,v 1.39 2018/11/29 13:58:58 leot Exp $
 
-SHA1 (imlib2-1.4.10.tar.bz2) = 664df65c6265a2825d685d2f3a4f0d072eb626ac
-RMD160 (imlib2-1.4.10.tar.bz2) = 85ef0cff8a9aed6af4a12b3a2884a756e74bb09b
-SHA512 (imlib2-1.4.10.tar.bz2) = 5bad7d2100b1706a3f7eed5fedd12afdb643c647823472b515dac3753ff5293d0fae08be7f06ad16e63968e548c9e82ab5e6d7a938e5359903f57be24cd2a07b
-Size (imlib2-1.4.10.tar.bz2) = 923420 bytes
-SHA1 (patch-ab) = 9ec9287a8003760e3c330b6a751c0d28bef19afc
-SHA1 (patch-ac) = b570d72992643d88edbd00126cf77b5ffcd79d49
-SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a
-SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0
+SHA1 (imlib2-1.5.1.tar.bz2) = 3e97e7157380f0cfbdf4f3c950a7a00bdfa6072c
+RMD160 (imlib2-1.5.1.tar.bz2) = 10afbce09a9e710beaadf04cce76e9885024dfd6
+SHA512 (imlib2-1.5.1.tar.bz2) = f9d971674887d4af067c6921e34b6fe598db0317052bc864b676c526b36373ce021d9d49cad95aa64dbbd8e74f1831ddf3ed105900e3df2b66a6b53f7f27c732
+Size (imlib2-1.5.1.tar.bz2) = 919810 bytes
 SHA1 (patch-imlib2-config.in) = 22bd429a029e1071f1920ed2261cb94fd66b1146
 SHA1 (patch-src_lib_amd64__blend.S) = 09e89c6b1d6fb622b3ee88f6c3a5e9b6f3ab3fad
 SHA1 (patch-src_lib_amd64__blend__cmod.S) = d533eeacd4b196086f1854c657d3e0773596790b
diff --git a/graphics/imlib2/patches/patch-ab b/graphics/imlib2/patches/patch-ab
deleted file mode 100644
index efb9a4a6c37..00000000000
--- a/graphics/imlib2/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2011/11/07 12:14:15 drochner Exp $
-
-This patch makes imlib2 compile on systems that don't have an lround
-function, which is defined in C99.
-
-Needed at least for NetBSD-1.6.2 and NetBSD-2.0.
-
---- src/lib/color_helpers.c.orig	2005-01-08 08:55:02.000000000 +0100
-+++ src/lib/color_helpers.c	2006-07-19 18:11:42.222074773 +0200
-@@ -1,4 +1,22 @@
-+#include <math.h>
-+#include <stdlib.h>
-+
- #include "color_helpers.h"
-+
-+#ifdef __DragonFly__
-+#include <sys/param.h>
-+#endif
-+
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || \
-+    (defined(__DragonFly__) && __DragonFly_version <= 130002)		\
-+  || defined(__sun) && defined(__SunOS_5_8)
-+#define lround(x) my_lround(x)
-+static long my_lround(double x)
-+{
-+	return (long) ((x) >= 0 ? (x) + 0.5 : (x) - 0.5);
-+}
-+#endif
-+
- /*
-  * Color space conversion helper routines
-  * Convert between rgb and hsv and between rgb and hls
diff --git a/graphics/imlib2/patches/patch-ac b/graphics/imlib2/patches/patch-ac
deleted file mode 100644
index f6f95cc36f3..00000000000
--- a/graphics/imlib2/patches/patch-ac
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2014/05/17 09:25:01 adam Exp $
-
-Add minimalist #ifndef blocks to rip out XShm support on Interix.
-
---- src/lib/grab.c.orig	2013-12-21 10:16:10.000000000 +0000
-+++ src/lib/grab.c
-@@ -528,7 +528,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
-    int                 i;
-    int                 src_x, src_y, src_w, src_h;
-    int                 width, height, clipx, clipy;
-+#ifndef __INTERIX
-    XShmSegmentInfo     shminfo, mshminfo;
-+#endif
-    XImage             *xim, *mxim;
-    XColor              cols[256];
- 
-@@ -661,11 +663,13 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
-       __imlib_ShmCheck(d);
- 
-    xim = NULL;
-+#ifndef __INTERIX
-    if (x_does_shm)
-      {
-         xim = __imlib_ShmGetXImage(d, v, p, xatt.depth, x, y, w, h, &shminfo);
-         is_shm = ! !xim;
-      }
-+#endif /* !__INTERIX */
-    if (!xim)
-       xim = XGetImage(d, p, x, y, w, h, 0xffffffff, ZPixmap);
-    if (!xim)
-@@ -736,8 +740,10 @@ __imlib_GrabDrawableToRGBA(DATA32 * data
-                             d, xim, mxim, v, xatt.depth, x, y, w, h, 0);
- 
-    /* destroy the Ximage */
-+#ifndef __INTERIX
-    if (is_shm)
-       __imlib_ShmDetach(d, &shminfo);
-+#endif /* !__INTERIX */
-    XDestroyImage(xim);
-    if (mxim)
-      {
diff --git a/graphics/imlib2/patches/patch-ad b/graphics/imlib2/patches/patch-ad
deleted file mode 100644
index 2c4fce873b8..00000000000
--- a/graphics/imlib2/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2011/01/31 10:22:26 wiz Exp $
-
-Use my_lround() on Interix too.
-
-Add minimalist #ifndef blocks to rip out XShm support on Interix.
-
---- src/lib/rend.c.orig	2004-11-01 04:39:42.000000000 -0500
-+++ src/lib/rend.c
-@@ -495,24 +495,30 @@ __imlib_RenderImage(Display * d, ImlibIm
-              gcm = XCreateGC(d, m, GCGraphicsExposures, &gcv);
-           }
-         /* write the mask */
-+#ifndef __INTERIX
-         if (shm)
-            /* write shm XImage */
-            XShmPutImage(d, m, gcm, mxim, 0, 0, dx, dy, dw, dh, False);
-         /* write regular XImage */
-         else
-+#endif /* !__INTERIX */
-            XPutImage(d, m, gcm, mxim, 0, 0, dx, dy, dw, dh);
-      }
-    /* write the image */
-+#ifndef __INTERIX
-    if (shm)
-       /* write shm XImage */
-       XShmPutImage(d, w, gc, xim, 0, 0, dx, dy, dw, dh, False);
-    /* write regular XImage */
-    else
-+#endif /* !__INTERIX */
-       XPutImage(d, w, gc, xim, 0, 0, dx, dy, dw, dh);
-    /* free the XImage and put onto our free list */
-    /* wait for the write to be done */
-+#ifndef __INTERIX
-    if (shm)
-       XSync(d, False);
-+#endif /* !__INTERIX */
-    __imlib_ConsumeXImage(d, xim);
-    if (m)
-       __imlib_ConsumeXImage(d, mxim);
diff --git a/graphics/imlib2/patches/patch-ae b/graphics/imlib2/patches/patch-ae
deleted file mode 100644
index c60c6bc5b77..00000000000
--- a/graphics/imlib2/patches/patch-ae
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2011/05/18 10:04:26 drochner Exp $
-
-Add minimalist #ifndef blocks to rip out XShm support on Interix.
-
---- src/lib/ximage.c.orig	2010-05-05 18:25:50.000000000 +0000
-+++ src/lib/ximage.c
-@@ -36,11 +36,13 @@ TmpXError(Display * d, XErrorEvent * ev)
- void
- __imlib_ShmCheck(Display * d)
- {
-+#ifndef __INTERIX
-    /* if its there set x_does_shm flag */
-    if (XShmQueryExtension(d))
-       x_does_shm = 2;           /* 2: __imlib_ShmGetXImage tests first XShmAttach */
-    /* clear the flag - no shm at all */
-    else
-+#endif /* !__INTERIX */
-       x_does_shm = 0;
- }
- 
-@@ -185,11 +187,13 @@ __imlib_FlushXImage(Display * d)
- 
-                   xim = list_xim[i];
-                   list_mem_use -= xim->bytes_per_line * xim->height;
-+#ifndef __INTERIX
-                   if (list_si[i])
-                     {
-                        __imlib_ShmDetach(d, list_si[i]);
-                        free(list_si[i]);
-                     }
-+#endif /* !__INTERIX */
-                   XDestroyImage(xim);
-                   list_num--;
-                   for (j = i; j < list_num; j++)
-@@ -316,12 +320,14 @@ __imlib_ProduceXImage(Display * d, Visua
- 
-    /* work on making a shared image */
-    xim = NULL;
-+#ifndef __INTERIX
-    /* if the server does shm */
-    if (x_does_shm)
-      {
-         xim = __imlib_ShmGetXImage(d, v, None, depth, 0, 0, w, h,
-                                    list_si[list_num - 1]);
-      }
-+#endif /* !__INTERIX */
-    /* ok if xim == NULL it all failed - fall back to XImages */
-    if (xim)
-      {