Date: Sat, 12 Sep 2020 21:19:44 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r548423 - in branches/2020Q3/graphics: gdal/files jasper jasper/files opencv/files qt5-imageformats/files xv/files Message-ID: <202009122119.08CLJiHE051138@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Sep 12 21:19:44 2020 New Revision: 548423 URL: https://svnweb.freebsd.org/changeset/ports/548423 Log: MFH: r548374 r548375 Update to 2.0.20 Changes: https://github.com/jasper-software/jasper/blob/master/NEWS PR: 248912 Exp-run by: antoine Security: 6842ac7e-d250-11ea-b9b7-08002728f74c Fix build with jasper 2.0.20 Approved by: ports-secteam (joneum) Added: branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp - copied unchanged from r548375, head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp - copied unchanged from r548375, head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp branches/2020Q3/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake - copied unchanged from r548374, head/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake branches/2020Q3/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp - copied unchanged from r548375, head/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp branches/2020Q3/graphics/qt5-imageformats/files/ - copied from r548375, head/graphics/qt5-imageformats/files/ branches/2020Q3/graphics/xv/files/patch-xvjp2k.c - copied unchanged from r548375, head/graphics/xv/files/patch-xvjp2k.c Deleted: branches/2020Q3/graphics/jasper/files/patch-CMakeLists.txt Modified: branches/2020Q3/graphics/jasper/Makefile branches/2020Q3/graphics/jasper/distinfo branches/2020Q3/graphics/jasper/pkg-plist Directory Properties: branches/2020Q3/ (props changed) Copied: branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp (from r548375, head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp Sat Sep 12 21:19:44 2020 (r548423, copy of r548375, head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp) @@ -0,0 +1,28 @@ +Obtained from: https://github.com/OSGeo/gdal/commit/e236eeaed1be45a4af457565085e3db1f2fc489f + +--- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig 2020-05-04 09:21:31 UTC ++++ frmts/jpeg2000/jpeg2000_vsil_io.cpp +@@ -94,13 +94,23 @@ typedef struct { + * File stream object. + \******************************************************************************/ + ++// PRIjas_seqent macro is defined since Jasper 2.0.17 ++ ++#ifndef PRIjas_seqent + static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt) ++#else ++static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt) ++#endif + { + jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); + return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp)); + } + ++#ifndef PRIjas_seqent + static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt) ++#else ++static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt) ++#endif + { + jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj); + return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp)); Copied: branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp (from r548375, head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp Sat Sep 12 21:19:44 2020 (r548423, copy of r548375, head/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp) @@ -0,0 +1,22 @@ +Obtained from: https://github.com/OSGeo/gdal/commit/ab72c4893e6d14d488dfed25745d79f11bee45b9 + +--- frmts/jpeg2000/jpeg2000dataset.cpp.orig 2020-05-04 09:21:31 UTC ++++ frmts/jpeg2000/jpeg2000dataset.cpp +@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage() + /* the JP2 boxes match the ones of the code stream */ + if (nBands != 0) + { +- if (nBands != jas_image_numcmpts( psImage )) ++ if (nBands != static_cast<int>(jas_image_numcmpts( psImage ))) + { + CPLError(CE_Failure, CPLE_AppDefined, + "The number of components indicated in the IHDR box (%d) mismatch " +@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poO + + { + int iFormat; +- char *pszFormatName = nullptr; ++ const char *pszFormatName = nullptr; + + if (!Identify(poOpenInfo)) + return nullptr; Modified: branches/2020Q3/graphics/jasper/Makefile ============================================================================== --- branches/2020Q3/graphics/jasper/Makefile Sat Sep 12 21:10:33 2020 (r548422) +++ branches/2020Q3/graphics/jasper/Makefile Sat Sep 12 21:19:44 2020 (r548423) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= jasper -PORTVERSION= 2.0.16 -PORTREVISION= 1 +PORTVERSION= 2.0.20 DISTVERSIONPREFIX= version- CATEGORIES= graphics @@ -15,28 +14,24 @@ LICENSE_NAME= JasPer License Version 2.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -OPTIONS_DEFINE= OPENGL DOCS -OPTIONS_DEFAULT= OPENGL -OPTIONS_SUB= yes +USES= cmake jpeg localbase +CMAKE_OFF= JAS_ENABLE_AUTOMATIC_DEPENDENCIES +CMAKE_ON= JAS_ENABLE_LIBJPEG USE_LDCONFIG= yes -USES= cmake jpeg localbase +DOCSDIR= ${PREFIX}/share/doc/JasPer + USE_GITHUB= yes +GH_ACCOUNT= jasper-software -GH_ACCOUNT= mdadams +OPTIONS_DEFINE= OPENGL DOCS +OPTIONS_DEFAULT=OPENGL +OPTIONS_SUB= yes +DOCS_CMAKE_BOOL= JAS_ENABLE_DOC OPENGL_CMAKE_BOOL= JAS_ENABLE_OPENGL -OPENGL_USES= gl xorg OPENGL_USE= GL=gl,glu,glut XORG=x11,xext,xi,xmu - -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} +OPENGL_USES= gl xorg .include <bsd.port.mk> Modified: branches/2020Q3/graphics/jasper/distinfo ============================================================================== --- branches/2020Q3/graphics/jasper/distinfo Sat Sep 12 21:10:33 2020 (r548422) +++ branches/2020Q3/graphics/jasper/distinfo Sat Sep 12 21:19:44 2020 (r548423) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577441210 -SHA256 (mdadams-jasper-version-2.0.16_GH0.tar.gz) = f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1 -SIZE (mdadams-jasper-version-2.0.16_GH0.tar.gz) = 1311944 +TIMESTAMP = 1599329835 +SHA256 (jasper-software-jasper-version-2.0.20_GH0.tar.gz) = d55843ce52afa9bfe90f30118329578501040f30d48a027459a68a962695e506 +SIZE (jasper-software-jasper-version-2.0.20_GH0.tar.gz) = 1318727 Copied: branches/2020Q3/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake (from r548374, head/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake Sat Sep 12 21:19:44 2020 (r548423, copy of r548374, head/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake) @@ -0,0 +1,11 @@ +--- build/cmake/modules/JasOpenGL.cmake.orig 2020-09-05 14:52:22 UTC ++++ build/cmake/modules/JasOpenGL.cmake +@@ -4,7 +4,7 @@ + + if (JAS_ENABLE_OPENGL) + set(OpenGL_GL_PREFERENCE GLVND) +- find_package(OpenGL ${JAS_REQUIRED}) ++ find_package(OpenGL ${JAS_OPENGL_REQUIRED}) + message("OpenGL library found: ${OPENGL_FOUND}") + else() + set(OPENGL_FOUND false) Modified: branches/2020Q3/graphics/jasper/pkg-plist ============================================================================== --- branches/2020Q3/graphics/jasper/pkg-plist Sat Sep 12 21:10:33 2020 (r548422) +++ branches/2020Q3/graphics/jasper/pkg-plist Sat Sep 12 21:19:44 2020 (r548423) @@ -3,9 +3,10 @@ bin/imginfo bin/jasper %%OPENGL%%bin/jiv include/jasper/jas_cm.h +include/jasper/jas_compiler.h include/jasper/jas_config.h -include/jasper/jas_dll.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 Copied: branches/2020Q3/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp (from r548375, head/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp Sat Sep 12 21:19:44 2020 (r548423, copy of r548375, head/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp) @@ -0,0 +1,20 @@ +--- modules/imgcodecs/src/grfmt_jpeg2000.cpp.orig 2018-02-23 08:38:33 UTC ++++ modules/imgcodecs/src/grfmt_jpeg2000.cpp +@@ -337,7 +337,7 @@ bool Jpeg2KDecoder::readComponent8u( uchar *data, voi + + for( y = 0; y < yend - ystart; ) + { +- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); ++ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); + uchar* dst = data + (y - yoffset) * step - xoffset; + + if( xstep == 1 ) +@@ -401,7 +401,7 @@ bool Jpeg2KDecoder::readComponent16u( unsigned short + + for( y = 0; y < yend - ystart; ) + { +- jas_seqent_t* pix_row = &jas_matrix_get( buffer, y / ystep, 0 ); ++ jas_seqent_t* pix_row = jas_matrix_getref( buffer, y / ystep, 0 ); + ushort* dst = data + (y - yoffset) * step - xoffset; + + if( xstep == 1 ) Copied: branches/2020Q3/graphics/xv/files/patch-xvjp2k.c (from r548375, head/graphics/xv/files/patch-xvjp2k.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/xv/files/patch-xvjp2k.c Sat Sep 12 21:19:44 2020 (r548423, copy of r548375, head/graphics/xv/files/patch-xvjp2k.c) @@ -0,0 +1,11 @@ +--- xvjp2k.c.orig 2007-05-14 01:04:37 UTC ++++ xvjp2k.c +@@ -76,7 +76,7 @@ static const char *fbasename, /* File's base name, fo + */ + int jas_getdbglevel(void) {return 0;} + int jas_setdbglevel(int n) {return 0;} +-int jas_memdump(FILE *fp,void *data,size_t len) {return 0;} ++int jas_memdump(FILE *fp,const void *data,size_t len) {return 0;} + + int jas_eprintf(const char *fmt,...) /* Handle JasPer Library message */ + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009122119.08CLJiHE051138>