CVS commit: pkgsrc/graphics/jasper

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Feb 21 18:24:20 UTC 2017

Modified Files:
        pkgsrc/graphics/jasper: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/jasper: options.mk
        pkgsrc/graphics/jasper/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/graphics/jasper/patches: patch-CVE-2016-8654 patch-configure

Log Message:
Changes 2.0.10:
Fixed a problem in the JP2 encoder that caused a null pointer dereference when no ICC profile data is available (e.g., in the case of an unknown color space).


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/jasper/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/jasper/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/jasper/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/jasper/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/jasper/patches/patch-CVE-2016-8654 \
    pkgsrc/graphics/jasper/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/jasper/Makefile
diff -u pkgsrc/graphics/jasper/Makefile:1.45 pkgsrc/graphics/jasper/Makefile:1.46
--- pkgsrc/graphics/jasper/Makefile:1.45        Sat Dec 17 23:02:51 2016
+++ pkgsrc/graphics/jasper/Makefile     Tue Feb 21 18:24:20 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2016/12/17 23:02:51 dholland Exp $
+# $NetBSD: Makefile,v 1.46 2017/02/21 18:24:20 adam Exp $
 
-DISTNAME=      jasper-1.900.29
-PKGREVISION=   1
+DISTNAME=      jasper-2.0.10
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.ece.uvic.ca/~mdadams/jasper/software/
 
@@ -10,25 +9,13 @@ HOMEPAGE=    http://www.ece.uvic.ca/~mdadam
 COMMENT=       Software-based reference implementation of the JPEG-2000 codec
 LICENSE=       modified-bsd
 
-USE_LANGUAGES=         c99
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-shared --without-x --disable-opengl
-
-USE_TOOLS+=            gmake
-USE_TOOLS+=            pkg-config
+USE_CMAKE=             yes
+USE_LANGUAGES=         c99 c++
+CMAKE_ARGS+=           -DALLOW_IN_SOURCE_BUILD=ON
 
 PKGCONFIG_OVERRIDE=    pkgconfig/jasper.pc
 
-# The solaris stdbool.h requires c99 which is fine for jasper, but
-# not so good for things that depend upon jasper.  See PR#43901
-CONFIGURE_ENV.SunOS+=  ac_cv_header_stdbool_h=no
-
-INSTALLATION_DIRS+=    share/doc/jasper
-
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/doc/jasper.pdf ${DESTDIR}${PREFIX}/share/doc/jasper
-       ${INSTALL_DATA} ${WRKSRC}/doc/jpeg2000.pdf ${DESTDIR}${PREFIX}/share/doc/jasper
+.include "options.mk"
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/jasper/PLIST
diff -u pkgsrc/graphics/jasper/PLIST:1.10 pkgsrc/graphics/jasper/PLIST:1.11
--- pkgsrc/graphics/jasper/PLIST:1.10   Fri Dec 16 09:44:44 2016
+++ pkgsrc/graphics/jasper/PLIST        Tue Feb 21 18:24:20 2017
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.10 2016/12/16 09:44:44 he Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/02/21 18:24:20 adam Exp $
 bin/imgcmp
 bin/imginfo
 bin/jasper
-bin/tmrdemo
+${PLIST.opengl}bin/jiv
 include/jasper/jas_cm.h
 include/jasper/jas_config.h
 include/jasper/jas_debug.h
+include/jasper/jas_dll.h
 include/jasper/jas_fix.h
 include/jasper/jas_getopt.h
 include/jasper/jas_icc.h
@@ -21,11 +22,14 @@ include/jasper/jas_tvp.h
 include/jasper/jas_types.h
 include/jasper/jas_version.h
 include/jasper/jasper.h
-lib/libjasper.la
+lib/libjasper.so
+lib/libjasper.so.4
+lib/libjasper.so.4.0.0
+lib/pkgconfig/jasper.pc
 man/man1/imgcmp.1
 man/man1/imginfo.1
 man/man1/jasper.1
-man/man1/jiv.1
-share/doc/jasper/jasper.pdf
-share/doc/jasper/jpeg2000.pdf
-lib/pkgconfig/jasper.pc
+${PLIST.opengl}man/man1/jiv.1
+share/doc/JasPer/README
+share/doc/JasPer/jasper.pdf
+share/doc/JasPer/jpeg2000.pdf

Index: pkgsrc/graphics/jasper/distinfo
diff -u pkgsrc/graphics/jasper/distinfo:1.24 pkgsrc/graphics/jasper/distinfo:1.25
--- pkgsrc/graphics/jasper/distinfo:1.24        Sat Dec 17 23:10:25 2016
+++ pkgsrc/graphics/jasper/distinfo     Tue Feb 21 18:24:20 2017
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.24 2016/12/17 23:10:25 dholland Exp $
+$NetBSD: distinfo,v 1.25 2017/02/21 18:24:20 adam Exp $
 
-SHA1 (jasper-1.900.29.tar.gz) = 6d50e5ea9e822ad5f88f4451819acab2e3b47f8e
-RMD160 (jasper-1.900.29.tar.gz) = 4ae47353f3dc086b3a11eff86ec7fb57d598c6fb
-SHA512 (jasper-1.900.29.tar.gz) = fdf557889660b9068e3712ff809fe7d4ab0855e1afff9a39eb19763599b4e747472743e4c49a42f7d38beadc6a0aa7a7b402422422853e8bb6d683def81b1544
-Size (jasper-1.900.29.tar.gz) = 1746319 bytes
-SHA1 (patch-CVE-2016-8654) = 99eaf8432aa681b8a5f4116928b7537f3de05213
-SHA1 (patch-configure) = 14039911be04b88559e40f20a01bb46fd0db4488
+SHA1 (jasper-2.0.10.tar.gz) = 42518b05fd73242f8ee8047d2e35e0275a697a5f
+RMD160 (jasper-2.0.10.tar.gz) = 5c13f11b2f5f7eb2ef161e2e691398c3d65bfeba
+SHA512 (jasper-2.0.10.tar.gz) = 3cc08c9bc1f9ad1e4bac78a3246d6ee1a35a75d5b89b3b0f27cb5980420101256a2e05eeb7bf8a0c73d1a73c044b83b4cbca441c1418dced53d7a142e69129ed
+Size (jasper-2.0.10.tar.gz) = 1672392 bytes
+SHA1 (patch-CMakeLists.txt) = 6e8705e6231bd9e2b31bc2f91aa495af32dd9d3a
 SHA1 (patch-src_libjasper_base_jas__seq.c) = a0208cd0271388ae0fdc2e359da3223a35a7ae14
 SHA1 (patch-src_libjasper_base_jas__stream.c) = 2e9ad538ab2c0191063fef06202949b435b0085e
 SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = bfbe752e105d75fbad71a01080013c7a5a8645d8

Added files:

Index: pkgsrc/graphics/jasper/options.mk
diff -u /dev/null pkgsrc/graphics/jasper/options.mk:1.1
--- /dev/null   Tue Feb 21 18:24:20 2017
+++ pkgsrc/graphics/jasper/options.mk   Tue Feb 21 18:24:20 2017
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2017/02/21 18:24:20 adam Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.jasper
+PKG_SUPPORTED_OPTIONS= opengl
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           opengl
+
+.if empty(PKG_OPTIONS:Mopengl)
+CMAKE_ARGS+=           -DJAS_ENABLE_OPENGL=OFF
+.else
+CMAKE_ARGS+=           -DJAS_ENABLE_OPENGL=ON
+PLIST.opengl=          yes
+.  if ${OPSYS} != "Darwin"
+.    include "../../graphics/glut/buildlink3.mk"
+.  endif
+.endif

Index: pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue Feb 21 18:24:20 2017
+++ pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt Tue Feb 21 18:24:20 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2017/02/21 18:24:20 adam Exp $
+
+Remove the weird hack.
+
+--- CMakeLists.txt.orig        2017-02-21 17:54:13.000000000 +0000
++++ CMakeLists.txt
+@@ -55,11 +55,7 @@ set(JAS_SO_MINOR 0)
+ set(JAS_SO_RELEASE 0)
+ # This is a temporary hack for OSX that should be removed when JAS_SO_VERSION
+ # is next incremented.
+-if (MACOSX)
+-set(JAS_SO_NAME "5.${JAS_SO_MINOR}.${JAS_SO_RELEASE}")
+-else()
+ set(JAS_SO_NAME "${JAS_SO_VERSION}.${JAS_SO_MINOR}.${JAS_SO_RELEASE}")
+-endif()
+ 
+ message("Shared library ABI version: ${JAS_SO_VERSION}")
+ message("Shared library build version: ${JAS_SO_NAME}")