pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mupdf: explain the OPJ_STATIC comment a bit more in depth

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <>
Pushed By:	leot
Date:		Fri Dec 1 16:07:58 2017 +0100
Changeset:	4035d6d0fefcd6039936a1d20633791cca2f9309

Modified Files:

Log Message:
mupdf: explain the OPJ_STATIC comment a bit more in depth

Explain why we restrict OPJ_STATIC ifdef only to Windows. This will
hopefully save some time to debug opj_* undefined symbols when
trying to link libmupdf and accidently omitting the
patches/patch-source_fitz_load-jpx.c hunk (for extra debugging
stories fun, if OPJ_STATIC is defined some opj_* symbols are defined
while others are not defined, making the debugging of that problem
more naughty!).

To see a diff of this commit:;a=commitdiff;h=4035d6d0fefcd6039936a1d20633791cca2f9309

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

 mupdf/distinfo                             | 2 +-
 mupdf/patches/patch-source_fitz_load-jpx.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mupdf/distinfo b/mupdf/distinfo
index 3b29d5a540..2cc5d4ce30 100644
--- a/mupdf/distinfo
+++ b/mupdf/distinfo
@@ -9,5 +9,5 @@ SHA1 (patch-ab) = 755cb079c820240e7a3fba0cf16427fdba693dfd
 SHA1 (patch-ac) = 799efd894505fd960953905e61022411e8adf1ef
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 6e5e547df27ecb2b82cadd71489d2eb9138c1ce2
-SHA1 (patch-source_fitz_load-jpx.c) = 4170091042ca3c7d43f5adeeb4cf5b71d8d27e15
+SHA1 (patch-source_fitz_load-jpx.c) = 18b47e3b478183c8e85a6ad1e6cabbbf48cf9f6b
 SHA1 (patch-thirdparty_mujs_Makefile) = 713946f25ae1ea44878b19b9430324e3d9f98990
diff --git a/mupdf/patches/patch-source_fitz_load-jpx.c b/mupdf/patches/patch-source_fitz_load-jpx.c
index d760670aa9..f038ffd0f0 100644
--- a/mupdf/patches/patch-source_fitz_load-jpx.c
+++ b/mupdf/patches/patch-source_fitz_load-jpx.c
@@ -1,6 +1,7 @@
 $NetBSD: patch-source_fitz_load-jpx.c,v 1.6 2017/10/19 20:32:07 leot Exp $
-- Restrict OPJ_STATIC to Windows (avoid linking errors due to hidden symbols)
+- Restrict OPJ_STATIC to Windows. 
+  This avoid linking errors due to opj_* hidden symbols when linking libmupdf.
 - MuPDF does some locking around its allocation calls; it overrides openjpeg's
   allocators to do this locking too. However mupdf tries to manually align things

Home | Main Index | Thread Index | Old Index