CVS commit: pkgsrc/graphics/jbig2enc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jan 30 07:55:18 UTC 2023

Modified Files:
        pkgsrc/graphics/jbig2enc: Makefile PLIST distinfo
        pkgsrc/graphics/jbig2enc/patches: patch-Makefile.am
Added Files:
        pkgsrc/graphics/jbig2enc/patches: patch-configure.ac patch-src_jbig2.cc
            patch-src_jbig2enc.cc patch-src_jbig2sym.cc

Log Message:
jbig2enc: updated to 0.29

0.29:
Unknown changes


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/jbig2enc/Makefile \
    pkgsrc/graphics/jbig2enc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/jbig2enc/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/jbig2enc/patches/patch-Makefile.am
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/jbig2enc/patches/patch-configure.ac \
    pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2.cc \
    pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2enc.cc \
    pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2sym.cc

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

Modified files:

Index: pkgsrc/graphics/jbig2enc/Makefile
diff -u pkgsrc/graphics/jbig2enc/Makefile:1.3 pkgsrc/graphics/jbig2enc/Makefile:1.4
--- pkgsrc/graphics/jbig2enc/Makefile:1.3       Tue Jan  3 17:37:24 2023
+++ pkgsrc/graphics/jbig2enc/Makefile   Mon Jan 30 07:55:18 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2023/01/03 17:37:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2023/01/30 07:55:18 adam Exp $
 
-DISTNAME=      jbig2enc-0.29pre
-PKGREVISION=   2
+DISTNAME=      jbig2enc-0.29
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=agl/}
-GITHUB_TAG=    0693dcd027f333d8499a4717b6452de08b6834ed
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/agl/jbig2enc
Index: pkgsrc/graphics/jbig2enc/distinfo
diff -u pkgsrc/graphics/jbig2enc/distinfo:1.3 pkgsrc/graphics/jbig2enc/distinfo:1.4
--- pkgsrc/graphics/jbig2enc/distinfo:1.3       Tue Oct 26 10:46:20 2021
+++ pkgsrc/graphics/jbig2enc/distinfo   Mon Jan 30 07:55:18 2023
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:46:20 nia Exp $
+$NetBSD: distinfo,v 1.4 2023/01/30 07:55:18 adam Exp $
 
-BLAKE2s (jbig2enc-0.29pre-0693dcd027f333d8499a4717b6452de08b6834ed.tar.gz) = 12dc6ea82378b66f7785445204dad8ca123596df8833d34b8e5c4890fa4a2a19
-SHA512 (jbig2enc-0.29pre-0693dcd027f333d8499a4717b6452de08b6834ed.tar.gz) = 
a40da34018596aed76ce1bbf2fa951df95f9159a4a3b22f545fefff85dc748ba0299b5956b3c6e984c3731ef60bacce588ffd0e5e7831ff08149cd8f20422108
-Size (jbig2enc-0.29pre-0693dcd027f333d8499a4717b6452de08b6834ed.tar.gz) = 40240 bytes
-SHA1 (patch-Makefile.am) = 5f0bd89e21c7657ac275ff65c06091af9db5e2f3
+BLAKE2s (jbig2enc-0.29.tar.gz) = 0ea2701ec813d8021ebd39459de7c3f4bec511aa504a83c6a11cb2ccdecbe408
+SHA512 (jbig2enc-0.29.tar.gz) = aa50cdaf61ef0ae473c8139d8da2a4c374450f8d0d31e2260031e8086dab9201c303c86d50cd51427135bef500718cbc3a53baabf2bf505f8908c22a3d361c51
+Size (jbig2enc-0.29.tar.gz) = 1108212 bytes
+SHA1 (patch-Makefile.am) = 506af56b0a3f7fe0629789053b015ff1af77c3eb
+SHA1 (patch-configure.ac) = 9777591b91e951b26d60e96a8590db71cadfa140
 SHA1 (patch-src_Makefile.am) = 4a757a78c15c2a979e168d3052a857632b61e21b
+SHA1 (patch-src_jbig2.cc) = 52b6f052c1055d4cf9224ffecfba12f1c97f7dbf
+SHA1 (patch-src_jbig2enc.cc) = e2750d7a2909d36fa2f89f87833aa0a543dd1620
+SHA1 (patch-src_jbig2sym.cc) = 4e2addeee78c3cc59ae584c5e3daa119abc28560

Index: pkgsrc/graphics/jbig2enc/PLIST
diff -u pkgsrc/graphics/jbig2enc/PLIST:1.1 pkgsrc/graphics/jbig2enc/PLIST:1.2
--- pkgsrc/graphics/jbig2enc/PLIST:1.1  Wed Mar  6 13:00:02 2019
+++ pkgsrc/graphics/jbig2enc/PLIST      Mon Jan 30 07:55:18 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/06 13:00:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/01/30 07:55:18 adam Exp $
 bin/jbig2
 include/jbig2arith.h
 include/jbig2comparator.h
@@ -13,6 +13,6 @@ share/doc/jbig2enc-0.28/ChangeLog
 share/doc/jbig2enc-0.28/INSTALL
 share/doc/jbig2enc-0.28/NEWS
 share/doc/jbig2enc-0.28/PATENTS
-share/doc/jbig2enc-0.28/README
+share/doc/jbig2enc-0.28/README.md
 share/doc/jbig2enc-0.28/jbig2enc.html
 share/doc/jbig2enc-0.28/pdf.py

Index: pkgsrc/graphics/jbig2enc/patches/patch-Makefile.am
diff -u pkgsrc/graphics/jbig2enc/patches/patch-Makefile.am:1.1 pkgsrc/graphics/jbig2enc/patches/patch-Makefile.am:1.2
--- pkgsrc/graphics/jbig2enc/patches/patch-Makefile.am:1.1      Wed Mar  6 13:00:03 2019
+++ pkgsrc/graphics/jbig2enc/patches/patch-Makefile.am  Mon Jan 30 07:55:18 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-Makefile.am,v 1.1 2019/03/06 13:00:03 joerg Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2023/01/30 07:55:18 adam Exp $
 
 Don't install the PDF conversion script, it is of limited usefulness.
 
---- Makefile.am.orig   2016-08-09 14:25:57.812939920 +0000
+--- Makefile.am.orig   2017-01-30 17:27:36.000000000 +0000
 +++ Makefile.am
 @@ -1,5 +1,4 @@
  ACLOCAL_AMFLAGS = -I m4
  SUBDIRS = src doc
 -dist_bin_SCRIPTS = pdf.py
--dist_doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README 
-+dist_doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README pdf.py
+-dist_doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README.md
++dist_doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README.md pdf.py
  EXTRA_DIST = autogen.sh

Added files:

Index: pkgsrc/graphics/jbig2enc/patches/patch-configure.ac
diff -u /dev/null pkgsrc/graphics/jbig2enc/patches/patch-configure.ac:1.1
--- /dev/null   Mon Jan 30 07:55:18 2023
+++ pkgsrc/graphics/jbig2enc/patches/patch-configure.ac Mon Jan 30 07:55:18 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.ac,v 1.1 2023/01/30 07:55:18 adam Exp $
+
+Fix build with Leptonica >=1.83
+https://github.com/agl/jbig2enc/pull/78
+
+--- configure.ac.orig  2022-12-28 10:23:14.000000000 +0000
++++ configure.ac
+@@ -73,7 +73,7 @@ AC_CONFIG_COMMANDS([libtool-rpath-patch]
+       fi],
+ [libtool_patch_use_rpath=$enable_rpath])
+ 
+-AC_CHECK_LIB([lept], [findFileFormatStream], [], [
++AC_CHECK_LIB([leptonica], [findFileFormatStream], [], [
+                       echo "Error! Leptonica not detected."
+                       exit -1
+                       ])
Index: pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2.cc
diff -u /dev/null pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2.cc:1.1
--- /dev/null   Mon Jan 30 07:55:18 2023
+++ pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2.cc Mon Jan 30 07:55:18 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_jbig2.cc,v 1.1 2023/01/30 07:55:18 adam Exp $
+
+Fix build with Leptonica >=1.83
+https://github.com/agl/jbig2enc/pull/78
+
+--- src/jbig2.cc.orig  2023-01-27 09:21:07.000000000 +0000
++++ src/jbig2.cc
+@@ -29,6 +29,9 @@
+ #endif
+ 
+ #include <leptonica/allheaders.h>
++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1
++#include "leptonica/pix_internal.h"
++#endif
+ 
+ #include "jbig2enc.h"
+ 
Index: pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2enc.cc
diff -u /dev/null pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2enc.cc:1.1
--- /dev/null   Mon Jan 30 07:55:18 2023
+++ pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2enc.cc      Mon Jan 30 07:55:18 2023
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_jbig2enc.cc,v 1.1 2023/01/30 07:55:18 adam Exp $
+
+Fix build with Leptonica >=1.83
+https://github.com/agl/jbig2enc/pull/78
+
+--- src/jbig2enc.cc.orig       2023-01-27 09:23:35.000000000 +0000
++++ src/jbig2enc.cc
+@@ -24,6 +24,10 @@
+ #include <string.h>
+ 
+ #include <leptonica/allheaders.h>
++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1
++#include "leptonica/pix_internal.h"
++#include "leptonica/array_internal.h"
++#endif
+ 
+ #include <math.h>
+ #if defined(sun)
+@@ -206,7 +210,11 @@ unite_templates(struct jbig2ctx *ctx,
+         numaSetValue(ctx->classer->naclass, i, new_representant);
+       }
+     }
++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1
++    ctx->classer->pixat->pix[new_representant]->refcount += ctx->classer->pixat->pix[second_template]->refcount;
++#else
+     pixChangeRefcount(ctx->classer->pixat->pix[new_representant],pixGetRefcount(ctx->classer->pixat->pix[second_template]));
++#endif
+   }
+   return 0;
+ }
Index: pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2sym.cc
diff -u /dev/null pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2sym.cc:1.1
--- /dev/null   Mon Jan 30 07:55:18 2023
+++ pkgsrc/graphics/jbig2enc/patches/patch-src_jbig2sym.cc      Mon Jan 30 07:55:18 2023
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_jbig2sym.cc,v 1.1 2023/01/30 07:55:18 adam Exp $
+
+Fix build with Leptonica >=1.83
+https://github.com/agl/jbig2enc/pull/78
+
+--- src/jbig2sym.cc.orig       2023-01-27 09:25:22.000000000 +0000
++++ src/jbig2sym.cc
+@@ -29,6 +29,10 @@
+ #include <stdio.h>
+ 
+ #include <leptonica/allheaders.h>
++#if (LIBLEPT_MAJOR_VERSION == 1 && LIBLEPT_MINOR_VERSION >= 83) || LIBLEPT_MAJOR_VERSION > 1
++#include "leptonica/pix_internal.h"
++#include "leptonica/array_internal.h"
++#endif
+ 
+ #include <math.h>
+