CVS commit: pkgsrc/graphics/openjpeg

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 28 00:04:19 UTC 2024

Modified Files:
        pkgsrc/graphics/openjpeg: Makefile distinfo
Added Files:
        pkgsrc/graphics/openjpeg/patches: patch-src_lib_openjp2_openjpeg.h

Log Message:
openjpeg: fix API change in 2.5.1 release using (to-be) upstream patch

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/openjpeg/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/openjpeg/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_openjpeg.h

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

Modified files:

Index: pkgsrc/graphics/openjpeg/Makefile
diff -u pkgsrc/graphics/openjpeg/Makefile:1.28 pkgsrc/graphics/openjpeg/Makefile:1.29
--- pkgsrc/graphics/openjpeg/Makefile:1.28      Mon Feb 26 18:15:43 2024
+++ pkgsrc/graphics/openjpeg/Makefile   Wed Feb 28 00:04:18 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2024/02/26 18:15:43 adam Exp $
+# $NetBSD: Makefile,v 1.29 2024/02/28 00:04:18 wiz Exp $
 
 DISTNAME=      openjpeg-2.5.1
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=uclouvain/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/graphics/openjpeg/distinfo
diff -u pkgsrc/graphics/openjpeg/distinfo:1.23 pkgsrc/graphics/openjpeg/distinfo:1.24
--- pkgsrc/graphics/openjpeg/distinfo:1.23      Mon Feb 26 18:15:43 2024
+++ pkgsrc/graphics/openjpeg/distinfo   Wed Feb 28 00:04:18 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2024/02/26 18:15:43 adam Exp $
+$NetBSD: distinfo,v 1.24 2024/02/28 00:04:18 wiz Exp $
 
 BLAKE2s (openjpeg-2.5.1.tar.gz) = 9a824f53a475635d457a2aa782b2af799d880dd166e42c95bdca0e63bbd77bef
 SHA512 (openjpeg-2.5.1.tar.gz) = 7cb0b67e67b3e2799577a6b6f5d60c67c6ce12d16c307e01129b763a48e272eeaf029504dc52b5cc380e562c2db5220f335449b52eacc3784763f95524e4a8d9
@@ -6,4 +6,5 @@ Size (openjpeg-2.5.1.tar.gz) = 1871681 b
 SHA1 (patch-CMakeLists.txt) = f9cbfae0f2ff780c6f5250d1a1930d8e8961380d
 SHA1 (patch-src_bin_jp2_CMakeLists.txt) = 2ad64fbd7ce8c084b3d5882d353ae5f6110da183
 SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = 55dccb61e492a7b6b2eca5d91081b2d33ab03ea1
+SHA1 (patch-src_lib_openjp2_openjpeg.h) = 1f2f11a6caea831f3e96c9f39ab46ab6d02d3646
 SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = 6d7a88300b29c9bab7fe8c89276d907593961e59

Added files:

Index: pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_openjpeg.h
diff -u /dev/null pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_openjpeg.h:1.1
--- /dev/null   Wed Feb 28 00:04:19 2024
+++ pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_openjpeg.h   Wed Feb 28 00:04:19 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_openjp2_openjpeg.h,v 1.1 2024/02/28 00:04:19 wiz Exp $
+
+Revert 2.5.1 API change
+https://github.com/rouault/openjpeg/commit/e521a5094be3be4f8657a2253958b0d752616479
+
+--- src/lib/openjp2/openjpeg.h.orig    2024-02-28 00:00:01.601994027 +0000
++++ src/lib/openjp2/openjpeg.h
+@@ -138,6 +138,8 @@ typedef int64_t  OPJ_OFF_T; /* 64-bit fi
+ #include <stdio.h>
+ typedef size_t   OPJ_SIZE_T;
+ 
++#include "opj_config.h"
++
+ /* Avoid compile-time warning because parameter is not used */
+ #define OPJ_ARG_NOT_USED(x) (void)(x)
+