Update jasper to 2.0.16

This is needed to be able to update gegl to latest version.
Bump revision of all consumer as the ABI is not 100% backward compatible.
Provide a patch for graphics/devil to properly build with latest jasper.
While here add a missing USES=xorg to graphics/devil

32 files changed, 23 insertions, 1840 deletions

diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 307d87105dfb..7fc3ffff7d87 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -2,34 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	jasper
-PORTVERSION=	1.900.1
-PORTREVISION=	17
+PORTVERSION=	2.0.16
+DISTVERSIONPREFIX=	version-
 CATEGORIES=	graphics
-MASTER_SITES=	https://www.ece.uvic.ca/~frodo/jasper/software/ \
-		ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Implementation of the codec specified in the JPEG-2000 standard
 
 LICENSE=	MIT
 
-OPTIONS_DEFINE=	OPENGL UUID DOCS
-OPTIONS_DEFAULT=UUID
+OPTIONS_DEFINE=	OPENGL DOCS
+OPTIONS_DEFAULT=	OPENGL
 OPTIONS_SUB=	yes
-UUID_DESC=	UUID support (required by GDAL)
 
-CONFIGURE_ARGS=	--enable-shared --enable-static
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		jpeg libtool:keepla localbase zip
+USES=		cmake jpeg localbase
 
-OPENGL_CONFIGURE_ENABLE=opengl
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	mdadams
+
+OPENGL_CMAKE_BOOL=	JAS_ENABLE_OPENGL
 OPENGL_USES=		gl xorg
 OPENGL_USE=		GL=glut XORG=x11,xext,xi,xmu
-UUID_EXTRA_PATCHES=	${PATCHDIR}/uuid.patch
 
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}/
+CMAKE_ARGS=	-DJAS_ENABLE_JPEG=true \
+		-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=false \
+		-DCMAKE_SKIP_RPATH=true
+
+DOCSDIR=	${PREFIX}/share/doc/JasPer
+
+post-install-DOCS-off:
+	rm -rf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
index 959ea14b05f0..67ec3d682732 100644
--- a/graphics/jasper/distinfo
+++ b/graphics/jasper/distinfo
@@ -1,2 +1,3 @@
-SHA256 (jasper-1.900.1.zip) = 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
-SIZE (jasper-1.900.1.zip) = 1415752
+TIMESTAMP = 1577441210
+SHA256 (mdadams-jasper-version-2.0.16_GH0.tar.gz) = f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1
+SIZE (mdadams-jasper-version-2.0.16_GH0.tar.gz) = 1311944
diff --git a/graphics/jasper/files/patch-atexit b/graphics/jasper/files/patch-atexit
deleted file mode 100644
index 3b5fe5ba21e5..000000000000
--- a/graphics/jasper/files/patch-atexit
+++ /dev/null
@@ -1,31 +0,0 @@
-When compiling with gcc don't register jas_cleanup with atexit.
-Instead, mark it as a destructor using a gcc-only extension.
-
-This will avoid crashes, when an application, which has explicitly
-dlclosed() libjasper, exits.
-
-If a similar method exists for other compilers, it should be used
-too.  Or, maybe, something can be done with __cxa_atexit() here...
-
-	-mi
-
---- src/libjasper/include/jasper/jas_init.h	2007-01-19 16:43:04.000000000 -0500
-+++ src/libjasper/include/jasper/jas_init.h	2007-08-05 11:42:41.000000000 -0400
-@@ -75,5 +75,9 @@
- int jas_init(void);
- 
-+#ifdef __GNUC__
-+void jas_cleanup(void) __attribute__ ((destructor));
-+#else
- void jas_cleanup(void);
-+#endif
- 
- #ifdef __cplusplus
---- src/libjasper/base/jas_init.c	2007-01-19 16:43:05.000000000 -0500
-+++ src/libjasper/base/jas_init.c	2007-08-05 11:44:00.000000000 -0400
-@@ -152,5 +152,4 @@
- 	as it ensures that the JasPer exit handler is called before the
- 	debug memory allocator exit handler. */
--	atexit(jas_cleanup);
- 
- 	return 0;
diff --git a/graphics/jasper/files/patch-bmp_dec.c b/graphics/jasper/files/patch-bmp_dec.c
deleted file mode 100644
index 370bb48e9ba9..000000000000
--- a/graphics/jasper/files/patch-bmp_dec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/bmp/bmp_dec.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/bmp/bmp_dec.c	2013-04-17 22:32:23.000000000 +0200
-@@ -283,7 +283,7 @@
- 	}
- 
- 	if (info->numcolors > 0) {
--		if (!(info->palents = jas_malloc(info->numcolors *
-+		if (!(info->palents = jas_malloc2(info->numcolors,
- 		  sizeof(bmp_palent_t)))) {
- 			bmp_info_destroy(info);
- 			return 0;
diff --git a/graphics/jasper/files/patch-jas_cm.c b/graphics/jasper/files/patch-jas_cm.c
deleted file mode 100644
index 73f9415bd78b..000000000000
--- a/graphics/jasper/files/patch-jas_cm.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/libjasper/base/jas_cm.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/base/jas_cm.c	2013-04-17 22:32:23.000000000 +0200
-@@ -704,8 +704,7 @@
- {
- 	jas_cmpxform_t **p;
- 	assert(n >= pxformseq->numpxforms);
--	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
--	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
-+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
- 	if (!p) {
- 		return -1;
- 	}
-@@ -889,13 +888,13 @@
- 	jas_cmshapmatlut_cleanup(lut);
- 	if (curv->numents == 0) {
- 		lut->size = 2;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_malloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		lut->data[0] = 0.0;
- 		lut->data[1] = 1.0;
- 	} else if (curv->numents == 1) {
- 		lut->size = 256;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_malloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		gamma = curv->ents[0] / 256.0;
- 		for (i = 0; i < lut->size; ++i) {
-@@ -903,7 +902,7 @@
- 		}
- 	} else {
- 		lut->size = curv->numents;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_malloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		for (i = 0; i < lut->size; ++i) {
- 			lut->data[i] = curv->ents[i] / 65535.0;
-@@ -953,7 +952,7 @@
- 			return -1;
- 		}
- 	}
--	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
-+	if (!(invlut->data = jas_malloc2(n, sizeof(jas_cmreal_t))))
- 		return -1;
- 	invlut->size = n;
- 	for (i = 0; i < invlut->size; ++i) {
diff --git a/graphics/jasper/files/patch-jas_icc.c b/graphics/jasper/files/patch-jas_icc.c
deleted file mode 100644
index 19d5192d34ae..000000000000
--- a/graphics/jasper/files/patch-jas_icc.c
+++ /dev/null
@@ -1,139 +0,0 @@
---- src/libjasper/base/jas_icc.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/base/jas_icc.c	2016-02-20 13:49:45.521860000 +0100
-@@ -373,7 +373,7 @@
- 	jas_icctagtab_t *tagtab;
- 
- 	tagtab = &prof->tagtab;
--	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
-+	if (!(tagtab->ents = jas_malloc2(prof->attrtab->numattrs,
- 	  sizeof(jas_icctagtabent_t))))
- 		goto error;
- 	tagtab->numents = prof->attrtab->numattrs;
-@@ -522,7 +522,7 @@
- 	}
- 	if (jas_iccgetuint32(in, &tagtab->numents))
- 		goto error;
--	if (!(tagtab->ents = jas_malloc(tagtab->numents *
-+	if (!(tagtab->ents = jas_malloc2(tagtab->numents,
- 	  sizeof(jas_icctagtabent_t))))
- 		goto error;
- 	tagtabent = tagtab->ents;
-@@ -743,8 +743,7 @@
- {
- 	jas_iccattr_t *newattrs;
- 	assert(maxents >= tab->numattrs);
--	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
--	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
-+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
- 	if (!newattrs)
- 		return -1;
- 	tab->attrs = newattrs;
-@@ -999,7 +998,7 @@
- 
- 	if (jas_iccgetuint32(in, &curv->numents))
- 		goto error;
--	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
-+	if (!(curv->ents = jas_malloc2(curv->numents, sizeof(jas_iccuint16_t))))
- 		goto error;
- 	for (i = 0; i < curv->numents; ++i) {
- 		if (jas_iccgetuint16(in, &curv->ents[i]))
-@@ -1011,7 +1010,6 @@
- 	return 0;
- 
- error:
--	jas_icccurv_destroy(attrval);
- 	return -1;
- }
- 
-@@ -1100,7 +1098,7 @@
- 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
- 	  jas_iccgetuint32(in, &txtdesc->uclen))
- 		goto error;
--	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
-+	if (!(txtdesc->ucdata = jas_malloc2(txtdesc->uclen, 2)))
- 		goto error;
- 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
- 	  JAS_CAST(int, txtdesc->uclen * 2))
-@@ -1129,7 +1127,6 @@
- #endif
- 	return 0;
- error:
--	jas_icctxtdesc_destroy(attrval);
- 	return -1;
- }
- 
-@@ -1208,8 +1205,6 @@
- 		goto error;
- 	return 0;
- error:
--	if (txt->string)
--		jas_free(txt->string);
- 	return -1;
- }
- 
-@@ -1292,17 +1287,17 @@
- 	  jas_iccgetuint16(in, &lut8->numouttabents))
- 		goto error;
- 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
--	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
--	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->intabs = jas_malloc(lut8->numinchans *
-+	if (!(lut8->clut = jas_malloc2(clutsize, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->intabsbuf = jas_malloc3(lut8->numinchans,
-+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->intabs = jas_malloc2(lut8->numinchans,
- 	  sizeof(jas_iccuint8_t *))))
- 		goto error;
- 	for (i = 0; i < lut8->numinchans; ++i)
- 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
--	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
--	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
-+	if (!(lut8->outtabsbuf = jas_malloc3(lut8->numoutchans,
-+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->outtabs = jas_malloc2(lut8->numoutchans,
- 	  sizeof(jas_iccuint8_t *))))
- 		goto error;
- 	for (i = 0; i < lut8->numoutchans; ++i)
-@@ -1330,7 +1325,6 @@
- 		goto error;
- 	return 0;
- error:
--	jas_icclut8_destroy(attrval);
- 	return -1;
- }
- 
-@@ -1461,17 +1455,17 @@
- 	  jas_iccgetuint16(in, &lut16->numouttabents))
- 		goto error;
- 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
--	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
--	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->intabs = jas_malloc(lut16->numinchans *
-+	if (!(lut16->clut = jas_malloc2(clutsize, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->intabsbuf = jas_malloc3(lut16->numinchans,
-+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->intabs = jas_malloc2(lut16->numinchans,
- 	  sizeof(jas_iccuint16_t *))))
- 		goto error;
- 	for (i = 0; i < lut16->numinchans; ++i)
- 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
--	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
--	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
-+	if (!(lut16->outtabsbuf = jas_malloc3(lut16->numoutchans,
-+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->outtabs = jas_malloc2(lut16->numoutchans,
- 	  sizeof(jas_iccuint16_t *))))
- 		goto error;
- 	for (i = 0; i < lut16->numoutchans; ++i)
-@@ -1499,7 +1493,6 @@
- 		goto error;
- 	return 0;
- error:
--	jas_icclut16_destroy(attrval);
- 	return -1;
- }
- 
diff --git a/graphics/jasper/files/patch-jas_image.c b/graphics/jasper/files/patch-jas_image.c
deleted file mode 100644
index f14568cc4d7c..000000000000
--- a/graphics/jasper/files/patch-jas_image.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/libjasper/base/jas_image.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/base/jas_image.c	2016-02-20 13:59:00.999124000 +0100
-@@ -142,7 +142,7 @@
- 	image->inmem_ = true;
- 
- 	/* Allocate memory for the per-component information. */
--	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
-+	if (!(image->cmpts_ = jas_malloc2(image->maxcmpts_,
- 	  sizeof(jas_image_cmpt_t *)))) {
- 		jas_image_destroy(image);
- 		return 0;
-@@ -426,6 +426,10 @@
- 		return -1;
- 	}
- 
-+	if (!data->rows_) {
-+		return -1;
-+	}
-+
- 	if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
- 		if (jas_matrix_resize(data, height, width)) {
- 			return -1;
-@@ -479,6 +483,10 @@
- 		return -1;
- 	}
- 
-+	if (!data->rows_) {
-+		return -1;
-+	}
-+
- 	if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
- 		return -1;
- 	}
-@@ -774,8 +782,7 @@
- 	jas_image_cmpt_t **newcmpts;
- 	int cmptno;
- 
--	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
--	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
-+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
- 	if (!newcmpts) {
- 		return -1;
- 	}
diff --git a/graphics/jasper/files/patch-jas_malloc.c b/graphics/jasper/files/patch-jas_malloc.c
deleted file mode 100644
index 057d1afce4c6..000000000000
--- a/graphics/jasper/files/patch-jas_malloc.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/libjasper/base/jas_malloc.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/base/jas_malloc.c	2013-04-17 22:43:09.000000000 +0200
-@@ -76,6 +76,9 @@
- 
- /* We need the prototype for memset. */
- #include <string.h>
-+#include <limits.h>
-+#include <errno.h>
-+#include <stdint.h>
- 
- #include "jasper/jas_malloc.h"
- 
-@@ -113,19 +116,51 @@
- 
- void *jas_realloc(void *ptr, size_t size)
- {
--	return realloc(ptr, size);
-+	return ptr ? realloc(ptr, size) : malloc(size);
- }
- 
- void *jas_calloc(size_t nmemb, size_t size)
- {
- 	void *ptr;
-+
-+	ptr = jas_malloc2(nmemb, size);
-+	if (ptr)
-+		memset(ptr, 0, nmemb*size);
-+	return ptr;
-+}
-+
-+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
-+{
-+	if (!ptr)
-+		return jas_malloc2(nmemb, size);
-+	if (nmemb && SIZE_MAX / nmemb < size) {
-+		errno = ENOMEM;
-+		return NULL;
-+	}
-+	return jas_realloc(ptr, nmemb * size);
-+
-+}
-+
-+void *jas_malloc2(size_t nmemb, size_t size)
-+{
-+	if (nmemb && SIZE_MAX / nmemb < size) {
-+		errno = ENOMEM;
-+		return NULL;
-+	}
-+
-+	return jas_malloc(nmemb * size);
-+}
-+
-+void *jas_malloc3(size_t a, size_t b, size_t c)
-+{
- 	size_t n;
--	n = nmemb * size;
--	if (!(ptr = jas_malloc(n * sizeof(char)))) {
--		return 0;
-+
-+	if (a && SIZE_MAX / a < b) {
-+		errno = ENOMEM;
-+		return NULL;
- 	}
--	memset(ptr, 0, n);
--	return ptr;
-+
-+	return jas_malloc2(a*b, c);
- }
- 
- #endif
diff --git a/graphics/jasper/files/patch-jas_malloc.h b/graphics/jasper/files/patch-jas_malloc.h
deleted file mode 100644
index 8cb3c6a4ad79..000000000000
--- a/graphics/jasper/files/patch-jas_malloc.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/libjasper/include/jasper/jas_malloc.h.orig	2007-01-19 22:43:04.000000000 +0100
-+++ src/libjasper/include/jasper/jas_malloc.h	2013-04-17 22:16:16.000000000 +0200
-@@ -95,6 +95,9 @@
- #define	jas_free	MEMFREE
- #define	jas_realloc	MEMREALLOC
- #define	jas_calloc	MEMCALLOC
-+#define	jas_malloc2(a, b)	MEMALLOC((a)*(b))
-+#define	jas_malloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
-+#define	jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
- #endif
- 
- /******************************************************************************\
-@@ -115,6 +118,13 @@
- /* Allocate a block of memory and initialize the contents to zero. */
- void *jas_calloc(size_t nmemb, size_t size);
- 
-+/* size-checked double allocation .*/
-+void *jas_malloc2(size_t, size_t);
-+
-+void *jas_malloc3(size_t, size_t, size_t);
-+
-+void *jas_realloc2(void *, size_t, size_t);
-+
- #endif
- 
- #ifdef __cplusplus
diff --git a/graphics/jasper/files/patch-jas_seq.c b/graphics/jasper/files/patch-jas_seq.c
deleted file mode 100644
index ee301cd0858d..000000000000
--- a/graphics/jasper/files/patch-jas_seq.c
+++ /dev/null
@@ -1,84 +0,0 @@
---- src/libjasper/base/jas_seq.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/base/jas_seq.c	2016-02-20 13:59:01.014091000 +0100
-@@ -114,7 +114,7 @@
- 	matrix->datasize_ = numrows * numcols;
- 
- 	if (matrix->maxrows_ > 0) {
--		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
-+		if (!(matrix->rows_ = jas_malloc2(matrix->maxrows_,
- 		  sizeof(jas_seqent_t *)))) {
- 			jas_matrix_destroy(matrix);
- 			return 0;
-@@ -122,7 +122,7 @@
- 	}
- 
- 	if (matrix->datasize_ > 0) {
--		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
-+		if (!(matrix->data_ = jas_malloc2(matrix->datasize_,
- 		  sizeof(jas_seqent_t)))) {
- 			jas_matrix_destroy(matrix);
- 			return 0;
-@@ -220,7 +220,7 @@
- 	mat0->numrows_ = r1 - r0 + 1;
- 	mat0->numcols_ = c1 - c0 + 1;
- 	mat0->maxrows_ = mat0->numrows_;
--	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
-+	mat0->rows_ = jas_malloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
- 	for (i = 0; i < mat0->numrows_; ++i) {
- 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
- 	}
-@@ -262,6 +262,10 @@
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {
-@@ -282,6 +286,10 @@
- 	jas_seqent_t *data;
- 	int rowstep;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {
-@@ -306,6 +314,10 @@
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	assert(n >= 0);
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
-@@ -325,6 +337,10 @@
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {
-@@ -367,6 +383,10 @@
- 	int rowstep;
- 	jas_seqent_t *data;
- 
-+	if (!matrix->rows_) {
-+		return;
-+	}
-+
- 	rowstep = jas_matrix_rowstep(matrix);
- 	for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
- 	  rowstart += rowstep) {
diff --git a/graphics/jasper/files/patch-jas_stream.c b/graphics/jasper/files/patch-jas_stream.c
deleted file mode 100644
index 96caa9d050e8..000000000000
--- a/graphics/jasper/files/patch-jas_stream.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- src/libjasper/base/jas_stream.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/base/jas_stream.c	2015-08-29 08:07:01.000000000 +0200
-@@ -99,7 +99,7 @@
- static void jas_stream_destroy(jas_stream_t *stream);
- static jas_stream_t *jas_stream_create(void);
- static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
--  int bufsize);
-+  size_t bufsize);
- 
- static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt);
- static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt);
-@@ -168,7 +168,7 @@
- 	return stream;
- }
- 
--jas_stream_t *jas_stream_memopen(char *buf, int bufsize)
-+jas_stream_t *jas_stream_memopen(char *buf, size_t bufsize)
- {
- 	jas_stream_t *stream;
- 	jas_stream_memobj_t *obj;
-@@ -361,15 +361,14 @@
- 	}
- 	obj->fd = -1;
- 	obj->flags = 0;
--	obj->pathname[0] = '\0';
-+	snprintf(obj->pathname, sizeof(obj->pathname), "/tmp/jasper.XXXXXX");
- 	stream->obj_ = obj;
- 
- 	/* Choose a file name. */
--	tmpnam(obj->pathname);
-+	obj->fd = mkstemp(obj->pathname);
- 
- 	/* Open the underlying file. */
--	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
--	  JAS_STREAM_PERMS)) < 0) {
-+	if (obj->fd < 0) {
- 		jas_stream_destroy(stream);
- 		return 0;
- 	}
-@@ -553,7 +552,7 @@
- 	int ret;
- 
- 	va_start(ap, fmt);
--	ret = vsprintf(buf, fmt, ap);
-+	ret = vsnprintf(buf, sizeof(buf), fmt, ap);
- 	jas_stream_puts(stream, buf);
- 	va_end(ap);
- 	return ret;
-@@ -570,7 +569,7 @@
- 	return 0;
- }
- 
--char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize)
-+char *jas_stream_gets(jas_stream_t *stream, char *buf, size_t bufsize)
- {
- 	int c;
- 	char *bufptr;
-@@ -694,7 +693,7 @@
- \******************************************************************************/
- 
- static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
--  int bufsize)
-+  size_t bufsize)
- {
- 	/* If this function is being called, the buffer should not have been
- 	  initialized yet. */
-@@ -987,7 +986,7 @@
- 	return cnt;
- }
- 
--static int mem_resize(jas_stream_memobj_t *m, int bufsize)
-+static int mem_resize(jas_stream_memobj_t *m, size_t bufsize)
- {
- 	unsigned char *buf;
- 
diff --git a/graphics/jasper/files/patch-jas_stream.h b/graphics/jasper/files/patch-jas_stream.h
deleted file mode 100644
index d944ab8f8b95..000000000000
--- a/graphics/jasper/files/patch-jas_stream.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/libjasper/include/jasper/jas_stream.h.orig	2007-01-19 22:43:04.000000000 +0100
-+++ src/libjasper/include/jasper/jas_stream.h	2015-08-29 07:54:41.000000000 +0200
-@@ -215,7 +215,7 @@
- 	uchar *bufstart_;
- 
- 	/* The buffer size. */
--	int bufsize_;
-+	size_t bufsize_;
- 
- 	/* The current position in the buffer. */
- 	uchar *ptr_;
-@@ -267,7 +267,7 @@
- 	uchar *buf_;
- 
- 	/* The allocated size of the buffer for holding file data. */
--	int bufsize_;
-+	size_t bufsize_;
- 
- 	/* The length of the file. */
- 	int_fast32_t len_;
-@@ -291,7 +291,7 @@
- jas_stream_t *jas_stream_fopen(const char *filename, const char *mode);
- 
- /* Open a memory buffer as a stream. */
--jas_stream_t *jas_stream_memopen(char *buf, int bufsize);
-+jas_stream_t *jas_stream_memopen(char *buf, size_t bufsize);
- 
- /* Open a file descriptor as a stream. */
- jas_stream_t *jas_stream_fdopen(int fd, const char *mode);
-@@ -366,7 +366,7 @@
- int jas_stream_puts(jas_stream_t *stream, const char *s);
- 
- /* Read a line of input from a stream. */
--char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize);
-+char *jas_stream_gets(jas_stream_t *stream, char *buf, size_t bufsize);
- 
- /* Look at the next character to be read from a stream without actually
-   removing it from the stream. */
diff --git a/graphics/jasper/files/patch-jas_types.h b/graphics/jasper/files/patch-jas_types.h
deleted file mode 100644
index f515adb95f20..000000000000
--- a/graphics/jasper/files/patch-jas_types.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/libjasper/include/jasper/jas_types.h.orig	2007-01-19 22:43:04.000000000 +0100
-+++ src/libjasper/include/jasper/jas_types.h	2016-02-20 13:49:45.555375000 +0100
-@@ -179,13 +179,13 @@
- #endif
- /**********/
- #if !defined(INT_FAST64_MIN)
--typedef longlong int_fast64_t;
-+typedef long long int_fast64_t;
- #define INT_FAST64_MIN	LLONG_MIN
- #define INT_FAST64_MAX	LLONG_MAX
- #endif
- /**********/
- #if !defined(UINT_FAST64_MAX)
--typedef ulonglong uint_fast64_t;
-+typedef unsigned long long uint_fast64_t;
- #define UINT_FAST64_MAX	ULLONG_MAX
- #endif
- /**********/
diff --git a/graphics/jasper/files/patch-jp2_cod.c b/graphics/jasper/files/patch-jp2_cod.c
deleted file mode 100644
index ea838a43104c..000000000000
--- a/graphics/jasper/files/patch-jp2_cod.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/libjasper/jp2/jp2_cod.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/jp2/jp2_cod.c	2016-02-20 13:49:45.560559000 +0100
-@@ -247,7 +247,7 @@
- 	box = 0;
- 	tmpstream = 0;
- 
--	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
- 		goto error;
- 	}
- 	box->ops = &jp2_boxinfo_unk.ops;
-@@ -372,7 +372,7 @@
- 	jp2_bpcc_t *bpcc = &box->data.bpcc;
- 	unsigned int i;
- 	bpcc->numcmpts = box->datalen;
--	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
-+	if (!(bpcc->bpcs = jas_malloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < bpcc->numcmpts; ++i) {
-@@ -416,7 +416,7 @@
- 		break;
- 	case JP2_COLR_ICC:
- 		colr->iccplen = box->datalen - 3;
--		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
-+		if (!(colr->iccp = jas_malloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
- 			return -1;
- 		}
- 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
-@@ -453,7 +453,7 @@
- 	if (jp2_getuint16(in, &cdef->numchans)) {
- 		return -1;
- 	}
--	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
-+	if (!(cdef->ents = jas_malloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
- 		return -1;
- 	}
- 	for (channo = 0; channo < cdef->numchans; ++channo) {
-@@ -766,7 +766,7 @@
- 	unsigned int i;
- 
- 	cmap->numchans = (box->datalen) / 4;
--	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
-+	if (!(cmap->ents = jas_malloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < cmap->numchans; ++i) {
-@@ -828,10 +828,10 @@
- 		return -1;
- 	}
- 	lutsize = pclr->numlutents * pclr->numchans;
--	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
-+	if (!(pclr->lutdata = jas_malloc2(lutsize, sizeof(int_fast32_t)))) {
- 		return -1;
- 	}
--	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
-+	if (!(pclr->bpc = jas_malloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < pclr->numchans; ++i) {
diff --git a/graphics/jasper/files/patch-jp2_dec.c b/graphics/jasper/files/patch-jp2_dec.c
deleted file mode 100644
index da45b7b54cd8..000000000000
--- a/graphics/jasper/files/patch-jp2_dec.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/libjasper/jp2/jp2_dec.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/jp2/jp2_dec.c	2016-02-20 13:49:45.565514000 +0100
-@@ -291,7 +291,10 @@
- 	case JP2_COLR_ICC:
- 		iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
- 		  dec->colr->data.colr.iccplen);
--		assert(iccprof);
-+		if (!iccprof) {
-+			jas_eprintf("error: failed to parse ICC profile\n");
-+			goto error;
-+		}
- 		jas_iccprof_gethdr(iccprof, &icchdr);
- 		jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
- 		jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));
-@@ -336,7 +339,7 @@
- 	}
- 
- 	/* Allocate space for the channel-number to component-number LUT. */
--	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
-+	if (!(dec->chantocmptlut = jas_malloc2(dec->numchans, sizeof(uint_fast16_t)))) {
- 		jas_eprintf("error: no memory\n");
- 		goto error;
- 	}
-@@ -354,7 +357,7 @@
- 			if (cmapent->map == JP2_CMAP_DIRECT) {
- 				dec->chantocmptlut[channo] = channo;
- 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
--				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
-+				lutents = jas_malloc2(pclrd->numlutents, sizeof(int_fast32_t));
- 				for (i = 0; i < pclrd->numlutents; ++i) {
- 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
- 				}
-@@ -386,6 +389,11 @@
- 	/* Determine the type of each component. */
- 	if (dec->cdef) {
- 		for (i = 0; i < dec->numchans; ++i) {
-+			/* Is the channel number reasonable? */
-+			if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {
-+				jas_eprintf("error: invalid channel number in CDEF box\n");
-+				goto error;
-+			}
- 			jas_image_setcmpttype(dec->image,
- 			  dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
- 			  jp2_getct(jas_image_clrspc(dec->image),
diff --git a/graphics/jasper/files/patch-jp2_enc.c b/graphics/jasper/files/patch-jp2_enc.c
deleted file mode 100644
index 635110043b4f..000000000000
--- a/graphics/jasper/files/patch-jp2_enc.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/libjasper/jp2/jp2_enc.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/jp2/jp2_enc.c	2016-02-20 13:49:45.569962000 +0100
-@@ -191,7 +191,7 @@
- 		}
- 		bpcc = &box->data.bpcc;
- 		bpcc->numcmpts = jas_image_numcmpts(image);
--		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
-+		if (!(bpcc->bpcs = jas_malloc2(bpcc->numcmpts,
- 		  sizeof(uint_fast8_t)))) {
- 			goto error;
- 		}
-@@ -285,7 +285,7 @@
- 		}
- 		cdef = &box->data.cdef;
- 		cdef->numchans = jas_image_numcmpts(image);
--		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
-+		cdef->ents = jas_malloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
- 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
- 			cdefchanent = &cdef->ents[i];
- 			cdefchanent->channo = i;
diff --git a/graphics/jasper/files/patch-jpc_cs.c b/graphics/jasper/files/patch-jpc_cs.c
deleted file mode 100644
index 89903070c06a..000000000000
--- a/graphics/jasper/files/patch-jpc_cs.c
+++ /dev/null
@@ -1,90 +0,0 @@
---- src/libjasper/jpc/jpc_cs.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_cs.c	2013-04-17 22:11:18.000000000 +0200
-@@ -288,7 +288,7 @@
- 			jpc_ms_dump(ms, stderr);
- 		}
- 
--		if (JAS_CAST(ulong, jas_stream_tell(tmpstream)) != ms->len) {
-+		if (JAS_CAST(unsigned long, jas_stream_tell(tmpstream)) != ms->len) {
- 			jas_eprintf("warning: trailing garbage in marker segment (%ld bytes)\n",
- 			  ms->len - jas_stream_tell(tmpstream));
- 		}
-@@ -502,7 +502,7 @@
- 	  !siz->tileheight || !siz->numcomps) {
- 		return -1;
- 	}
--	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
-+	if (!(siz->comps = jas_malloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < siz->numcomps; ++i) {
-@@ -744,6 +744,10 @@
- 		return -1;
- 	}
- 	compparms->numrlvls = compparms->numdlvls + 1;
-+	if (compparms->numrlvls > JPC_MAXRLVLS) {
-+		jpc_cox_destroycompparms(compparms);
-+		return -1;
-+	}
- 	if (prtflag) {
- 		for (i = 0; i < compparms->numrlvls; ++i) {
- 			if (jpc_getuint8(in, &tmp)) {
-@@ -982,8 +986,12 @@
- 		compparms->numstepsizes = (len - n) / 2;
- 		break;
- 	}
-+	if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
-+		jpc_qcx_destroycompparms(compparms);
-+		return -1;
-+	}
- 	if (compparms->numstepsizes > 0) {
--		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
-+		compparms->stepsizes = jas_malloc2(compparms->numstepsizes,
- 		  sizeof(uint_fast16_t));
- 		assert(compparms->stepsizes);
- 		for (i = 0; i < compparms->numstepsizes; ++i) {
-@@ -1091,7 +1099,7 @@
- 
- 	ppm->len = ms->len - 1;
- 	if (ppm->len > 0) {
--		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
-+		if (!(ppm->data = jas_malloc2(ppm->len, sizeof(unsigned char)))) {
- 			goto error;
- 		}
- 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
-@@ -1160,7 +1168,7 @@
- 	}
- 	ppt->len = ms->len - 1;
- 	if (ppt->len > 0) {
--		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
-+		if (!(ppt->data = jas_malloc2(ppt->len, sizeof(unsigned char)))) {
- 			goto error;
- 		}
- 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
-@@ -1223,7 +1231,7 @@
- 	uint_fast8_t tmp;
- 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
- 	  (ms->len / 7);
--	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
-+	if (!(poc->pchgs = jas_malloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
- 		goto error;
- 	}
- 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
-@@ -1328,7 +1336,7 @@
- 	jpc_crgcomp_t *comp;
- 	uint_fast16_t compno;
- 	crg->numcomps = cstate->numcomps;
--	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
-+	if (!(crg->comps = jas_malloc2(cstate->numcomps, sizeof(jpc_crgcomp_t)))) {
- 		return -1;
- 	}
- 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
-@@ -1467,7 +1475,7 @@
- 	cstate = 0;
- 
- 	if (ms->len > 0) {
--		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
-+		if (!(unk->data = jas_malloc2(ms->len, sizeof(unsigned char)))) {
- 			return -1;
- 		}
- 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
diff --git a/graphics/jasper/files/patch-jpc_dec.c b/graphics/jasper/files/patch-jpc_dec.c
deleted file mode 100644
index 2042a17af10a..000000000000
--- a/graphics/jasper/files/patch-jpc_dec.c
+++ /dev/null
@@ -1,165 +0,0 @@
---- src/libjasper/jpc/jpc_dec.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_dec.c	2016-02-20 13:49:45.581508000 +0100
-@@ -449,7 +449,7 @@
- 
- 	if (dec->state == JPC_MH) {
- 
--		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
-+		compinfos = jas_malloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
- 		assert(compinfos);
- 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
- 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
-@@ -489,7 +489,7 @@
- 		dec->curtileendoff = 0;
- 	}
- 
--	if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
-+	if (JAS_CAST(int, sot->tileno) >= dec->numtiles) {
- 		jas_eprintf("invalid tile number in SOT marker segment\n");
- 		return -1;
- 	}
-@@ -692,7 +692,7 @@
- 			tile->realmode = 1;
- 		}
- 		tcomp->numrlvls = ccp->numrlvls;
--		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
-+		if (!(tcomp->rlvls = jas_malloc2(tcomp->numrlvls,
- 		  sizeof(jpc_dec_rlvl_t)))) {
- 			return -1;
- 		}
-@@ -764,7 +764,7 @@
- 			  rlvl->cbgheightexpn);
- 
- 			rlvl->numbands = (!rlvlno) ? 1 : 3;
--			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
-+			if (!(rlvl->bands = jas_malloc2(rlvl->numbands,
- 			  sizeof(jpc_dec_band_t)))) {
- 				return -1;
- 			}
-@@ -797,7 +797,7 @@
- 
- 				assert(rlvl->numprcs);
- 
--				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
-+				if (!(band->prcs = jas_malloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
- 					return -1;
- 				}
- 
-@@ -834,7 +834,7 @@
- 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
- 				return -1;
- 			}
--			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
-+			if (!(prc->cblks = jas_malloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
- 				return -1;
- 			}
- 
-@@ -1069,12 +1069,12 @@
- 	/* Apply an inverse intercomponent transform if necessary. */
- 	switch (tile->cp->mctid) {
- 	case JPC_MCT_RCT:
--		assert(dec->numcomps == 3);
-+		assert(dec->numcomps == 3 || dec->numcomps == 4);
- 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
- 		  tile->tcomps[2].data);
- 		break;
- 	case JPC_MCT_ICT:
--		assert(dec->numcomps == 3);
-+		assert(dec->numcomps == 3 || dec->numcomps == 4);
- 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
- 		  tile->tcomps[2].data);
- 		break;
-@@ -1181,7 +1181,7 @@
- 		return -1;
- 	}
- 
--	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
-+	if (!(dec->cmpts = jas_malloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
- 		return -1;
- 	}
- 
-@@ -1204,7 +1204,7 @@
- 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
- 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
- 	dec->numtiles = dec->numhtiles * dec->numvtiles;
--	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
-+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
- 		return -1;
- 	}
- 
-@@ -1228,7 +1228,7 @@
- 		tile->pkthdrstreampos = 0;
- 		tile->pptstab = 0;
- 		tile->cp = 0;
--		if (!(tile->tcomps = jas_malloc(dec->numcomps *
-+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
- 		  sizeof(jpc_dec_tcomp_t)))) {
- 			return -1;
- 		}
-@@ -1280,7 +1280,7 @@
- 	jpc_coc_t *coc = &ms->parms.coc;
- 	jpc_dec_tile_t *tile;
- 
--	if (JAS_CAST(int, coc->compno) > dec->numcomps) {
-+	if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
- 		jas_eprintf("invalid component number in COC marker segment\n");
- 		return -1;
- 	}
-@@ -1306,7 +1306,7 @@
- 	jpc_rgn_t *rgn = &ms->parms.rgn;
- 	jpc_dec_tile_t *tile;
- 
--	if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
-+	if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
- 		jas_eprintf("invalid component number in RGN marker segment\n");
- 		return -1;
- 	}
-@@ -1355,7 +1355,7 @@
- 	jpc_qcc_t *qcc = &ms->parms.qcc;
- 	jpc_dec_tile_t *tile;
- 
--	if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
-+	if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
- 		jas_eprintf("invalid component number in QCC marker segment\n");
- 		return -1;
- 	}
-@@ -1489,7 +1489,7 @@
- 	cp->numlyrs = 0;
- 	cp->mctid = 0;
- 	cp->csty = 0;
--	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
-+	if (!(cp->ccps = jas_malloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
- 		return 0;
- 	}
- 	if (!(cp->pchglist = jpc_pchglist_create())) {
-@@ -2048,7 +2048,7 @@
- 	}
- 	streamlist->numstreams = 0;
- 	streamlist->maxstreams = 100;
--	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
-+	if (!(streamlist->streams = jas_malloc2(streamlist->maxstreams,
- 	  sizeof(jas_stream_t *)))) {
- 		jas_free(streamlist);
- 		return 0;
-@@ -2068,8 +2068,8 @@
- 	/* Grow the array of streams if necessary. */
- 	if (streamlist->numstreams >= streamlist->maxstreams) {
- 		newmaxstreams = streamlist->maxstreams + 1024;
--		if (!(newstreams = jas_realloc(streamlist->streams,
--		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
-+		if (!(newstreams = jas_realloc2(streamlist->streams,
-+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
- 			return -1;
- 		}
- 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
-@@ -2155,8 +2155,8 @@
- {
- 	jpc_ppxstabent_t **newents;
- 	if (tab->maxents < maxents) {
--		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
--		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
-+		newents = jas_realloc2(tab->ents, maxents,
-+		  sizeof(jpc_ppxstabent_t *));
- 		if (!newents) {
- 			return -1;
- 		}
diff --git a/graphics/jasper/files/patch-jpc_enc.c b/graphics/jasper/files/patch-jpc_enc.c
deleted file mode 100644
index de1572093977..000000000000
--- a/graphics/jasper/files/patch-jpc_enc.c
+++ /dev/null
@@ -1,92 +0,0 @@
---- src/libjasper/jpc/jpc_enc.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_enc.c	2013-04-17 22:32:23.000000000 +0200
-@@ -403,7 +403,7 @@
- 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
- 	}
- 
--	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
-+	if (!(cp->ccps = jas_malloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
- 		goto error;
- 	}
- 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
-@@ -656,7 +656,7 @@
- 
- 	if (ilyrrates && numilyrrates > 0) {
- 		tcp->numlyrs = numilyrrates + 1;
--		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
-+		if (!(tcp->ilyrrates = jas_malloc2((tcp->numlyrs - 1),
- 		  sizeof(jpc_fix_t)))) {
- 			goto error;
- 		}
-@@ -940,7 +940,7 @@
- 	siz->tilewidth = cp->tilewidth;
- 	siz->tileheight = cp->tileheight;
- 	siz->numcomps = cp->numcmpts;
--	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
-+	siz->comps = jas_malloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
- 	assert(siz->comps);
- 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
- 		siz->comps[i].prec = cp->ccps[i].prec;
-@@ -977,7 +977,7 @@
- 		return -1;
- 	}
- 	crg = &enc->mrk->parms.crg;
--	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
-+	crg->comps = jas_malloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
- 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
- 		jas_eprintf("cannot write CRG marker\n");
- 		return -1;
-@@ -1955,7 +1955,7 @@
- 	tile->mctid = cp->tcp.mctid;
- 
- 	tile->numlyrs = cp->tcp.numlyrs;
--	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
-+	if (!(tile->lyrsizes = jas_malloc2(tile->numlyrs,
- 	  sizeof(uint_fast32_t)))) {
- 		goto error;
- 	}
-@@ -1964,7 +1964,7 @@
- 	}
- 
- 	/* Allocate an array for the per-tile-component information. */
--	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
-+	if (!(tile->tcmpts = jas_malloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
- 		goto error;
- 	}
- 	/* Initialize a few members critical for error recovery. */
-@@ -2110,7 +2110,7 @@
- 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
- 	  jas_seq2d_yend(tcmpt->data), bandinfos);
- 
--	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
-+	if (!(tcmpt->rlvls = jas_malloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
- 		goto error;
- 	}
- 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-@@ -2213,7 +2213,7 @@
- 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
- 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
- 
--	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
-+	if (!(rlvl->bands = jas_malloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
- 		goto error;
- 	}
- 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-@@ -2290,7 +2290,7 @@
- 	band->synweight = bandinfo->synenergywt;
- 
- if (band->data) {
--	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
-+	if (!(band->prcs = jas_malloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
- 		goto error;
- 	}
- 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
-@@ -2422,7 +2422,7 @@
- 			goto error;
- 		}
- 
--		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
-+		if (!(prc->cblks = jas_malloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
- 			goto error;
- 		}
- 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
diff --git a/graphics/jasper/files/patch-jpc_mqdec.c b/graphics/jasper/files/patch-jpc_mqdec.c
deleted file mode 100644
index f542fd1ea1f8..000000000000
--- a/graphics/jasper/files/patch-jpc_mqdec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/jpc/jpc_mqdec.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_mqdec.c	2013-04-17 22:32:23.000000000 +0200
-@@ -118,7 +118,7 @@
- 	mqdec->in = in;
- 	mqdec->maxctxs = maxctxs;
- 	/* Allocate memory for the per-context state information. */
--	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
-+	if (!(mqdec->ctxs = jas_malloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
- 		goto error;
- 	}
- 	/* Set the current context to the first context. */
diff --git a/graphics/jasper/files/patch-jpc_mqenc.c b/graphics/jasper/files/patch-jpc_mqenc.c
deleted file mode 100644
index fd4f3bd13bfd..000000000000
--- a/graphics/jasper/files/patch-jpc_mqenc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/jpc/jpc_mqenc.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_mqenc.c	2013-04-17 22:32:23.000000000 +0200
-@@ -197,7 +197,7 @@
- 	mqenc->maxctxs = maxctxs;
- 
- 	/* Allocate memory for the per-context state information. */
--	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
-+	if (!(mqenc->ctxs = jas_malloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
- 		goto error;
- 	}
- 
diff --git a/graphics/jasper/files/patch-jpc_qmfb.c b/graphics/jasper/files/patch-jpc_qmfb.c
deleted file mode 100644
index 86b68976f6a2..000000000000
--- a/graphics/jasper/files/patch-jpc_qmfb.c
+++ /dev/null
@@ -1,351 +0,0 @@
---- src/libjasper/jpc/jpc_qmfb.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_qmfb.c	2016-02-20 13:56:19.711609000 +0100
-@@ -305,12 +305,8 @@
- void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numcols, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numcols, 1);
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
-@@ -318,15 +314,13 @@
- 	register int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numcols >= 2) {
- 		hstartcol = (numcols + 1 - parity) >> 1;
-@@ -360,12 +354,10 @@
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -373,12 +365,8 @@
-   int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
-@@ -386,15 +374,13 @@
- 	register int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numrows >= 2) {
- 		hstartcol = (numrows + 1 - parity) >> 1;
-@@ -428,12 +414,10 @@
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -441,12 +425,8 @@
-   int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -457,15 +437,13 @@
- 	int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numrows >= 2) {
- 		hstartcol = (numrows + 1 - parity) >> 1;
-@@ -517,12 +495,10 @@
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -530,12 +506,8 @@
-   int stride, int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
- 	jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t splitbuf[bufsize * numcols];
--#endif
- 	jpc_fix_t *buf = splitbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -546,15 +518,13 @@
- 	int m;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	if (numrows >= 2) {
- 		hstartcol = (numrows + 1 - parity) >> 1;
-@@ -606,39 +576,31 @@
- 		}
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the split buffer was allocated on the heap, free this memory. */
- 	if (buf != splitbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
- void jpc_qmfb_join_row(jpc_fix_t *a, int numcols, int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numcols, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numcols, 1);
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
- 	register int n;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numcols + 1 - parity) >> 1;
- 
-@@ -670,12 +632,10 @@
- 		++srcptr;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -683,27 +643,21 @@
-   int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	register jpc_fix_t *srcptr;
- 	register jpc_fix_t *dstptr;
- 	register int n;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numrows + 1 - parity) >> 1;
- 
-@@ -735,12 +689,10 @@
- 		++srcptr;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -748,12 +700,8 @@
-   int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -763,15 +711,13 @@
- 	register int i;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numrows + 1 - parity) >> 1;
- 
-@@ -821,12 +767,10 @@
- 		srcptr += JPC_QMFB_COLGRPSIZE;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
-@@ -834,12 +778,8 @@
-   int stride, int parity)
- {
- 
--	int bufsize = JPC_CEILDIVPOW2(numrows, 1);
--#if !defined(HAVE_VLA)
-+	size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
- 	jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
--#else
--	jpc_fix_t joinbuf[bufsize * numcols];
--#endif
- 	jpc_fix_t *buf = joinbuf;
- 	jpc_fix_t *srcptr;
- 	jpc_fix_t *dstptr;
-@@ -849,15 +789,13 @@
- 	register int i;
- 	int hstartcol;
- 
--#if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_malloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
- 	}
--#endif
- 
- 	hstartcol = (numrows + 1 - parity) >> 1;
- 
-@@ -907,12 +845,10 @@
- 		srcptr += numcols;
- 	}
- 
--#if !defined(HAVE_VLA)
- 	/* If the join buffer was allocated on the heap, free this memory. */
- 	if (buf != joinbuf) {
- 		jas_free(buf);
- 	}
--#endif
- 
- }
- 
diff --git a/graphics/jasper/files/patch-jpc_t1enc.c b/graphics/jasper/files/patch-jpc_t1enc.c
deleted file mode 100644
index e399f72162a4..000000000000
--- a/graphics/jasper/files/patch-jpc_t1enc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/jpc/jpc_t1enc.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_t1enc.c	2013-04-17 22:32:23.000000000 +0200
-@@ -219,7 +219,7 @@
- 
- 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
- 	if (cblk->numpasses > 0) {
--		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
-+		cblk->passes = jas_malloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
- 		assert(cblk->passes);
- 	} else {
- 		cblk->passes = 0;
diff --git a/graphics/jasper/files/patch-jpc_t2cod.c b/graphics/jasper/files/patch-jpc_t2cod.c
deleted file mode 100644
index f4024ecac631..000000000000
--- a/graphics/jasper/files/patch-jpc_t2cod.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/jpc/jpc_t2cod.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_t2cod.c	2013-04-17 22:32:23.000000000 +0200
-@@ -573,7 +573,7 @@
- 	}
- 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
- 		newmaxpchgs = pchglist->maxpchgs + 128;
--		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
-+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
- 			return -1;
- 		}
- 		pchglist->maxpchgs = newmaxpchgs;
diff --git a/graphics/jasper/files/patch-jpc_t2dec.c b/graphics/jasper/files/patch-jpc_t2dec.c
deleted file mode 100644
index 6076d3afee68..000000000000
--- a/graphics/jasper/files/patch-jpc_t2dec.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/libjasper/jpc/jpc_t2dec.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_t2dec.c	2013-04-17 22:32:23.000000000 +0200
-@@ -478,7 +478,7 @@
- 		return 0;
- 	}
- 	pi->numcomps = dec->numcomps;
--	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-+	if (!(pi->picomps = jas_malloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
- 		jpc_pi_destroy(pi);
- 		return 0;
- 	}
-@@ -490,7 +490,7 @@
- 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
- 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
- 		picomp->numrlvls = tcomp->numrlvls;
--		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-+		if (!(picomp->pirlvls = jas_malloc2(picomp->numrlvls,
- 		  sizeof(jpc_pirlvl_t)))) {
- 			jpc_pi_destroy(pi);
- 			return 0;
-@@ -503,7 +503,7 @@
- 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
- /* XXX sizeof(long) should be sizeof different type */
- 			pirlvl->numprcs = rlvl->numprcs;
--			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-+			if (!(pirlvl->prclyrnos = jas_malloc2(pirlvl->numprcs,
- 			  sizeof(long)))) {
- 				jpc_pi_destroy(pi);
- 				return 0;
diff --git a/graphics/jasper/files/patch-jpc_t2enc.c b/graphics/jasper/files/patch-jpc_t2enc.c
deleted file mode 100644
index 9f8e31c67f1d..000000000000
--- a/graphics/jasper/files/patch-jpc_t2enc.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/libjasper/jpc/jpc_t2enc.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_t2enc.c	2013-04-17 22:32:23.000000000 +0200
-@@ -565,7 +565,7 @@
- 	}
- 	pi->pktno = -1;
- 	pi->numcomps = cp->numcmpts;
--	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-+	if (!(pi->picomps = jas_malloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
- 		jpc_pi_destroy(pi);
- 		return 0;
- 	}
-@@ -577,7 +577,7 @@
- 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
- 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
- 		picomp->numrlvls = tcomp->numrlvls;
--		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-+		if (!(picomp->pirlvls = jas_malloc2(picomp->numrlvls,
- 		  sizeof(jpc_pirlvl_t)))) {
- 			jpc_pi_destroy(pi);
- 			return 0;
-@@ -591,7 +591,7 @@
- /* XXX sizeof(long) should be sizeof different type */
- 			pirlvl->numprcs = rlvl->numprcs;
- 			if (rlvl->numprcs) {
--				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-+				if (!(pirlvl->prclyrnos = jas_malloc2(pirlvl->numprcs,
- 				  sizeof(long)))) {
- 					jpc_pi_destroy(pi);
- 					return 0;
diff --git a/graphics/jasper/files/patch-jpc_tagtree.c b/graphics/jasper/files/patch-jpc_tagtree.c
deleted file mode 100644
index 2bbd9cb778fe..000000000000
--- a/graphics/jasper/files/patch-jpc_tagtree.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/jpc/jpc_tagtree.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_tagtree.c	2013-04-17 22:32:23.000000000 +0200
-@@ -125,7 +125,7 @@
- 		++numlvls;
- 	} while (n > 1);
- 
--	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
-+	if (!(tree->nodes_ = jas_malloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
- 		return 0;
- 	}
- 
diff --git a/graphics/jasper/files/patch-jpc_util.c b/graphics/jasper/files/patch-jpc_util.c
deleted file mode 100644
index 90abfa85f963..000000000000
--- a/graphics/jasper/files/patch-jpc_util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/jpc/jpc_util.c.orig	2007-01-19 22:43:07.000000000 +0100
-+++ src/libjasper/jpc/jpc_util.c	2013-04-17 22:32:23.000000000 +0200
-@@ -109,7 +109,7 @@
- 	}
- 
- 	if (n) {
--		if (!(vs = jas_malloc(n * sizeof(double)))) {
-+		if (!(vs = jas_malloc2(n, sizeof(double)))) {
- 			return -1;
- 		}
- 
diff --git a/graphics/jasper/files/patch-libjasper-Makefile.in b/graphics/jasper/files/patch-libjasper-Makefile.in
deleted file mode 100644
index 6c45b585d3dd..000000000000
--- a/graphics/jasper/files/patch-libjasper-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libjasper/Makefile.in.orig	Wed Feb  7 11:18:06 2007
-+++ src/libjasper/Makefile.in	Wed Feb  7 11:18:28 2007
-@@ -290,7 +290,7 @@
- 
- # -release $(LT_RELEASE)
- libjasper_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+	-version-info 4:0:0
- 
- all: all-recursive
- 
diff --git a/graphics/jasper/files/patch-mif_cod.c b/graphics/jasper/files/patch-mif_cod.c
deleted file mode 100644
index 5e439b6f62c1..000000000000
--- a/graphics/jasper/files/patch-mif_cod.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/libjasper/mif/mif_cod.c.orig	2007-01-19 22:43:05.000000000 +0100
-+++ src/libjasper/mif/mif_cod.c	2016-02-20 14:19:34.799575000 +0100
-@@ -107,7 +107,7 @@
- static int mif_hdr_addcmpt(mif_hdr_t *hdr, int cmptno, mif_cmpt_t *cmpt);
- static mif_cmpt_t *mif_cmpt_create(void);
- static void mif_cmpt_destroy(mif_cmpt_t *cmpt);
--static char *mif_getline(jas_stream_t *jas_stream, char *buf, int bufsize);
-+static char *mif_getline(jas_stream_t *jas_stream, char *buf, size_t bufsize);
- static int mif_getc(jas_stream_t *in);
- static mif_hdr_t *mif_makehdrfromimage(jas_image_t *image);
- 
-@@ -438,8 +438,7 @@
- 	int cmptno;
- 	mif_cmpt_t **newcmpts;
- 	assert(maxcmpts >= hdr->numcmpts);
--	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
--	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
-+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
- 	if (!newcmpts) {
- 		return -1;
- 	}
-@@ -571,6 +570,8 @@
- 		}
- 	}
- 	jas_tvparser_destroy(tvp);
-+	/* fix for CVE-2015-5221 */
-+	tvp = NULL;
- 	if (!cmpt->sampperx || !cmpt->samppery) {
- 		goto error;
- 	}
-@@ -658,7 +659,7 @@
- * MIF parsing code.
- \******************************************************************************/
- 
--static char *mif_getline(jas_stream_t *stream, char *buf, int bufsize)
-+static char *mif_getline(jas_stream_t *stream, char *buf, size_t bufsize)
- {
- 	int c;
- 	char *bufptr;
diff --git a/graphics/jasper/files/uuid.patch b/graphics/jasper/files/uuid.patch
deleted file mode 100644
index e367c507fff3..000000000000
--- a/graphics/jasper/files/uuid.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# Jasper with uuid patch, required by GDAL, can be downloaded from:
-# - http://download.osgeo.org/gdal/
-# - http://www.gdal.org/dl/
-# - ftp://ftp.remotesensing.org/gdal/
-#
-# Current version is jasper-1.900.1.uuid.tar.gz.
-#
-diff -ruN src/libjasper/jp2/jp2_cod.c.orig src/libjasper/jp2/jp2_cod.c
---- src/libjasper/jp2/jp2_cod.c.orig	2007-01-20 05:43:05.000000000 +0800
-+++ src/libjasper/jp2/jp2_cod.c	2007-03-06 21:49:58.000000000 +0800
-@@ -5,6 +5,11 @@
-  * All rights reserved.
-  */
- 
-+/*
-+ * Modified by Andrey Kiselev <dron@ak4719.spb.edu> to properly handle UUID
-+ * box.
-+ */
-+
- /* __START_OF_JASPER_LICENSE__
-  * 
-  * JasPer License Version 2.0
-@@ -127,6 +132,9 @@
- static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in);
- static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out);
- static void jp2_pclr_dumpdata(jp2_box_t *box, FILE *out);
-+static void jp2_uuid_destroy(jp2_box_t *box);
-+static int jp2_uuid_getdata(jp2_box_t *box, jas_stream_t *in);
-+static int jp2_uuid_putdata(jp2_box_t *box, jas_stream_t *out);
- 
- /******************************************************************************\
- * Local data.
-@@ -164,7 +172,7 @@
- 	{JP2_BOX_XML, "XML", 0,
- 	  {0, 0, 0, 0, 0}},
- 	{JP2_BOX_UUID, "UUID", 0,
--	  {0, 0, 0, 0, 0}},
-+	  {0, jp2_uuid_destroy, jp2_uuid_getdata, jp2_uuid_putdata, 0}},
- 	{JP2_BOX_UINF, "UINF", JP2_BOX_SUPER,
- 	  {0, 0, 0, 0, 0}},
- 	{JP2_BOX_ULST, "ULST", 0,
-@@ -271,7 +279,7 @@
- 	} else {
- 		box->datalen = box->len - JP2_BOX_HDRLEN(false);
- 	}
--	if (box->len != 0 && box->len < 8) {
-+	if (box->len != 0 && box->len < JP2_BOX_HDRLEN(false)) {
- 		goto error;
- 	}
- 
-@@ -876,6 +884,56 @@
- 	}
- }
- 
-+static void jp2_uuid_destroy(jp2_box_t *box)
-+{
-+	jp2_uuid_t *uuid = &box->data.uuid;
-+	if (uuid->data)
-+	{
-+	    jas_free(uuid->data);
-+	    uuid->data = NULL;
-+	}
-+}
-+
-+static int jp2_uuid_getdata(jp2_box_t *box, jas_stream_t *in)
-+{
-+	jp2_uuid_t *uuid = &box->data.uuid;
-+	int i;
-+	
-+	for (i = 0; i < 16; i++)
-+	{
-+	    if (jp2_getuint8(in, &uuid->uuid[i]))
-+		return -1;
-+	}
-+	
-+	uuid->datalen = box->datalen - 16;
-+	uuid->data = jas_malloc(uuid->datalen * sizeof(uint_fast8_t));
-+	for (i = 0; i < uuid->datalen; i++)
-+	{
-+	    if (jp2_getuint8(in, &uuid->data[i]))
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static int jp2_uuid_putdata(jp2_box_t *box, jas_stream_t *out)
-+{
-+	jp2_uuid_t *uuid = &box->data.uuid;
-+	int i;
-+	
-+	for (i = 0; i < 16; i++)
-+	{
-+	    if (jp2_putuint8(out, uuid->uuid[i]))
-+		return -1;
-+	}
-+	
-+	for (i = 0; i < uuid->datalen; i++)
-+	{
-+	    if (jp2_putuint8(out, uuid->data[i]))
-+		return -1;
-+	}
-+	return 0;
-+}
-+
- static int jp2_getint(jas_stream_t *in, int s, int n, int_fast32_t *val)
- {
- 	int c;
-diff -ruN src/libjasper/jp2/jp2_cod.h.orig src/libjasper/jp2/jp2_cod.h
---- src/libjasper/jp2/jp2_cod.h.orig	2007-01-20 05:43:05.000000000 +0800
-+++ src/libjasper/jp2/jp2_cod.h	2007-03-06 21:49:58.000000000 +0800
-@@ -5,6 +5,11 @@
-  * All rights reserved.
-  */
- 
-+/*
-+ * Modified by Andrey Kiselev <dron@ak4719.spb.edu> to properly handle UUID
-+ * box.
-+ */
-+
- /* __START_OF_JASPER_LICENSE__
-  * 
-  * JasPer License Version 2.0
-@@ -229,6 +234,12 @@
- 	jp2_cmapent_t *ents;
- } jp2_cmap_t;
- 
-+typedef struct {
-+	uint_fast32_t datalen;
-+	uint_fast8_t uuid[16];
-+	uint_fast8_t *data;
-+} jp2_uuid_t;
-+
- #define	JP2_CMAP_DIRECT		0
- #define	JP2_CMAP_PALETTE	1
- 
-@@ -257,6 +268,7 @@
- 		jp2_pclr_t pclr;
- 		jp2_cdef_t cdef;
- 		jp2_cmap_t cmap;
-+		jp2_uuid_t uuid;
- 	} data;
- 
- } jp2_box_t;
-diff -ruN src/libjasper/jp2/jp2_enc.c.orig src/libjasper/jp2/jp2_enc.c
---- src/libjasper/jp2/jp2_enc.c.orig	2007-01-20 05:43:05.000000000 +0800
-+++ src/libjasper/jp2/jp2_enc.c	2007-03-06 21:49:58.000000000 +0800
-@@ -5,6 +5,11 @@
-  * All rights reserved.
-  */
- 
-+/*
-+ * Modified by Andrey Kiselev <dron@ak4719.spb.edu> to properly handle UUID
-+ * box.
-+ */
-+
- /* __START_OF_JASPER_LICENSE__
-  * 
-  * JasPer License Version 2.0
-@@ -86,7 +91,7 @@
- * Functions.
- \******************************************************************************/
- 
--int jp2_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-+int jp2_write_header(jas_image_t *image, jas_stream_t *out)
- {
- 	jp2_box_t *box;
- 	jp2_ftyp_t *ftyp;
-@@ -97,8 +102,6 @@
- 	long len;
- 	uint_fast16_t cmptno;
- 	jp2_colr_t *colr;
--	char buf[4096];
--	uint_fast32_t overhead;
- 	jp2_cdefchan_t *cdefchanent;
- 	jp2_cdef_t *cdef;
- 	int i;
-@@ -326,6 +329,26 @@
- 	jas_stream_close(tmpstream);
- 	tmpstream = 0;
- 
-+	return 0;
-+	abort();
-+
-+error:
-+
-+	if (box) {
-+		jp2_box_destroy(box);
-+	}
-+	if (tmpstream) {
-+		jas_stream_close(tmpstream);
-+	}
-+	return -1;
-+}
-+
-+int jp2_write_codestream(jas_image_t *image, jas_stream_t *out, char *optstr)
-+{
-+	jp2_box_t *box;
-+	char buf[4096];
-+	uint_fast32_t overhead;
-+
- 	/*
- 	 * Output the contiguous code stream box.
- 	 */
-@@ -358,12 +381,34 @@
- 	if (box) {
- 		jp2_box_destroy(box);
- 	}
--	if (tmpstream) {
--		jas_stream_close(tmpstream);
--	}
- 	return -1;
- }
- 
-+int jp2_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-+{
-+	if (jp2_write_header(image, out) < 0)
-+		return -1;
-+	if (jp2_write_codestream(image, out, optstr) < 0)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+int jp2_encode_uuid(jas_image_t *image, jas_stream_t *out,
-+		    char *optstr, jp2_box_t *uuid)
-+{
-+	if (jp2_write_header(image, out) < 0)
-+		return -1;
-+	if (uuid) {
-+		if (jp2_box_put(uuid, out))
-+			return -1;
-+	}
-+	if (jp2_write_codestream(image, out, optstr) < 0)
-+		return -1;
-+
-+	return 0;
-+}
-+
- static uint_fast32_t jp2_gettypeasoc(int colorspace, int ctype)
- {
- 	int type;
diff --git a/graphics/jasper/pkg-plist b/graphics/jasper/pkg-plist
index 959cfc479a7e..1307c489b2e5 100644
--- a/graphics/jasper/pkg-plist
+++ b/graphics/jasper/pkg-plist
@@ -1,11 +1,10 @@
 bin/imgcmp
 bin/imginfo
 bin/jasper
-bin/tmrdemo
 %%OPENGL%%bin/jiv
 include/jasper/jas_cm.h
 include/jasper/jas_config.h
-include/jasper/jas_config2.h
+include/jasper/jas_dll.h
 include/jasper/jas_debug.h
 include/jasper/jas_fix.h
 include/jasper/jas_getopt.h
@@ -22,11 +21,10 @@ include/jasper/jas_tvp.h
 include/jasper/jas_types.h
 include/jasper/jas_version.h
 include/jasper/jasper.h
-lib/libjasper.a
-lib/libjasper.la
 lib/libjasper.so
 lib/libjasper.so.4
 lib/libjasper.so.4.0.0
+libdata/pkgconfig/jasper.pc
 man/man1/imgcmp.1.gz
 man/man1/imginfo.1.gz
 man/man1/jasper.1.gz