CVS commit: pkgsrc/graphics

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 14 Aug 2024 06:14:57 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Aug 14 06:14:57 UTC 2024

Modified Files:
        pkgsrc/graphics/djvulibre-lib: Makefile Makefile.common distinfo
        pkgsrc/graphics/djvulibre-tools: Makefile
Added Files:
        pkgsrc/graphics/djvulibre-lib/patches: patch-libdjvu_miniexp.h
            patch-tools_Makefile.in patch-xmltools_Makefile.in
Removed Files:
        pkgsrc/graphics/djvulibre-lib/patches: patch-aa patch-ab patch-ac

Log Message:
djvulibre-lib djvulibre-tools: updated to 3.5.28

NEW IN VERSION 3.5.28
------------------------
- ddjvu: tiff generation improvements
- djvumake: security checks on INCL chunks
- all: updated for modern compilers
- win: moved to msvc2019
- osx: nfd filename normalization
- bugs: fixed several crashes on invalid inputs
- miniexp: fixed escape printout and macrochars
- djvudigital: can use poppler to find text
- csepdjvu: handle T comments for page titles
- bytestream: fixed 2GB limit
- gexception, gthread: cleanup obsolete code


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/djvulibre-lib/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/djvulibre-lib/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/djvulibre-lib/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/djvulibre-lib/patches/patch-aa \
    pkgsrc/graphics/djvulibre-lib/patches/patch-ab \
    pkgsrc/graphics/djvulibre-lib/patches/patch-ac
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/djvulibre-lib/patches/patch-libdjvu_miniexp.h \
    pkgsrc/graphics/djvulibre-lib/patches/patch-tools_Makefile.in \
    pkgsrc/graphics/djvulibre-lib/patches/patch-xmltools_Makefile.in
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/djvulibre-tools/Makefile

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

Modified files:

Index: pkgsrc/graphics/djvulibre-lib/Makefile
diff -u pkgsrc/graphics/djvulibre-lib/Makefile:1.18 pkgsrc/graphics/djvulibre-lib/Makefile:1.19
--- pkgsrc/graphics/djvulibre-lib/Makefile:1.18 Sat Oct 21 17:10:24 2023
+++ pkgsrc/graphics/djvulibre-lib/Makefile      Wed Aug 14 06:14:56 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2023/10/21 17:10:24 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2024/08/14 06:14:56 adam Exp $
 
 .include "../../graphics/djvulibre-lib/Makefile.common"
-PKGNAME=               ${DISTNAME:S/-/-lib-/}
-PKGREVISION=           3
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+PKGNAME=       ${DISTNAME:S/-/-lib-/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 
 PKGCONFIG_OVERRIDE+=   libdjvu/ddjvuapi.pc.in
 BUILD_DIRS=            libdjvu share

Index: pkgsrc/graphics/djvulibre-lib/Makefile.common
diff -u pkgsrc/graphics/djvulibre-lib/Makefile.common:1.5 pkgsrc/graphics/djvulibre-lib/Makefile.common:1.6
--- pkgsrc/graphics/djvulibre-lib/Makefile.common:1.5   Thu Jul 14 22:41:18 2022
+++ pkgsrc/graphics/djvulibre-lib/Makefile.common       Wed Aug 14 06:14:56 2024
@@ -1,26 +1,22 @@
-# $NetBSD: Makefile.common,v 1.5 2022/07/14 22:41:18 dholland Exp $
+# $NetBSD: Makefile.common,v 1.6 2024/08/14 06:14:56 adam Exp $
 # used by graphics/djvulibre-lib/Makefile
 # used by graphics/djvulibre-tools/Makefile
 
-DISTNAME=              djvulibre-3.5.27
-CATEGORIES=            graphics
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=djvu/}
+DISTNAME=      djvulibre-3.5.28
+CATEGORIES=    graphics
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=djvu/}
+
+HOMEPAGE=      https://djvu.sourceforge.net/
+COMMENT=       Compression library for scanned documents
+LICENSE=       gnu-gpl-v2
 
-HOMEPAGE=              http://djvu.sourceforge.net/
-COMMENT=               Compression library for scanned documents
-LICENSE=               gnu-gpl-v2
-
-PATCHDIR=              ${.CURDIR}/../djvulibre-lib/patches
-DISTINFO_FILE=         ${.CURDIR}/../djvulibre-lib/distinfo
+PATCHDIR=      ${.CURDIR}/../../graphics/djvulibre-lib/patches
+DISTINFO_FILE= ${.CURDIR}/../../graphics/djvulibre-lib/distinfo
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
 
-PKGCONFIG_OVERRIDE+=   libdjvu/ddjvuapi.pc.in
-BUILD_DIRS=            libdjvu share
-INSTALL_DIRS=          libdjvu share
-
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/graphics/djvulibre-lib/distinfo
diff -u pkgsrc/graphics/djvulibre-lib/distinfo:1.16 pkgsrc/graphics/djvulibre-lib/distinfo:1.17
--- pkgsrc/graphics/djvulibre-lib/distinfo:1.16 Tue Oct 26 10:46:04 2021
+++ pkgsrc/graphics/djvulibre-lib/distinfo      Wed Aug 14 06:14:56 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:46:04 nia Exp $
+$NetBSD: distinfo,v 1.17 2024/08/14 06:14:56 adam Exp $
 
-BLAKE2s (djvulibre-3.5.27.tar.gz) = cf3bd569d7c17ecb8f25251534b2255c28d7409e294c64ff80be0d86c881aa1b
-SHA512 (djvulibre-3.5.27.tar.gz) = 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
-Size (djvulibre-3.5.27.tar.gz) = 3648522 bytes
-SHA1 (patch-aa) = 8b06dff3f537cb9ec11073aba3e89dcfc114c947
-SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4
-SHA1 (patch-ac) = 405aa89829ad6ecac359287b821c13b1d8139d69
+BLAKE2s (djvulibre-3.5.28.tar.gz) = e9e84b2852d1d4f452670fd04a050d509b4a61136d6602522a2adbcd7c607810
+SHA512 (djvulibre-3.5.28.tar.gz) = db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
+Size (djvulibre-3.5.28.tar.gz) = 3701161 bytes
 SHA1 (patch-libdjvu_miniexp.cpp) = d63236ac02aa48d68536b0771c0fc8e17626fd33
+SHA1 (patch-libdjvu_miniexp.h) = 6ccf60185b0f9916a258a882fe9eabb301201ca4
+SHA1 (patch-tools_Makefile.in) = 5455c515f9ed1ac3aeb1e31339cb9ebb7fe6dbe3
+SHA1 (patch-xmltools_Makefile.in) = 04994dafd4a39e0f536eb565303a2a03d4574416

Index: pkgsrc/graphics/djvulibre-tools/Makefile
diff -u pkgsrc/graphics/djvulibre-tools/Makefile:1.20 pkgsrc/graphics/djvulibre-tools/Makefile:1.21
--- pkgsrc/graphics/djvulibre-tools/Makefile:1.20       Sat Oct 21 17:10:24 2023
+++ pkgsrc/graphics/djvulibre-tools/Makefile    Wed Aug 14 06:14:57 2024
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2023/10/21 17:10:24 gdt Exp $
+# $NetBSD: Makefile,v 1.21 2024/08/14 06:14:57 adam Exp $
 
 .include "../../graphics/djvulibre-lib/Makefile.common"
-PKGNAME=               ${DISTNAME:S/-/-tools-/}
-PKGREVISION=           3
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+PKGNAME=       ${DISTNAME:S/-/-tools-/}
 
-BUILD_DIRS=            tools xmltools
-INSTALL_DIRS=          tools xmltools
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 
-USE_TOOLS+=            bash:run
-REPLACE_BASH+=         tools/any2djvu
+BUILD_DIRS=    tools xmltools
+INSTALL_DIRS=  tools xmltools
+
+USE_TOOLS+=    bash:run
+REPLACE_BASH+= tools/any2djvu
 
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/graphics/djvulibre-lib/patches/patch-libdjvu_miniexp.h
diff -u /dev/null pkgsrc/graphics/djvulibre-lib/patches/patch-libdjvu_miniexp.h:1.1
--- /dev/null   Wed Aug 14 06:14:57 2024
+++ pkgsrc/graphics/djvulibre-lib/patches/patch-libdjvu_miniexp.h       Wed Aug 14 06:14:56 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-libdjvu_miniexp.h,v 1.1 2024/08/14 06:14:56 adam Exp $
+
+Avoid double declaration.
+
+--- libdjvu/miniexp.h.orig     2006-05-12 16:23:36.000000000 +0000
++++ libdjvu/miniexp.h
+@@ -46,7 +46,9 @@ extern "C" { 
+    information */
+ 
+ 
+-typedef struct miniexp_s* miniexp_t;
++#ifndef DDJVUAPI
++typedef struct miniexp_s* miniexp_t; 
++#endif
+ 
+ 
+ /* There are four basic types of lisp expressions,
Index: pkgsrc/graphics/djvulibre-lib/patches/patch-tools_Makefile.in
diff -u /dev/null pkgsrc/graphics/djvulibre-lib/patches/patch-tools_Makefile.in:1.1
--- /dev/null   Wed Aug 14 06:14:57 2024
+++ pkgsrc/graphics/djvulibre-lib/patches/patch-tools_Makefile.in       Wed Aug 14 06:14:57 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_Makefile.in,v 1.1 2024/08/14 06:14:57 adam Exp $
+
+Link against external libdjvulibre, as the package is split into lib and tools.
+
+--- tools/Makefile.in.orig     2015-02-12 16:04:02.000000000 +0000
++++ tools/Makefile.in
+@@ -424,7 +424,7 @@ jb2cmp_SOURCES = jb2cmp/classify.cpp jb2
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/libdjvu
+ AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+-DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
++DJLIB = $(prefix)/lib/libdjvulibre.la
+ bzz_SOURCES = bzz.cpp common.h
+ bzz_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+ c44_SOURCES = c44.cpp common.h
Index: pkgsrc/graphics/djvulibre-lib/patches/patch-xmltools_Makefile.in
diff -u /dev/null pkgsrc/graphics/djvulibre-lib/patches/patch-xmltools_Makefile.in:1.1
--- /dev/null   Wed Aug 14 06:14:57 2024
+++ pkgsrc/graphics/djvulibre-lib/patches/patch-xmltools_Makefile.in    Wed Aug 14 06:14:57 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-xmltools_Makefile.in,v 1.1 2024/08/14 06:14:57 adam Exp $
+
+Link against external libdjvulibre, as the package is split into lib and tools.
+
+--- xmltools/Makefile.in.orig  2015-02-12 16:04:02.000000000 +0000
++++ xmltools/Makefile.in
+@@ -335,7 +335,7 @@ top_srcdir = @top_srcdir@
+ version_info = @version_info@
+ AM_CPPFLAGS = -I$(top_srcdir)/libdjvu -I$(top_srcdir)/tools
+ AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+-DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
++DJLIB = $(prefix)/lib/libdjvulibre.la
+ djvutoxml_SOURCES = djvutoxml.cpp
+ djvutoxml_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+ djvuxmlparser_SOURCES = djvuxmlparser.cpp

Prev by Date: CVS commit: pkgsrc/print/zathura-pdf-mupdf
Next by Date: CVS commit: pkgsrc/graphics/zathura-djvu
Previous by Thread: CVS commit: pkgsrc/print/zathura-pdf-mupdf
Next by Thread: CVS commit: pkgsrc/graphics/zathura-djvu
Indexes:

Home | Main Index | Thread Index | Old Index