CVS commit: pkgsrc/graphics/jxrlib

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/jxrlib
From: "Patrick Welche" <prlw1%netbsd.org@localhost>
Date: Fri, 30 Oct 2026 10:32:53 +0000

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Fri Oct 30 10:32:53 UTC 2026

Modified Files:
        pkgsrc/graphics/jxrlib: Makefile PLIST distinfo
        pkgsrc/graphics/jxrlib/patches: patch-Makefile
Removed Files:
        pkgsrc/graphics/jxrlib/patches: patch-image_sys_strcodec.c
            patch-image_sys_strcodec.h patch-jxrencoderdecoder_JxrDecApp.c
            patch-jxrencoderdecoder_JxrEncApp.c patch-jxrgluelib_JXRGlueJxr.c
            patch-jxrgluelib_JXRMeta.h patch-jxrtestlib_JXRTest.c
            patch-jxrtestlib_JXRTestHdr.c patch-jxrtestlib_JXRTestPnm.c
            patch-jxrtestlib_JXRTestTif.c

Log Message:
Update jxrlib to 1.4.4

Motivated by wiz@ in
https://mail-index.netbsd.org/pkgsrc-users/2026/10/26/msg043665.html

Breaking change: include directory renamed from jxrlib to libjxr

Changelog

     * V1.4.4; 2026/10/09
          + Fix potential size_t overflow in the memory allocation limit
            check of calloc_lim
     * V1.4.3; 2026/09/02
          + tmpnam security mitigations:
               o Use a local buffer instead of its internal one
               o Fail to open file if it exists (requires C11)
     * V1.4.2; 2026/07/07
          + Fix buffer overflow in outputNChannel (OSS Fuzz 532002884)
     * V1.4.1; 2026/06/03
          + Fix Use-of-uninitialized-value in ReadContainer (OSS Fuzz
            517870853)
     * V1.4.0; 2026/05/29
          + Support for memory allocation limit via PKAlloc_SetLimit /
            PKAlloc_GetLimit API
          + Added PKLibJxr_GetVersion API to get library version
          + Unmaintained ASM X86 code moved to Unmaintained folder (it
            should not be used)
          + Fix memory leaks (OSS Fuzz 396171604, 511636124)
          + Fix crash in PKImageDecode_Copy_WMP (testcase
            s957297735_f50_tp5-testcard_gray16.jxr)
          + Fix issues found by github Security and quality
     * V1.3.8; 2026/05/21
          + Fix DPI conversion accuracy in BMPs
          + Fix compilation error using GCC 15.2
     * V1.3.7; 2026/05/13
          + Fix Invalid-enum-value in ParsePFDEntry (OSS Fuzz 511393476)
     * V1.3.6; 2026/05/07
          + Fix Use-of-uninitialized-value in
            PKFormatConverter_InitializeConvert (OSS Fuzz 506459298)
          + Fix Use-of-uninitialized-value in ReadWMIHeader (OSS Fuzz
            508365265)
          + Fix buffer read overflow in ReadContainer
     * V1.3.5; 2026/04/29
          + Changelog updated with list of fixed issues
          + Fix some compiler warnings
     * V1.3.4; 2026/04/27
          + Fix memory leaks in PKImageDecode_Copy_WMP (OSS Fuzz
            396171610)
          + Fix Null-dereference READ in invTransformMacroblock (OSS Fuzz
            506921661)
     * V1.3.3; 2026/04/20
          + Fix memory leak when Caption metadata is present (OSS Fuzz
            396172316)
     * V1.3.2; 2026/04/13
          + Fix Abrt in ImageStrDecTerm (OSS Fuzz 497787225)
     * V1.3.1; 2025/10/23
          + First release with multiple security fixes
               o OSS Fuzz 404307109, 379254062, 378836895, 377965577,
                 373025984, 373025974, 372598913, 372547401, 372524130
               o Others not tracked via online systems
               o Should also fixes CVE-2019-12212
          + Fix compilation error on macOS
          + Sources converted to UTF-8 encoding


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/jxrlib/Makefile \
    pkgsrc/graphics/jxrlib/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/jxrlib/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/jxrlib/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/jxrlib/patches/patch-image_sys_strcodec.c \
    pkgsrc/graphics/jxrlib/patches/patch-image_sys_strcodec.h \
    pkgsrc/graphics/jxrlib/patches/patch-jxrencoderdecoder_JxrDecApp.c \
    pkgsrc/graphics/jxrlib/patches/patch-jxrencoderdecoder_JxrEncApp.c \
    pkgsrc/graphics/jxrlib/patches/patch-jxrgluelib_JXRGlueJxr.c \
    pkgsrc/graphics/jxrlib/patches/patch-jxrgluelib_JXRMeta.h \
    pkgsrc/graphics/jxrlib/patches/patch-jxrtestlib_JXRTest.c \
    pkgsrc/graphics/jxrlib/patches/patch-jxrtestlib_JXRTestHdr.c \
    pkgsrc/graphics/jxrlib/patches/patch-jxrtestlib_JXRTestPnm.c \
    pkgsrc/graphics/jxrlib/patches/patch-jxrtestlib_JXRTestTif.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/jxrlib/Makefile
diff -u pkgsrc/graphics/jxrlib/Makefile:1.4 pkgsrc/graphics/jxrlib/Makefile:1.5
--- pkgsrc/graphics/jxrlib/Makefile:1.4 Tue Aug  4 20:28:59 2026
+++ pkgsrc/graphics/jxrlib/Makefile     Fri Oct 30 10:32:52 2026
@@ -1,53 +1,41 @@
-# $NetBSD: Makefile,v 1.4 2026/08/04 20:28:59 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2026/10/30 10:32:52 prlw1 Exp $
 
-DISTNAME=      jxrlib_1_1
-PKGNAME=       jxrlib-1.1
-PKGREVISION=   1
+DISTNAME=      jxrlib-1.4.4
 CATEGORIES=    graphics
-MASTER_SITES=  # javascript link
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=mircomir/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/curasystems/jxrlib
+HOMEPAGE=      https://github.com/mircomir/jxrlib
 COMMENT=       JPEG XR library
 LICENSE=       2-clause-bsd
 
+USE_TOOLS=     gmake
 TOOL_DEPENDS+= dos2unix-[0-9]*:../../converters/dos2unix
 
-WRKSRC=                ${WRKDIR}/jxrlib
-
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "big"
-CFLAGS+=-D_BIG__ENDIAN_
+MAKE_ENV+=     BIG_ENDIAN="true"
+ENDIANFLAG=    -D_BIG__ENDIAN_
+.else
+ENDIANFLAG=
 .endif
+MAKE_ENV+=     DIR_INSTALL=${DESTDIR}${PREFIX}
+MAKE_ENV+=     SHARED="true"
+
+LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 
-INSTALLATION_DIRS=     bin lib
-INSTALLATION_DIRS+=    include/jxrlib/common/include
-INSTALLATION_DIRS+=    include/jxrlib/image/sys
-INSTALLATION_DIRS+=    include/jxrlib/image/encode
-INSTALLATION_DIRS+=    include/jxrlib/image/decode
-INSTALLATION_DIRS+=    include/jxrlib/image/x86
-INSTALLATION_DIRS+=    include/jxrgluelib
-INSTALLATION_DIRS+=    share/doc/jxrlib
+PKGCONFIG_OVERRIDE+=   libjxr.pc.in
+SUBST_CLASSES+=                avoidpy
+SUBST_FILES.avoidpy=   libjxr.pc.in
+SUBST_STAGE.avoidpy=   pre-build
+SUBST_MESSAGE.avoidpy= Substitute variables in .pc.in file
+SUBST_SED.avoidpy=     -e 's,%(DIR_INSTALL)s,${PREFIX},g'
+SUBST_SED.avoidpy+=    -e 's,%(JXR_VERSION)s,${PKGVERSION_NOREV},g'
+SUBST_SED.avoidpy+=    -e 's,%(JXR_ENDIAN)s,${ENDIANFLAG},g'
 
 pre-patch:
        dos2unix ${WRKSRC}/Makefile
        find ${WRKSRC} -name '*.c' -print0 | xargs -0 dos2unix
        find ${WRKSRC} -name '*.h' -print0 | xargs -0 dos2unix
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/JxrEncApp ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_PROGRAM} ${WRKSRC}/JxrDecApp ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_LIB} ${WRKSRC}/*.a ${DESTDIR}${PREFIX}/lib
-       for dir in common/include image/sys image/encode image/decode image/x86; do \
-               ${INSTALL_DATA} ${WRKSRC}/$$dir/*.h ${DESTDIR}${PREFIX}/include/jxrlib/$$dir; \
-       done
-       ${INSTALL_DATA} ${WRKSRC}/jxrgluelib/*.h ${DESTDIR}${PREFIX}/include/jxrgluelib
-       ${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/jxrlib
-
-# FIXME: replace by proper LDFLAGS handling
-_WRAP_EXTRA_ARGS.CC+=  ${_RELRO_LDFLAGS}
-_WRAP_EXTRA_ARGS.CXX+= ${_RELRO_LDFLAGS}
-CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
-CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
-
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/jxrlib/distinfo
diff -u pkgsrc/graphics/jxrlib/distinfo:1.4 pkgsrc/graphics/jxrlib/distinfo:1.5
--- pkgsrc/graphics/jxrlib/distinfo:1.4 Tue Oct 26 10:46:22 2021
+++ pkgsrc/graphics/jxrlib/distinfo     Fri Oct 30 10:32:52 2026
@@ -1,16 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:46:22 nia Exp $
+$NetBSD: distinfo,v 1.5 2026/10/30 10:32:52 prlw1 Exp $
 
-BLAKE2s (jxrlib_1_1.tar.gz) = c6f566bee0703c5a8c6883d2893232a4522329cbb9bd7ab6aeb5175c4fd91f44
-SHA512 (jxrlib_1_1.tar.gz) = c7d87647601e08b2dc18bda26faea80ad5b09c6e8412769cd203ce9e221b2b58425e9d59a506ae8bf61030195bccb51a9d1e893bf2d18e596b0687918b39e2df
-Size (jxrlib_1_1.tar.gz) = 338240 bytes
-SHA1 (patch-Makefile) = 581bdfdfee20fd1f6d0a2a3d1cf8ce877eb0629b
-SHA1 (patch-image_sys_strcodec.c) = 3cf7e93704c5849dcbb3ff435743f87fe8ebf042
-SHA1 (patch-image_sys_strcodec.h) = ef060597735fbc9529bd25cb3431eafaf3284ddc
-SHA1 (patch-jxrencoderdecoder_JxrDecApp.c) = ae71490d95c3f15cd65115872d2463468cda3a97
-SHA1 (patch-jxrencoderdecoder_JxrEncApp.c) = ff66c068348260291d51d21f8caf6059a63fac65
-SHA1 (patch-jxrgluelib_JXRGlueJxr.c) = adce3e44d470c62817ef83a3b0723818d8ecb810
-SHA1 (patch-jxrgluelib_JXRMeta.h) = b14f26ab80b1050879eac404283a11a795326444
-SHA1 (patch-jxrtestlib_JXRTest.c) = 2dcb7f4f953c129db1e7db4741439f1c5eb19e27
-SHA1 (patch-jxrtestlib_JXRTestHdr.c) = 8f5562dfe3d0dd1ddfb6b591facd51c45cd3d068
-SHA1 (patch-jxrtestlib_JXRTestPnm.c) = ea94a288d76d9e9c316716f07226640570136460
-SHA1 (patch-jxrtestlib_JXRTestTif.c) = f4c36e487a808e80ff75cd99fd693c555902d758
+BLAKE2s (jxrlib-1.4.4.tar.gz) = c7d602a96ae482ef88a73c1ab3ddfa835fa8a74634c95cb5aa86e4ee9855c862
+SHA512 (jxrlib-1.4.4.tar.gz) = 3b77a2cbcf000b6decf006097f415d86156ab6dc70d3fa3069ddee31f04e610e2d644dec0fae96bf73ee4e5d1ca0390129fc650356da3e7446d6211b22d7df99
+Size (jxrlib-1.4.4.tar.gz) = 352758 bytes
+SHA1 (patch-Makefile) = 2dee098ecb785a307efe3bfce6f7a00692a40b61

Index: pkgsrc/graphics/jxrlib/PLIST
diff -u pkgsrc/graphics/jxrlib/PLIST:1.1 pkgsrc/graphics/jxrlib/PLIST:1.2
--- pkgsrc/graphics/jxrlib/PLIST:1.1    Tue Apr  4 13:07:07 2017
+++ pkgsrc/graphics/jxrlib/PLIST        Fri Oct 30 10:32:52 2026
@@ -1,25 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1 2017/04/04 13:07:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2026/10/30 10:32:52 prlw1 Exp $
 bin/JxrDecApp
 bin/JxrEncApp
-include/jxrgluelib/JXRGlue.h
-include/jxrgluelib/JXRMeta.h
-include/jxrlib/common/include/guiddef.h
-include/jxrlib/common/include/wmsal.h
-include/jxrlib/common/include/wmspecstring.h
-include/jxrlib/common/include/wmspecstrings_adt.h
-include/jxrlib/common/include/wmspecstrings_strict.h
-include/jxrlib/common/include/wmspecstrings_undef.h
-include/jxrlib/image/decode/decode.h
-include/jxrlib/image/encode/encode.h
-include/jxrlib/image/sys/ansi.h
-include/jxrlib/image/sys/common.h
-include/jxrlib/image/sys/perfTimer.h
-include/jxrlib/image/sys/strTransform.h
-include/jxrlib/image/sys/strcodec.h
-include/jxrlib/image/sys/windowsmediaphoto.h
-include/jxrlib/image/sys/xplatform_image.h
-include/jxrlib/image/x86/x86.h
-lib/libjpegxr.a
-lib/libjxrglue.a
-share/doc/jxrlib/JPEGXR_DPK_Spec_1.0.doc
-share/doc/jxrlib/readme.txt
+include/libjxr/common/guiddef.h
+include/libjxr/common/wmsal.h
+include/libjxr/common/wmspecstring.h
+include/libjxr/common/wmspecstrings_adt.h
+include/libjxr/common/wmspecstrings_strict.h
+include/libjxr/common/wmspecstrings_undef.h
+include/libjxr/glue/JXRGlue.h
+include/libjxr/glue/JXRMeta.h
+include/libjxr/glue/JXRVersion.h
+include/libjxr/image/ansi.h
+include/libjxr/image/common.h
+include/libjxr/image/decode.h
+include/libjxr/image/encode.h
+include/libjxr/image/memory_lim.h
+include/libjxr/image/perfTimer.h
+include/libjxr/image/strTransform.h
+include/libjxr/image/strcodec.h
+include/libjxr/image/windowsmediaphoto.h
+include/libjxr/image/x86/x86.h
+include/libjxr/image/xplatform_image.h
+include/libjxr/test/JXRTest.h
+lib/libjpegxr.so
+lib/libjxrglue.so
+lib/pkgconfig/libjxr.pc
+share/doc/jxr-${PKGVERSION}/JPEGXR_DPK_Spec_1.0.doc
+share/doc/jxr-${PKGVERSION}/readme.txt

Index: pkgsrc/graphics/jxrlib/patches/patch-Makefile
diff -u pkgsrc/graphics/jxrlib/patches/patch-Makefile:1.1 pkgsrc/graphics/jxrlib/patches/patch-Makefile:1.2
--- pkgsrc/graphics/jxrlib/patches/patch-Makefile:1.1   Mon Nov 25 21:07:19 2019
+++ pkgsrc/graphics/jxrlib/patches/patch-Makefile       Fri Oct 30 10:32:52 2026
@@ -1,13 +1,29 @@
-$NetBSD: patch-Makefile,v 1.1 2019/11/25 21:07:19 nros Exp $
-* take in CFLAGS from the environment so that _BIG__ENDIAN_ can be added
---- Makefile.orig      2019-11-25 19:14:40.081612047 +0000
+$NetBSD: patch-Makefile,v 1.2 2026/10/30 10:32:52 prlw1 Exp $
+
+- Avoid depending on python to create .pc file
+- pass in LDFLAGS for rpath and relro
+
+--- Makefile.orig      2026-10-30 08:23:51.992400861 +0000
 +++ Makefile
-@@ -39,7 +39,7 @@ DIR_GLUE=jxrgluelib
- DIR_TEST=jxrtestlib
- DIR_EXEC=jxrencoderdecoder
+@@ -84,7 +84,7 @@ endif
+ LIBRARIES=$(STATIC_LIBRARIES)
+ endif
  
--CFLAGS=-I. -Icommon/include -I$(DIR_SYS) -D__ANSI__ -DDISABLE_PERF_MEASUREMENT -w -O
-+CFLAGS+=-I. -Icommon/include -I$(DIR_SYS) -D__ANSI__ -DDISABLE_PERF_MEASUREMENT -w -O
+-LIBS=-L$(DIR_BUILD) $(shell echo $(LIBRARIES) | sed -e 's%$(DIR_BUILD)/lib\([^ ]*\)\.\(a\|so\)%-l\1%g') -lm
++LIBS=-L$(DIR_BUILD) $(LDFLAGS) $(shell echo $(LIBRARIES) | sed -e 's%$(DIR_BUILD)/lib\([^ ]*\)\.\(a\|so\)%-l\1%g') -lm
+ 
+ ##--------------------------------
  ##
- ## Add following flag to CFLAGS above if target is a big endian machine
- ## -D_BIG__ENDIAN_
+@@ -206,10 +206,10 @@ $(DIR_BUILD)/libjxr.pc: $(DIR_SRC)/libjxr.pc.in
+ $(DIR_BUILD)/libjxr.pc: $(DIR_SRC)/libjxr.pc.in
+       @python -c 'import os; d = { "DIR_INSTALL": "$(DIR_INSTALL)", "JXR_VERSION": "$(JXR_VERSION)", "JXR_ENDIAN": "$(ENDIANFLAG)" }; fin = open("$<", "r"); fout = open("$@", "w+"); 
fout.writelines( [ l % d for l in fin.readlines()])'
+ 
+-install: all $(DIR_BUILD)/libjxr.pc
++install: all
+       install -d $(DIR_INSTALL)/lib/pkgconfig $(DIR_INSTALL)/bin $(DIR_INSTALL)/include/libjxr/common  $(DIR_INSTALL)/include/libjxr/image/x86 $(DIR_INSTALL)/include/libjxr/glue 
$(DIR_INSTALL)/include/libjxr/test $(DIR_INSTALL)/share/doc/jxr-$(JXR_VERSION)
+       install $(LIBRARIES) $(DIR_INSTALL)/lib
+-      install -m 644 $(DIR_BUILD)/libjxr.pc $(DIR_INSTALL)/lib/pkgconfig
++      install -m 644 $(DIR_SRC)/libjxr.pc.in $(DIR_INSTALL)/lib/pkgconfig/libjxr.pc
+       install $(DIR_BUILD)/$(ENCAPP) $(DIR_BUILD)/$(DECAPP) $(DIR_INSTALL)/bin
+       install -m 644 $(DIR_SRC)/common/include/*.h $(DIR_INSTALL)/include/libjxr/common
+       install -m 644 $(DIR_SRC)/image/x86/*.h $(DIR_INSTALL)/include/libjxr/image/x86

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

Home | Main Index | Thread Index | Old Index