CVS commit: pkgsrc/graphics/jasper

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 30 07:50:24 UTC 2025

Modified Files:
        pkgsrc/graphics/jasper: Makefile distinfo
Added Files:
        pkgsrc/graphics/jasper/patches:
            patch-src_libjasper_include_jasper_jas__config.h.in

Log Message:
jasper: make header safe to use from C++

Using upstream patch

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/graphics/jasper/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/graphics/jasper/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/graphics/jasper/patches/patch-src_libjasper_include_jasper_jas__config.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/jasper/Makefile
diff -u pkgsrc/graphics/jasper/Makefile:1.82 pkgsrc/graphics/jasper/Makefile:1.83
--- pkgsrc/graphics/jasper/Makefile:1.82        Tue Jan  7 19:36:10 2025
+++ pkgsrc/graphics/jasper/Makefile     Sun Mar 30 07:50:23 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2025/01/07 19:36:10 riastradh Exp $
+# $NetBSD: Makefile,v 1.83 2025/03/30 07:50:23 wiz Exp $
 
 DISTNAME=      jasper-4.2.4
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jasper-software/}
 GITHUB_RELEASE=        version-${PKGVERSION_NOREV}
@@ -10,13 +11,13 @@ HOMEPAGE=   https://jasper-software.github
 COMMENT=       Software-based reference implementation of the JPEG-2000 codec
 LICENSE=       modified-bsd
 
-USE_LANGUAGES= c c++
-FORCE_C_STD=   c99
-USE_TOOLS+=    bash:test
+USE_LANGUAGES=         c c++
+FORCE_C_STD=           c99
+USE_TOOLS+=            bash:test
 CMAKE_CONFIGURE_ARGS+= -DALLOW_IN_SOURCE_BUILD=ON
 CMAKE_CONFIGURE_ARGS+= -DJAS_ENABLE_DOC=OFF
 
-PKGCONFIG_OVERRIDE=    build/jasper.pc.in
+PKGCONFIG_OVERRIDE=    build/pkgconfig/jasper.pc.in
 REPLACE_BASH=          test/bin/*
 TEST_ENV+=             DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/src/libjasper
 TEST_TARGET=           test

Index: pkgsrc/graphics/jasper/distinfo
diff -u pkgsrc/graphics/jasper/distinfo:1.56 pkgsrc/graphics/jasper/distinfo:1.57
--- pkgsrc/graphics/jasper/distinfo:1.56        Tue Jan  7 19:36:10 2025
+++ pkgsrc/graphics/jasper/distinfo     Sun Mar 30 07:50:23 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.56 2025/01/07 19:36:10 riastradh Exp $
+$NetBSD: distinfo,v 1.57 2025/03/30 07:50:23 wiz Exp $
 
 BLAKE2s (jasper-4.2.4.tar.gz) = 5340810e5061badb10e506e34fef4c383f57ca23b87bfa8fc91e004d0cea3935
 SHA512 (jasper-4.2.4.tar.gz) = 54af8813afddafffdddc7bd8b8eb5ac90ff73fb28aa4b8d77e4d5e1231fd05e4052f843912c4b3dac6e8ab286e97248d900e8541577642016e2a0049eb707ec9
 Size (jasper-4.2.4.tar.gz) = 2125651 bytes
 SHA1 (patch-CMakeLists.txt) = f60e98b33f6e36903fe589d3ae04b8b2b61230de
+SHA1 (patch-src_libjasper_include_jasper_jas__config.h.in) = 6152047176d3b8603ef317fbf0bd140b8054be09
 SHA1 (patch-src_libjasper_pnm_pnm__enc.c) = a2d5d53cd28f653f9e6e302f76c187fba50b1ce2

Added files:

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.3
--- /dev/null   Sun Mar 30 07:50:24 2025
+++ pkgsrc/graphics/jasper/patches/patch-src_libjasper_include_jasper_jas__config.h.in  Sun Mar 30 07:50:23 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_libjasper_include_jasper_jas__config.h.in,v 1.3 2025/03/30 07:50:23 wiz Exp $
+
+Fix jasper header for c++.
+https://github.com/jasper-software/jasper/issues/393
+
+--- src/libjasper/include/jasper/jas_config.h.in.orig  2025-03-21 09:19:31.082742002 +0000
++++ src/libjasper/include/jasper/jas_config.h.in
+@@ -113,7 +113,8 @@ The version of the C standard against wh
+ #define JAS_DEFAULT_MAX_MEM_USAGE (1024ULL * 1024ULL * 1024ULL)
+ #endif
+ 
+-#if (__STDC_VERSION__ - 0 < JAS_STDC_VERSION)
++#if (!defined(__cplusplus) && (__STDC_VERSION__ - 0 < JAS_STDC_VERSION)) || \
++  (defined(__cplusplus) && (__cplusplus - 0 < JAS_STDC_VERSION))
+ #warning "Your code is being built against an older version of the C standard than JasPer was.  Although this is supported, this may require some extra preprocessor defines when building."
+ #endif
+