Received: by mail.netbsd.org (Postfix, from userid 605) id 9880284D7E; Tue, 21 Jul 2020 07:31:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1F7C784D7C for ; Tue, 21 Jul 2020 07:31:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id f7u2Pio8ogtv for ; Tue, 21 Jul 2020 07:31:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0FAA384D75 for ; Tue, 21 Jul 2020 07:31:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 015B1FB28; Tue, 21 Jul 2020 07:31:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159531668815840" MIME-Version: 1.0 Date: Tue, 21 Jul 2020 07:31:28 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/graphics/jasper To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20200721073129.015B1FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159531668815840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Jul 21 07:31:28 UTC 2020 Modified Files: pkgsrc/graphics/jasper: Makefile distinfo options.mk pkgsrc/graphics/jasper/patches: patch-CMakeLists.txt patch-src_libjasper_jp2_jp2__dec.c Added Files: pkgsrc/graphics/jasper/patches: patch-src_appl_jiv.c patch-src_libjasper_include_jasper_jas__config.h.in Removed Files: pkgsrc/graphics/jasper/patches: patch-doc_CMakeLists.txt patch-src_libjasper_base_jas__seq.c Log Message: jasper: updated to 2.0.18 2.0.18: Unknown changes. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 pkgsrc/graphics/jasper/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/jasper/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/jasper/options.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt cvs rdiff -u -r1.1 -r0 \ pkgsrc/graphics/jasper/patches/patch-doc_CMakeLists.txt cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/jasper/patches/patch-src_appl_jiv.c \ pkgsrc/graphics/jasper/patches/patch-src_libjasper_include_jasper_jas__config.h.in cvs rdiff -u -r1.3 -r0 \ pkgsrc/graphics/jasper/patches/patch-src_libjasper_base_jas__seq.c cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159531668815840 Content-Disposition: inline Content-Length: 9046 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/jasper/Makefile diff -u pkgsrc/graphics/jasper/Makefile:1.52 pkgsrc/graphics/jasper/Makefile:1.53 --- pkgsrc/graphics/jasper/Makefile:1.52 Sun Apr 26 10:05:46 2020 +++ pkgsrc/graphics/jasper/Makefile Tue Jul 21 07:31:28 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.52 2020/04/26 10:05:46 rillig Exp $ +# $NetBSD: Makefile,v 1.53 2020/07/21 07:31:28 adam Exp $ -DISTNAME= jasper-2.0.16 -PKGREVISION= 1 +DISTNAME= jasper-2.0.18 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=mdadams/} GITHUB_TAG= version-${PKGVERSION_NOREV} @@ -14,9 +13,12 @@ LICENSE= modified-bsd WRKSRC= ${WRKDIR}/jasper-${GITHUB_TAG} USE_CMAKE= yes USE_LANGUAGES= c99 c++ +USE_TOOLS+= bash:test CMAKE_ARGS+= -DALLOW_IN_SOURCE_BUILD=ON PKGCONFIG_OVERRIDE= build/jasper.pc.in +REPLACE_BASH= test/bin/* +TEST_TARGET= test .include "options.mk" .include "../../mk/jpeg.buildlink3.mk" Index: pkgsrc/graphics/jasper/distinfo diff -u pkgsrc/graphics/jasper/distinfo:1.30 pkgsrc/graphics/jasper/distinfo:1.31 --- pkgsrc/graphics/jasper/distinfo:1.30 Tue Jul 16 10:06:07 2019 +++ pkgsrc/graphics/jasper/distinfo Tue Jul 21 07:31:28 2020 @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.30 2019/07/16 10:06:07 nia Exp $ +$NetBSD: distinfo,v 1.31 2020/07/21 07:31:28 adam Exp $ -SHA1 (jasper-2.0.16.tar.gz) = f7c2019cfcfd790b0aae04b5e92c5cb4b61f1d3a -RMD160 (jasper-2.0.16.tar.gz) = b45b6c5539f22a96a962047129ca935835459539 -SHA512 (jasper-2.0.16.tar.gz) = b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee -Size (jasper-2.0.16.tar.gz) = 1311944 bytes -SHA1 (patch-CMakeLists.txt) = 047ea526e4f4d81036043e0d831ef76be1e3b456 -SHA1 (patch-doc_CMakeLists.txt) = 08156df737458cec48ea1965586b9acdbf30753b -SHA1 (patch-src_libjasper_base_jas__seq.c) = a0208cd0271388ae0fdc2e359da3223a35a7ae14 +SHA1 (jasper-2.0.18.tar.gz) = 26e50037c82ea88dbb3bbdc9dc25d96ac351a9f0 +RMD160 (jasper-2.0.18.tar.gz) = 73cd05f6538f3f4540033a99e519a5a705b75c66 +SHA512 (jasper-2.0.18.tar.gz) = 14be966604194a3de4d0d9d42ee0aae5dcee45ac8e6bcdd306bdb6a66c777bfbb06b25a271e20805c879b95ad4e42c71cfab18d0ebee8394d7243f36f3f83e0f +Size (jasper-2.0.18.tar.gz) = 1314862 bytes +SHA1 (patch-CMakeLists.txt) = 7629fcab6bc854c51a0895449b2cdd214409fa3c +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__dec.c) = df04d8af9004fb133d4ae1429ecda77197fc3e77 +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 Index: pkgsrc/graphics/jasper/options.mk diff -u pkgsrc/graphics/jasper/options.mk:1.1 pkgsrc/graphics/jasper/options.mk:1.2 --- pkgsrc/graphics/jasper/options.mk:1.1 Tue Feb 21 18:24:20 2017 +++ pkgsrc/graphics/jasper/options.mk Tue Jul 21 07:31:28 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2017/02/21 18:24:20 adam Exp $ +# $NetBSD: options.mk,v 1.2 2020/07/21 07:31:28 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.jasper PKG_SUPPORTED_OPTIONS= opengl @@ -7,12 +7,12 @@ PKG_SUPPORTED_OPTIONS= opengl 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 !empty(PKG_OPTIONS:Mopengl) +CMAKE_ARGS+= -DJAS_ENABLE_OPENGL=ON +PLIST.opengl= yes . if ${OPSYS} != "Darwin" -. include "../../graphics/glut/buildlink3.mk" +. include "../../graphics/freeglut/buildlink3.mk" . endif +.else +CMAKE_ARGS+= -DJAS_ENABLE_OPENGL=OFF .endif Index: pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt diff -u pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.3 pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.4 --- pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.3 Wed Feb 22 11:53:49 2017 +++ pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt Tue Jul 21 07:31:28 2020 @@ -1,10 +1,12 @@ -$NetBSD: patch-CMakeLists.txt,v 1.3 2017/02/22 11:53:49 ryoon Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.4 2020/07/21 07:31:28 adam Exp $ Remove the weird hack. +Do not look for Doxygen. +Support GLUT/glut.h. ---- CMakeLists.txt.orig 2016-12-30 16:53:52.000000000 +0000 +--- CMakeLists.txt.orig 2020-07-20 13:56:40.000000000 +0000 +++ CMakeLists.txt -@@ -55,11 +55,7 @@ set(JAS_SO_MINOR 0) +@@ -57,11 +57,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. @@ -16,3 +18,26 @@ Remove the weird hack. 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__dec.c diff -u pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c:1.4 pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c:1.5 --- pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c:1.4 Fri Dec 16 13:05:58 2016 +++ pkgsrc/graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c Tue Jul 21 07:31:28 2020 @@ -1,11 +1,11 @@ -$NetBSD: patch-src_libjasper_jp2_jp2__dec.c,v 1.4 2016/12/16 13:05:58 he Exp $ +$NetBSD: patch-src_libjasper_jp2_jp2__dec.c,v 1.5 2020/07/21 07:31:28 adam Exp $ Only output debug info if debuglevel >= 1. And .. cast argument to jas_iccprof_createfrombuf() to match. ---- src/libjasper/jp2/jp2_dec.c.orig 2016-11-16 15:03:41.000000000 +0000 +--- src/libjasper/jp2/jp2_dec.c.orig 2020-07-20 13:56:40.000000000 +0000 +++ src/libjasper/jp2/jp2_dec.c -@@ -295,14 +295,16 @@ jas_image_t *jp2_decode(jas_stream_t *in +@@ -297,14 +297,16 @@ jas_image_t *jp2_decode(jas_stream_t *in jas_image_setclrspc(dec->image, jp2_getcs(&dec->colr->data.colr)); break; case JP2_COLR_ICC: @@ -23,4 +23,4 @@ And .. cast argument to jas_iccprof_crea + } jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); dec->image->cmprof_ = jas_cmprof_createfromiccprof(iccprof); - assert(dec->image->cmprof_); + if (!dec->image->cmprof_) { Added files: Index: pkgsrc/graphics/jasper/patches/patch-src_appl_jiv.c diff -u /dev/null pkgsrc/graphics/jasper/patches/patch-src_appl_jiv.c:1.1 --- /dev/null Tue Jul 21 07:31:28 2020 +++ pkgsrc/graphics/jasper/patches/patch-src_appl_jiv.c Tue Jul 21 07:31:28 2020 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_appl_jiv.c,v 1.1 2020/07/21 07:31:28 adam Exp $ + +Support GLUT/glut.h. + +--- src/appl/jiv.c.orig 2020-07-21 07:10:06.000000000 +0000 ++++ src/appl/jiv.c +@@ -69,6 +69,8 @@ + #include + #if defined(JAS_HAVE_GL_GLUT_H) + #include ++#elif defined(JAS_HAVE_GLUT_GLUT_H) ++#include + #else + #include + #endif Index: pkgsrc/graphics/jasper/patches/patch-src_libjasper_include_jasper_jas__config.h.in diff -u /dev/null pkgsrc/graphics/jasper/patches/patch-src_libjasper_include_jasper_jas__config.h.in:1.1 --- /dev/null Tue Jul 21 07:31:28 2020 +++ pkgsrc/graphics/jasper/patches/patch-src_libjasper_include_jasper_jas__config.h.in Tue Jul 21 07:31:28 2020 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_libjasper_include_jasper_jas__config.h.in,v 1.1 2020/07/21 07:31:28 adam Exp $ + +Support GLUT/glut.h. + +--- src/libjasper/include/jasper/jas_config.h.in.orig 2020-07-21 07:07:56.000000000 +0000 ++++ src/libjasper/include/jasper/jas_config.h.in +@@ -28,6 +28,7 @@ + #cmakedefine JAS_HAVE_GETTIMEOFDAY 1 + #cmakedefine JAS_HAVE_GETRUSAGE 1 + ++#cmakedefine JAS_HAVE_GLUT_GLUT_H 1 + #cmakedefine JAS_HAVE_GL_GLUT_H 1 + #cmakedefine JAS_HAVE_GLUT_H 1 + --_----------=_159531668815840--