diff options
Diffstat (limited to 'meta/recipes-extended/ghostscript/files/0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch')
-rw-r--r-- | meta/recipes-extended/ghostscript/files/0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta/recipes-extended/ghostscript/files/0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch b/meta/recipes-extended/ghostscript/files/0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch new file mode 100644 index 0000000000..d586a1d6df --- /dev/null +++ b/meta/recipes-extended/ghostscript/files/0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | From 1d19998091154f89b8294e4594a05986b4c2f822 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chris Liddell <chris.liddell@artifex.com> | ||
3 | Date: Wed, 13 Jan 2016 02:08:42 -0500 | ||
4 | Subject: [PATCH 1/2] Bug 696497: Fix support for building with no jbig2 | ||
5 | decoder | ||
6 | |||
7 | Author: Chris Liddell <chris.liddell@artifex.com> | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | http://bugs.ghostscript.com/show_bug.cgi?id=696497 | ||
11 | http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=b0f5a975 | ||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | --- | ||
14 | base/lib.mak | 9 +++++++++ | ||
15 | psi/int.mak | 23 ++++++++++++++++++----- | ||
16 | 2 files changed, 27 insertions(+), 5 deletions(-) | ||
17 | |||
18 | diff --git a/base/lib.mak b/base/lib.mak | ||
19 | index 241df2f..daa7056 100644 | ||
20 | --- a/base/lib.mak | ||
21 | +++ b/base/lib.mak | ||
22 | @@ -1732,6 +1732,10 @@ $(GLD)sjbig2_jbig2dec.dev : $(LIB_MAK) $(ECHOGS_XE) \ | ||
23 | $(SETMOD) $(GLD)sjbig2_jbig2dec $(sjbig2_jbig2dec) | ||
24 | $(ADDMOD) $(GLD)sjbig2_jbig2dec -include $(GLD)jbig2dec.dev | ||
25 | |||
26 | +$(GLD)sjbig2_.dev : $(LIB_MAK) $(ECHOGS_XE) \ | ||
27 | + $(LIB_MAK) $(MAKEDIRS) | ||
28 | + $(SETMOD) $(GLD)sjbig2_ | ||
29 | + | ||
30 | # jbig2dec.dev is defined in jbig2.mak | ||
31 | |||
32 | $(GLOBJ)sjbig2.$(OBJ) : $(GLSRC)sjbig2.c $(AK) \ | ||
33 | @@ -1739,6 +1743,11 @@ $(GLOBJ)sjbig2.$(OBJ) : $(GLSRC)sjbig2.c $(AK) \ | ||
34 | $(sjbig2_h) $(strimpl_h) $(MAKEDIRS) | ||
35 | $(GLJBIG2CC) $(GLO_)sjbig2.$(OBJ) $(C_) $(GLSRC)sjbig2.c | ||
36 | |||
37 | +$(GLOBJ)snojbig2.$(OBJ) : $(GLSRC)snojbig2.c $(AK) \ | ||
38 | + $(stdint__h) $(memory__h) $(stdio__h) $(gserrors_h) $(gdebug_h) \ | ||
39 | + $(strimpl_h) $(LIB_MAK) $(MAKEDIRS) | ||
40 | + $(GLJBIG2CC) $(GLO_)snojbig2.$(OBJ) $(C_) $(GLSRC)snojbig2.c | ||
41 | + | ||
42 | # luratech version | ||
43 | sjbig2_luratech=$(GLOBJ)sjbig2_luratech.$(OBJ) | ||
44 | |||
45 | diff --git a/psi/int.mak b/psi/int.mak | ||
46 | index 6149a3b..f9d667d 100644 | ||
47 | --- a/psi/int.mak | ||
48 | +++ b/psi/int.mak | ||
49 | @@ -1254,11 +1254,24 @@ $(PSOBJ)zfaes.$(OBJ) : $(PSSRC)zfaes.c $(OP) $(memory__h)\ | ||
50 | # this can be turned on and off with a FEATURE_DEV | ||
51 | |||
52 | fjbig2_=$(PSOBJ)zfjbig2_$(JBIG2_LIB).$(OBJ) | ||
53 | -$(PSD)jbig2.dev : $(INT_MAK) $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\ | ||
54 | - $(MAKEDIRS) | ||
55 | - $(SETMOD) $(PSD)jbig2 $(fjbig2_) | ||
56 | - $(ADDMOD) $(PSD)jbig2 -include $(GLD)sjbig2 | ||
57 | - $(ADDMOD) $(PSD)jbig2 -oper zfjbig2 | ||
58 | + | ||
59 | +$(PSD)jbig2_jbig2dec.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\ | ||
60 | + $(INT_MAK) $(MAKEDIRS) | ||
61 | + $(SETMOD) $(PSD)jbig2_jbig2dec $(fjbig2_) | ||
62 | + $(ADDMOD) $(PSD)jbig2_jbig2dec -include $(GLD)sjbig2 | ||
63 | + $(ADDMOD) $(PSD)jbig2_jbig2dec -oper zfjbig2 | ||
64 | + | ||
65 | +$(PSD)jbig2_luratech.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\ | ||
66 | + $(INT_MAK) $(MAKEDIRS) | ||
67 | + $(SETMOD) $(PSD)jbig2_luratech $(fjbig2_) | ||
68 | + $(ADDMOD) $(PSD)jbig2_luratech -include $(GLD)sjbig2 | ||
69 | + $(ADDMOD) $(PSD)jbig2_luratech -oper zfjbig2 | ||
70 | + | ||
71 | +$(PSD)jbig2_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS) | ||
72 | + $(SETMOD) $(PSD)jbig2_ | ||
73 | + | ||
74 | +$(PSD)jbig2.dev : $(PSD)jbig2_$(JBIG2_LIB).dev $(INT_MAK) $(MAKEDIRS) | ||
75 | + $(CP_) $(PSD)jbig2_$(JBIG2_LIB).dev $(PSD)jbig2.dev | ||
76 | |||
77 | $(PSOBJ)zfjbig2_jbig2dec.$(OBJ) : $(PSSRC)zfjbig2.c $(OP) $(memory__h)\ | ||
78 | $(gsstruct_h) $(gstypes_h) $(ialloc_h) $(idict_h) $(ifilter_h)\ | ||
79 | -- | ||
80 | 1.9.1 | ||
81 | |||