Created attachment 247535 [details] Upgrade IM7 to the currently-latest. Provide for FLIF and ZSTD support. The dependency on graphics/flif is added as an option (default off). ZSTD support is enabled unconditionally -- because libzip.so (which is enabled unconditionally) already drags in libzstd.so anyway. Other than that the upgrade is quite trivial. "make test" succeeds for me here on FreeBSD-14/amd64.
Hi, thank you for the patch. When building the port with following options: 16BIT_PIXEL=on: 16bit pixel support BZIP2=on: bzip2 compressed MIFF images DJVU=off: DJVU format support (needs THREADS) DOCS=on: Build and/or install documentation FFMPEG=off: VIDEO codec support as FFmpeg FFTW=on: Discrete Fourier Transform support FLIF=off FONTCONFIG=on: X11 font configuration support FPX=off: FlashPix image format support FREETYPE=on: TrueType font rendering support GRAPHVIZ=off: Graphviz graph drawing support GSLIB=off: libgs (Postscript SHLIB) support HDRI=on: High dynamic range images support HEIF=on: ISO/IEC 23008-12:2017 HEIF file format support JBIG=on: JBIG image format support JPEG=on: JPEG image format support JPEG2000=on: OpenJPEG 2000 support via openjpeg JXL=on: JPEG XL image format via libjxl LCMS2=on: Little CMS 2.x support LQR=on: Liquid Rescale support LZMA=on: LZMA compression support MODULES=on: Modules support OPENEXR=on: HDR image format support via OpenEXR OPENMP=off: Parallel processing support via OpenMP PANGO=off: Pango rendering library support PDF=on: PDF document support PERL=on: Perl scripting language support PNG=on: PNG image format support RAQM=on: Complex text layout support RAW=on: RAW format support (implies the lcms2 option) SVG=on: SVG vector image format support (via librsvg, implies the x11 option) TESTS=off: Run bundled self-tests after build THREADS=on: Threading support TIFF=on: TIFF image format support WEBP=on: WebP image format support WMF=on: Windows Metafile image format support it results in these errors: Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%-7/www/multispectral-imagery.html Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%-7/www/vpat.html
(In reply to awoonya from comment #1) > Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%-7/www/multispectral-imagery.html > Error: Orphaned: %%PORTDOCS%%%%DOCSDIR%%-7/www/vpat.html Thank you for testing. I build my ports with the DOCS-option turned off -- in case of a problem, I just search the Internet -- so I haven't noticed this. Could you just add the two new HTML-files locally yourself, or do you need me to resubmit a new patch?
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6cb95d84055ddff74d65ffbfc928ca94a9cf8a7 commit c6cb95d84055ddff74d65ffbfc928ca94a9cf8a7 Author: Mikhail T. <mi@ALDAN.algebra.com> AuthorDate: 2024-01-15 19:09:40 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-01-15 19:40:07 +0000 graphics/ImageMagick7: update to 7.1.1-26 PR: 276208 Co-authored-by: awoonya <mzhyneva@gmail.com> graphics/ImageMagick7/Makefile | 14 ++++--- graphics/ImageMagick7/distinfo | 6 +-- .../ImageMagick7/files/patch-coders_jxl.c (gone) | 44 ---------------------- .../files/patch-config_policy.xml (gone) | 17 --------- graphics/ImageMagick7/pkg-plist | 8 +++- 5 files changed, 17 insertions(+), 72 deletions(-)
Pushed, thanks everyone.
Mikhail, I noticed that when the TEST option is on, the build fails. I wasn't able to fix it.
> Mikhail, I noticed that when the TEST option is on, the build fails. I wasn't able to fix it. Was it succeeding before -- with the same options? Could you make the test-log available somehow?
Created attachment 247687 [details] error log
(In reply to awoonya from comment #7) > error log The log ends with: Testsuite summary for ImageMagick 7.1.1-26 ============================================================================ # TOTAL: 87 # PASS: 87 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 which suggests, the actual self-testing is successful. However, because the staging includes the test-target, earlier in the log make complains: > make: Graph cycles through stage I'm wondering, if that's, what's triggering the non-zero exit code. Perhaps, it is time to simply remove the TEST-option -- users, who wish to perform the test, can simply exercise the test-target...
Perhaps a description for FLIF should be added?
(In reply to Mikhail T. from comment #8) > Perhaps, it is time to simply remove the TEST-option -- users, who wish to perform the test, can simply exercise the test-target... The TEST option is needed if it is required to pass some additional configure flags to enable them. Test dependencies are handled via unconditional TEST_DEPENDS. Finally, the canonical way to hook testing into the framework is the TEST_TARGET knob. And the "post-install-TESTS-on: test" is plain wrong and redundant.
I'll fix problems with FLIF description and TEST option
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=b161c257222b1bd38d21cded34b8e2f601986dd3 commit b161c257222b1bd38d21cded34b8e2f601986dd3 Author: awoonya <mzhyneva@gmail.com> AuthorDate: 2024-01-17 11:35:19 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-01-22 17:30:57 +0000 graphics/ImageMagick7: simplify TEST target and add FLIF description PR: 276208 graphics/ImageMagick7/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)