Index: branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp =================================================================== --- branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp (nonexistent) +++ branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp (revision 548423) @@ -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(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(VSIFWriteL(buf, 1, cnt, fileobj->fp)); Property changes on: branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000_vsil_io.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp =================================================================== --- branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp (nonexistent) +++ branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp (revision 548423) @@ -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(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; Property changes on: branches/2020Q3/graphics/gdal/files/patch-frmts-jpeg2000-jpeg2000dataset.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q3/graphics/jasper/Makefile =================================================================== --- branches/2020Q3/graphics/jasper/Makefile (revision 548422) +++ branches/2020Q3/graphics/jasper/Makefile (revision 548423) @@ -1,42 +1,37 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= jasper -PORTVERSION= 2.0.16 -PORTREVISION= 1 +PORTVERSION= 2.0.20 DISTVERSIONPREFIX= version- CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org COMMENT= Implementation of the codec specified in the JPEG-2000 standard LICENSE= JASPER 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 Index: branches/2020Q3/graphics/jasper/distinfo =================================================================== --- branches/2020Q3/graphics/jasper/distinfo (revision 548422) +++ branches/2020Q3/graphics/jasper/distinfo (revision 548423) @@ -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 Index: branches/2020Q3/graphics/jasper/files/patch-CMakeLists.txt =================================================================== --- branches/2020Q3/graphics/jasper/files/patch-CMakeLists.txt (revision 548422) +++ branches/2020Q3/graphics/jasper/files/patch-CMakeLists.txt (nonexistent) @@ -1,12 +0,0 @@ ---- CMakeLists.txt.orig 2019-03-12 18:04:35 UTC -+++ CMakeLists.txt -@@ -267,8 +267,8 @@ message("JAS_HAVE_LIBJPEG: ${JAS_HAVE_LIBJPEG}") - # Check for the OpenGL and GLUT libraries. - ################################################################################ - --find_package(OpenGL ${JAS_REQUIRED}) - message("JAS_ENABLE_OPENGL: ${JAS_ENABLE_OPENGL}") -+find_package(OpenGL ${JAS_OPENGL_REQUIRED}) - message("OpenGL library found: ${OPENGL_FOUND}") - if (JAS_ENABLE_OPENGL AND OPENGL_FOUND) - set(JAS_HAVE_OPENGL 0) Property changes on: branches/2020Q3/graphics/jasper/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2020Q3/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake =================================================================== --- branches/2020Q3/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake (nonexistent) +++ branches/2020Q3/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake (revision 548423) @@ -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) Property changes on: branches/2020Q3/graphics/jasper/files/patch-build-cmake-modules-JasOpenGL.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q3/graphics/jasper/pkg-plist =================================================================== --- branches/2020Q3/graphics/jasper/pkg-plist (revision 548422) +++ branches/2020Q3/graphics/jasper/pkg-plist (revision 548423) @@ -1,34 +1,35 @@ bin/imgcmp 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 include/jasper/jas_image.h include/jasper/jas_init.h include/jasper/jas_malloc.h include/jasper/jas_math.h include/jasper/jas_seq.h include/jasper/jas_stream.h include/jasper/jas_string.h include/jasper/jas_tmr.h include/jasper/jas_tvp.h include/jasper/jas_types.h include/jasper/jas_version.h include/jasper/jasper.h lib/libjasper.so lib/libjasper.so.4 lib/libjasper.so.4.0.0 libdata/pkgconfig/jasper.pc man/man1/imgcmp.1.gz man/man1/imginfo.1.gz man/man1/jasper.1.gz %%OPENGL%%man/man1/jiv.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/jasper.pdf %%PORTDOCS%%%%DOCSDIR%%/jpeg2000.pdf Index: branches/2020Q3/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp =================================================================== --- branches/2020Q3/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp (nonexistent) +++ branches/2020Q3/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp (revision 548423) @@ -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 ) Property changes on: branches/2020Q3/graphics/opencv/files/patch-modules_imgcodecs_src_grfmt__jpeg2000.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q3/graphics/qt5-imageformats/files/patch-src_plugins_imageformats_jp2_qjp2handler.cpp =================================================================== --- branches/2020Q3/graphics/qt5-imageformats/files/patch-src_plugins_imageformats_jp2_qjp2handler.cpp (nonexistent) +++ branches/2020Q3/graphics/qt5-imageformats/files/patch-src_plugins_imageformats_jp2_qjp2handler.cpp (revision 548423) @@ -0,0 +1,10 @@ +--- src/plugins/imageformats/jp2/qjp2handler.cpp.orig 2020-04-27 07:24:21 UTC ++++ src/plugins/imageformats/jp2/qjp2handler.cpp +@@ -44,6 +44,7 @@ + #include "qvariant.h" + #include "qcolor.h" + ++#include + #include + + QT_BEGIN_NAMESPACE Property changes on: branches/2020Q3/graphics/qt5-imageformats/files/patch-src_plugins_imageformats_jp2_qjp2handler.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q3/graphics/xv/files/patch-xvjp2k.c =================================================================== --- branches/2020Q3/graphics/xv/files/patch-xvjp2k.c (nonexistent) +++ branches/2020Q3/graphics/xv/files/patch-xvjp2k.c (revision 548423) @@ -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 */ + { Property changes on: branches/2020Q3/graphics/xv/files/patch-xvjp2k.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2020Q3 =================================================================== --- branches/2020Q3 (revision 548422) +++ branches/2020Q3 (revision 548423) Property changes on: branches/2020Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r548374-548375