CVS commit: pkgsrc/graphics/jasper

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/jasper
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 14 Sep 2020 17:47:14 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep 14 17:47:14 UTC 2020

Modified Files:
        pkgsrc/graphics/jasper: Makefile PLIST distinfo
        pkgsrc/graphics/jasper/patches: patch-CMakeLists.txt
            patch-src_libjasper_jp2_jp2__cod.c
Added Files:
        pkgsrc/graphics/jasper/patches:
            patch-build_cmake_modules_JasOpenGL.cmake
Removed Files:
        pkgsrc/graphics/jasper/patches: patch-src_libjasper_base_jas__stream.c
            patch-src_libjasper_jpc_jpc__dec.c

Log Message:
jasper: updated to 2.0.20

2.0.20

* fixed several ISO/IEC 15444-4 conformance bugs

* fixed new variant of CVE-2016-9398

* disabled the MIF codec by default for security reasons (but it is still
  included in the library);
  in a future release, the MIF codec may also be excluded from the
  library by default

* added documentation for the I/O streams library API


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/jasper/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/jasper/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/graphics/jasper/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/jasper/patches/patch-build_cmake_modules_JasOpenGL.cmake
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/jasper/patches/patch-src_libjasper_base_jas__stream.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/graphics/jasper/patches/patch-src_libjasper_jpc_jpc__dec.c

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.55 pkgsrc/graphics/jasper/Makefile:1.56
--- pkgsrc/graphics/jasper/Makefile:1.55        Wed Jul 29 07:03:59 2020
+++ pkgsrc/graphics/jasper/Makefile     Mon Sep 14 17:47:13 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2020/07/29 07:03:59 adam Exp $
+# $NetBSD: Makefile,v 1.56 2020/09/14 17:47:13 adam Exp $
 
-DISTNAME=      jasper-2.0.19
+DISTNAME=      jasper-2.0.20
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jasper-software/}
 GITHUB_TAG=    version-${PKGVERSION_NOREV}
@@ -15,6 +15,7 @@ USE_CMAKE=            yes
 USE_LANGUAGES=         c99 c++
 USE_TOOLS+=            bash:test
 CMAKE_ARGS+=           -DALLOW_IN_SOURCE_BUILD=ON
+CMAKE_ARGS+=           -DJAS_ENABLE_DOC=OFF
 
 PKGCONFIG_OVERRIDE=    build/jasper.pc.in
 REPLACE_BASH=          test/bin/*

Index: pkgsrc/graphics/jasper/PLIST
diff -u pkgsrc/graphics/jasper/PLIST:1.13 pkgsrc/graphics/jasper/PLIST:1.14
--- pkgsrc/graphics/jasper/PLIST:1.13   Wed Feb 22 11:53:49 2017
+++ pkgsrc/graphics/jasper/PLIST        Mon Sep 14 17:47:13 2020
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2017/02/22 11:53:49 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.14 2020/09/14 17:47:13 adam Exp $
 bin/imgcmp
 bin/imginfo
 bin/jasper
 ${PLIST.opengl}bin/jiv
 include/jasper/jas_cm.h
+include/jasper/jas_compiler.h
 include/jasper/jas_config.h
 include/jasper/jas_debug.h
 include/jasper/jas_dll.h
@@ -31,5 +32,3 @@ man/man1/imginfo.1
 man/man1/jasper.1
 ${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.33 pkgsrc/graphics/jasper/distinfo:1.34
--- pkgsrc/graphics/jasper/distinfo:1.33        Wed Jul 29 07:03:59 2020
+++ pkgsrc/graphics/jasper/distinfo     Mon Sep 14 17:47:13 2020
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.33 2020/07/29 07:03:59 adam Exp $
+$NetBSD: distinfo,v 1.34 2020/09/14 17:47:13 adam Exp $
 
-SHA1 (jasper-2.0.19.tar.gz) = 32522a49abf12b2c0138d3cd705a8d9e0a0be839
-RMD160 (jasper-2.0.19.tar.gz) = 5c6377651ecbeed7f196be2586ce8b9401fcf2e0
-SHA512 (jasper-2.0.19.tar.gz) = b4e1930057587d3417678fc19c661bef21d87a7d6f79fc9486282531097792c4dc074845405c66dc036620344a900349f985a248009934333c5858242ffec655
-Size (jasper-2.0.19.tar.gz) = 1314817 bytes
-SHA1 (patch-CMakeLists.txt) = 7629fcab6bc854c51a0895449b2cdd214409fa3c
+SHA1 (jasper-2.0.20.tar.gz) = 8e525c7a5fbeaaf07d52fac609546573a1bac477
+RMD160 (jasper-2.0.20.tar.gz) = c11fff401be5a8a93f139fe8f531449493205736
+SHA512 (jasper-2.0.20.tar.gz) = d936cd1b447dc9e78472f5e8a92a7b23da90f5ae7d8487836966b6b32ec328e895a2eea5e2c9a958ec91d39f1cefe8636ddf1a6292dc116bace9d38c89a3f31f
+Size (jasper-2.0.20.tar.gz) = 1318727 bytes
+SHA1 (patch-CMakeLists.txt) = a848a73c9e717e5d6b0a98f3c27d0dcfc1dda8a5
+SHA1 (patch-build_cmake_modules_JasOpenGL.cmake) = 832cf84b0840fe1159d81c8ce92f24971da16838
 SHA1 (patch-src_appl_jiv.c) = 123f1db81a95b4ddd679ccea6f1b2c4887bf574d
-SHA1 (patch-src_libjasper_base_jas__stream.c) = 2e9ad538ab2c0191063fef06202949b435b0085e
 SHA1 (patch-src_libjasper_include_jasper_jas__config.h.in) = a512b563fb34587dab80bdea7f99ea1f1b338d1c
-SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = bfbe752e105d75fbad71a01080013c7a5a8645d8
+SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = d27de060384eaa80f5807bbec9be9daab839418e
 SHA1 (patch-src_libjasper_jp2_jp2__dec.c) = 2f340a0b25933873127c321b09600146cf3f765c
 SHA1 (patch-src_libjasper_jp2_jp2__enc.c) = 9a78860496f1d0ce35f94843f6a7d754a5565716
-SHA1 (patch-src_libjasper_jpc_jpc__dec.c) = f76765ff7656af6b44cd4035b26656909abe45f9
 SHA1 (patch-src_libjasper_jpc_jpc__enc.c) = 83068e4f4ec96b7f9816f3dac1f68ef6efde986f
 SHA1 (patch-src_libjasper_pnm_pnm__enc.c) = a2d5d53cd28f653f9e6e302f76c187fba50b1ce2

Index: pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.4 pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.4     Tue Jul 21 07:31:28 2020
+++ pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt Mon Sep 14 17:47:14 2020
@@ -1,10 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2020/07/21 07:31:28 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2020/09/14 17:47:14 adam Exp $
 
 Remove the weird hack.
-Do not look for Doxygen.
-Support GLUT/glut.h.
 
---- CMakeLists.txt.orig        2020-07-20 13:56:40.000000000 +0000
+--- CMakeLists.txt.orig        2020-09-05 14:52:22.000000000 +0000
 +++ CMakeLists.txt
 @@ -57,11 +57,7 @@ set(JAS_SO_MINOR 0)
  set(JAS_SO_RELEASE 0)
@@ -18,26 +16,3 @@ Support GLUT/glut.h.
  
  message("Shared library ABI version: ${JAS_SO_VERSION}")
  message("Shared library build version: ${JAS_SO_NAME}")
-@@ -221,7 +217,6 @@ endif()
- # Perform plaform checks.
- ################################################################################
- 
--find_package(Doxygen)
- find_package(LATEX COMPONENTS PDFLATEX)
- find_program(BASH_PROGRAM bash)
- 
-@@ -310,11 +305,13 @@ if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
-               message("GLUT include directory: ${GLUT_INCLUDE_DIR}")
-               message("GLUT libraries: ${GLUT_LIBRARIES}")
-               set(CMAKE_REQUIRED_INCLUDES ${GLUT_INCLUDE_DIR})
-+              check_include_files(GLUT/glut.h JAS_HAVE_GLUT_GLUT_H)
-               check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H)
-               check_include_files(glut.h JAS_HAVE_GLUT_H)
-               message("JAS_HAVE_GLUT_H: ${JAS_HAVE_GLUT_H}")
-               message("JAS_HAVE_GL_GLUT_H: ${JAS_HAVE_GL_GLUT_H}")
--              if (JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H)
-+              message("JAS_HAVE_GLUT_GLUT_H: ${JAS_HAVE_GL_GLUT_H}")
-+              if (JAS_HAVE_GLUT_GLUT_H OR JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H)
-                       set(JAS_HAVE_OPENGL 1)
-                       include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-               else()

Index: pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c
diff -u pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c:1.3 pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c:1.4
--- pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c:1.3       Fri Dec 16 09:44:44 2016
+++ pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c   Mon Sep 14 17:47:14 2020
@@ -1,24 +1,24 @@
-$NetBSD: patch-src_libjasper_jp2_jp2__cod.c,v 1.3 2016/12/16 09:44:44 he Exp $
+$NetBSD: patch-src_libjasper_jp2_jp2__cod.c,v 1.4 2020/09/14 17:47:14 adam Exp $
 
 Only output debug info if debuglevel >= 1.
 
---- src/libjasper/jp2/jp2_cod.c.orig   2016-11-16 15:03:41.000000000 +0000
+--- src/libjasper/jp2/jp2_cod.c.orig   2020-09-05 14:52:22.000000000 +0000
 +++ src/libjasper/jp2/jp2_cod.c
-@@ -808,11 +808,15 @@ static void jp2_cmap_dumpdata(jp2_box_t 
-       jp2_cmap_t *cmap = &box->data.cmap;
+@@ -828,11 +828,15 @@ static void jp2_cmap_dumpdata(const jp2_
+ {
+       const jp2_cmap_t *cmap = &box->data.cmap;
        unsigned int i;
-       jp2_cmapent_t *ent;
 -      fprintf(out, "numchans = %d\n", (int) cmap->numchans);
 +      if (jas_getdbglevel() >= 1) {
 +              fprintf(out, "numchans = %d\n", (int) cmap->numchans);
 +      }
        for (i = 0; i < cmap->numchans; ++i) {
-               ent = &cmap->ents[i];
+               const jp2_cmapent_t *ent = &cmap->ents[i];
 -              fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
 -                (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
 +              if (jas_getdbglevel() >= 1) {
 +                      fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
-+                              (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
++                        (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
 +              }
        }
  }

Added files:

Index: pkgsrc/graphics/jasper/patches/patch-build_cmake_modules_JasOpenGL.cmake
diff -u /dev/null pkgsrc/graphics/jasper/patches/patch-build_cmake_modules_JasOpenGL.cmake:1.1
--- /dev/null   Mon Sep 14 17:47:14 2020
+++ pkgsrc/graphics/jasper/patches/patch-build_cmake_modules_JasOpenGL.cmake    Mon Sep 14 17:47:14 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-build_cmake_modules_JasOpenGL.cmake,v 1.1 2020/09/14 17:47:14 adam Exp $
+
+Support GLUT/glut.h.
+
+--- build/cmake/modules/JasOpenGL.cmake.orig   2020-09-14 17:26:49.000000000 +0000
++++ build/cmake/modules/JasOpenGL.cmake
+@@ -19,9 +19,10 @@ if (JAS_ENABLE_OPENGL AND OPENGL_FOUND)
+               message("GLUT include directory: ${GLUT_INCLUDE_DIR}")
+               message("GLUT libraries: ${GLUT_LIBRARIES}")
+               set(CMAKE_REQUIRED_INCLUDES ${GLUT_INCLUDE_DIR})
++              check_include_files(GLUT/glut.h JAS_HAVE_GLUT_GLUT_H)
+               check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H)
+               check_include_files(glut.h JAS_HAVE_GLUT_H)
+-              if (JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H)
++              if (JAS_HAVE_GLUT_GLUT_H OR JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H)
+                       set(JAS_HAVE_OPENGL 1)
+                       include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+               else()

Prev by Date: CVS commit: pkgsrc/databases/unixodbc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/databases/unixodbc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index