CVS commit: pkgsrc/print/mupdf

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Fri Jul 15 12:32:33 UTC 2016

Modified Files:
        pkgsrc/print/mupdf: Makefile distinfo
        pkgsrc/print/mupdf/patches: patch-source_fitz_load-jpx.c

Log Message:
Fix linking with openjpeg-2.1.1

Restrict OPJ_STATIC definition to Windows (as the comment suggests).
This avoid linking errors with openjpeg-2.1.1.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/mupdf/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/mupdf/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c

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

Modified files:

Index: pkgsrc/print/mupdf/Makefile
diff -u pkgsrc/print/mupdf/Makefile:1.36 pkgsrc/print/mupdf/Makefile:1.37
--- pkgsrc/print/mupdf/Makefile:1.36    Wed Apr 27 12:34:58 2016
+++ pkgsrc/print/mupdf/Makefile Fri Jul 15 12:32:33 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2016/04/27 12:34:58 leot Exp $
+# $NetBSD: Makefile,v 1.37 2016/07/15 12:32:33 leot Exp $
 
 DISTNAME=      mupdf-1.9a-source
 PKGNAME=       ${DISTNAME:S/-source//}
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  http://mupdf.com/downloads/archive/
 

Index: pkgsrc/print/mupdf/distinfo
diff -u pkgsrc/print/mupdf/distinfo:1.24 pkgsrc/print/mupdf/distinfo:1.25
--- pkgsrc/print/mupdf/distinfo:1.24    Wed Apr 27 12:34:58 2016
+++ pkgsrc/print/mupdf/distinfo Fri Jul 15 12:32:33 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2016/04/27 12:34:58 leot Exp $
+$NetBSD: distinfo,v 1.25 2016/07/15 12:32:33 leot Exp $
 
 SHA1 (mupdf-1.9a-source.tar.gz) = f2b3c21e5060d6ec56ea0d0c32b0feac7eac0e5f
 RMD160 (mupdf-1.9a-source.tar.gz) = 0cb0d098c603b16be217e42299052a928d95c3fc
@@ -8,5 +8,5 @@ SHA1 (patch-Makethird) = 0a5951d543755c4
 SHA1 (patch-ab) = c1ee4dd0b79aa0d905c0a0b634fbd016c063cd64
 SHA1 (patch-ac) = 51b62ef8ff3e6c44ad954b2405bd982f9d682d37
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
-SHA1 (patch-source_fitz_load-jpx.c) = 661b6a7f1d4da4f0cf5de3762db2f77d91239a6b
+SHA1 (patch-source_fitz_load-jpx.c) = cb33828a6ca638c1b61ff017708a41cc586d1b0e
 SHA1 (patch-thirdparty_mujs_Makefile) = f1da7cdf2c9e2e4bbac3e80ef486204a39b27e34

Index: pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c
diff -u pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.2 pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.3
--- pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c:1.2 Thu Feb  4 11:50:24 2016
+++ pkgsrc/print/mupdf/patches/patch-source_fitz_load-jpx.c     Fri Jul 15 12:32:33 2016
@@ -1,11 +1,22 @@
-$NetBSD: patch-source_fitz_load-jpx.c,v 1.2 2016/02/04 11:50:24 leot Exp $
+$NetBSD: patch-source_fitz_load-jpx.c,v 1.3 2016/07/15 12:32:33 leot Exp $
 
-Fix build with openjpeg-2.1.
-I have misgivings about the code though.
+ o Restrict OPJ_STATIC to Windows (avoid linking errors due to hidden symbols)
+ o Fix build with openjpeg-2.1.
+   I have misgivings about the code though.
 
---- source/fitz/load-jpx.c.orig        2015-11-10 16:19:51.000000000 +0000
+--- source/fitz/load-jpx.c.orig        2016-04-21 11:14:32.000000000 +0000
 +++ source/fitz/load-jpx.c
-@@ -117,7 +117,8 @@ fz_load_jpx(fz_context *ctx, unsigned ch
+@@ -3,7 +3,9 @@
+ /* Without the definition of OPJ_STATIC, compilation fails on windows
+  * due to the use of __stdcall. We believe it is required on some
+  * linux toolchains too. */
++#ifdef _WIN32
+ #define OPJ_STATIC
++#endif
+ #ifndef _MSC_VER
+ #define OPJ_HAVE_STDINT_H
+ #endif
+@@ -117,7 +119,8 @@ fz_load_jpx(fz_context *ctx, unsigned ch
        opj_stream_set_read_function(stream, fz_opj_stream_read);
        opj_stream_set_skip_function(stream, fz_opj_stream_skip);
        opj_stream_set_seek_function(stream, fz_opj_stream_seek);