|
 |
25f6510 |
From 99cf218dbd5f6fbdbda2ce6872eb9ab7f475c353 Mon Sep 17 00:00:00 2001
|
|
|
25f6510 |
From: Chris Liddell <chris.liddell@artifex.com>
|
|
|
25f6510 |
Date: Tue, 27 Sep 2016 11:22:18 +0100
|
|
|
25f6510 |
Subject: [PATCH 1/2] Add pre-processor define for shared OpenJPEG
|
|
|
25f6510 |
|
|
|
25f6510 |
---
|
|
|
25f6510 |
Makefile.in | 2 +-
|
|
|
25f6510 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
25f6510 |
|
|
|
25f6510 |
diff --git a/Makefile.in b/Makefile.in
|
|
|
25f6510 |
index 25875ad..2ca2a80 100644
|
|
|
25f6510 |
--- a/Makefile.in
|
|
|
25f6510 |
+++ b/Makefile.in
|
|
|
25f6510 |
@@ -290,7 +290,7 @@ JBIG2_CFLAGS=@JBIG2_AUTOCONF_CFLAGS@
|
|
|
25f6510 |
JPX_LIB=@JPX_DECODER@
|
|
|
25f6510 |
SHARE_JPX=@SHARE_JPX@
|
|
|
25f6510 |
JPXSRCDIR=@JPXDIR@
|
|
|
25f6510 |
-JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ @JPX_SSE_CFLAGS@
|
|
|
25f6510 |
+JPX_CFLAGS=-DSHARE_JPX=$(SHARE_JPX) @JPX_AUTOCONF_CFLAGS@ @JPX_SSE_CFLAGS@
|
|
|
25f6510 |
|
|
|
25f6510 |
# uncomment the following three lines and one of the last two to
|
|
|
25f6510 |
# compile in the Luratech lwf_jp2 codec
|
|
|
25f6510 |
--
|
|
|
25f6510 |
2.7.4
|
|
|
25f6510 |
|
|
|
25f6510 |
|
|
|
25f6510 |
From 4f19ab99cac2d8a7d21aea34d8aea0727fad52d3 Mon Sep 17 00:00:00 2001
|
|
|
25f6510 |
From: Didier Raboud <odyx@debian.org>
|
|
|
25f6510 |
Date: Thu, 6 Oct 2016 17:08:41 +0200
|
|
|
25f6510 |
Subject: [PATCH 2/2] Don't pass -DOPJ_STATIC when compiling the OpenJPEG code.
|
|
|
25f6510 |
|
|
|
25f6510 |
It makes the symbols hidden when including
|
|
|
25f6510 |
/usr/include/openjpeg-2.1/openjpeg.h.
|
|
|
25f6510 |
Fixes a FTBFS against libopenjp2-7 (>= 2.1.1).
|
|
|
25f6510 |
|
|
|
25f6510 |
Debian bug: https://bugs.debian.org/832873
|
|
|
25f6510 |
---
|
|
|
25f6510 |
base/lib.mak | 2 +-
|
|
|
25f6510 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
25f6510 |
|
|
|
25f6510 |
diff --git a/base/lib.mak b/base/lib.mak
|
|
|
25f6510 |
index 173e2c6..cffdc9d 100644
|
|
|
25f6510 |
--- a/base/lib.mak
|
|
|
25f6510 |
+++ b/base/lib.mak
|
|
|
25f6510 |
@@ -1849,7 +1849,7 @@ $(GLOBJ)sjpx_openjpeg.$(OBJ) : $(GLSRC)sjpx_openjpeg.c $(AK) \
|
|
|
25f6510 |
$(memory__h) $(gserror_h) $(gserrors_h) \
|
|
|
25f6510 |
$(gdebug_h) $(strimpl_h) $(sjpx_openjpeg_h) $(LIB_MAK) $(MAKEDIRS)
|
|
|
25f6510 |
$(GLJPXOPJCC) $(GLO_)sjpx_openjpeg.$(OBJ) \
|
|
|
25f6510 |
- $(C_) -DOPJ_STATIC $(GLSRC)sjpx_openjpeg.c
|
|
|
25f6510 |
+ $(C_) $(GLSRC)sjpx_openjpeg.c
|
|
|
25f6510 |
|
|
|
25f6510 |
# ---------------- Pixel-difference filters ---------------- #
|
|
|
25f6510 |
# The Predictor facility of the LZW and Flate filters uses these.
|
|
|
25f6510 |
--
|
|
|
25f6510 |
2.7.4
|
|
|
25f6510 |
|