CVS commit: pkgsrc/graphics/jasper

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 19:36:10 UTC 2025

Modified Files:
        pkgsrc/graphics/jasper: Makefile distinfo
Added Files:
        pkgsrc/graphics/jasper/patches: patch-CMakeLists.txt

Log Message:
graphics/jasper: Fix cross-build.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/graphics/jasper/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/jasper/distinfo
cvs rdiff -u -r0 -r1.7 pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt

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.81 pkgsrc/graphics/jasper/Makefile:1.82
--- pkgsrc/graphics/jasper/Makefile:1.81        Fri Sep 20 07:04:56 2024
+++ pkgsrc/graphics/jasper/Makefile     Tue Jan  7 19:36:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2024/09/20 07:04:56 tnn Exp $
+# $NetBSD: Makefile,v 1.82 2025/01/07 19:36:10 riastradh Exp $
 
 DISTNAME=      jasper-4.2.4
 CATEGORIES=    graphics
@@ -24,6 +24,13 @@ TEST_TARGET=         test
 CFLAGS+=       -D_POSIX_C_SOURCE=200112L       # nanosleep(2)
 CFLAGS.Darwin+=        -D_DARWIN_C_SOURCE=1
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+CMAKE_CONFIGURE_ARGS+= -DJAS_CROSSCOMPILING:BOOL=YES
+CMAKE_CONFIGURE_ARGS+= -DJAS_STDC_VERSION:STRING=199901L       # C99
+.endif
+
 .include "options.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/graphics/jasper/distinfo
diff -u pkgsrc/graphics/jasper/distinfo:1.55 pkgsrc/graphics/jasper/distinfo:1.56
--- pkgsrc/graphics/jasper/distinfo:1.55        Sun Apr 28 08:44:48 2024
+++ pkgsrc/graphics/jasper/distinfo     Tue Jan  7 19:36:10 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.55 2024/04/28 08:44:48 adam Exp $
+$NetBSD: distinfo,v 1.56 2025/01/07 19:36:10 riastradh 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_pnm_pnm__enc.c) = a2d5d53cd28f653f9e6e302f76c187fba50b1ce2

Added files:

Index: pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt:1.7
--- /dev/null   Tue Jan  7 19:36:10 2025
+++ pkgsrc/graphics/jasper/patches/patch-CMakeLists.txt Tue Jan  7 19:36:10 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.7 2025/01/07 19:36:10 riastradh Exp $
+
+Allow JAS_STDC_VERSION to be set on the command line.  Affects only
+cross builds.
+
+--- CMakeLists.txt.orig        2024-04-27 17:54:18.000000000 +0000
++++ CMakeLists.txt
+@@ -423,7 +423,7 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_C
+       # will need to be set manually from the command line
+       # (e.g., using -DJAS_STDC_VERSION=YYYYMML) or by changing the line below.
+ if(NOT JAS_WASM)
+-      set(JAS_STDC_VERSION "0L" CACHE INTERNAL "The value of __STDC_VERSION__.")
++      set(JAS_STDC_VERSION "0L" CACHE STRING "The value of __STDC_VERSION__.")
+       if (JAS_STDC_VERSION STREQUAL "0L")
+               message(FATAL_ERROR
+                 "The value of __STDC_VERSION__ cannot be automatically determined "