diff --git a/graphics/DevIL/Makefile b/graphics/DevIL/Makefile index be97b71d8db..93e0aea5e9b 100644 --- a/graphics/DevIL/Makefile +++ b/graphics/DevIL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2017/07/26 22:45:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2017/12/14 00:24:36 jca Exp $ COMMENT= library for powerful image loading capabilities @@ -28,7 +28,7 @@ LIB_DEPENDS= converters/libiconv \ devel/sdl \ graphics/freeglut \ graphics/ilmbase \ - graphics/jasper \ + graphics/jasper>=2.0.14 \ graphics/libmng \ graphics/lcms \ graphics/openexr \ diff --git a/graphics/DevIL/patches/patch-src-IL_src_il_jp2_c b/graphics/DevIL/patches/patch-src-IL_src_il_jp2_c new file mode 100644 index 00000000000..db4c0686a37 --- /dev/null +++ b/graphics/DevIL/patches/patch-src-IL_src_il_jp2_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-src-IL_src_il_jp2_c,v 1.1 2017/12/14 00:24:36 jca Exp $ + +Cope with libjasper>=1.900.25 + +Index: src-IL/src/il_jp2.c +--- src-IL/src/il_jp2.c.orig ++++ src-IL/src/il_jp2.c +@@ -459,7 +459,7 @@ static void jas_stream_initbuf(jas_stream_t *stream, i + /* The buffer must be large enough to accommodate maximum + putback. */ + assert(bufsize > JAS_STREAM_MAXPUTBACK); +- stream->bufbase_ = JAS_CAST(uchar *, buf); ++ stream->bufbase_ = JAS_CAST(jas_uchar *, buf); + stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK; + } + } else {