summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ghostscript/files/0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch81
-rw-r--r--meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch48
-rw-r--r--meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch8
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch105
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/png_mak.patch27
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.19.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.18.bb)9
6 files changed, 78 insertions, 200 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
deleted file mode 100644
index d586a1d6df..0000000000
--- a/meta/recipes-extended/ghostscript/files/0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From 1d19998091154f89b8294e4594a05986b4c2f822 Mon Sep 17 00:00:00 2001
2From: Chris Liddell <chris.liddell@artifex.com>
3Date: Wed, 13 Jan 2016 02:08:42 -0500
4Subject: [PATCH 1/2] Bug 696497: Fix support for building with no jbig2
5 decoder
6
7Author: Chris Liddell <chris.liddell@artifex.com>
8
9Upstream-Status: Backport
10http://bugs.ghostscript.com/show_bug.cgi?id=696497
11http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=b0f5a975
12Signed-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
18diff --git a/base/lib.mak b/base/lib.mak
19index 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
45diff --git a/psi/int.mak b/psi/int.mak
46index 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--
801.9.1
81
diff --git a/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch b/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch
deleted file mode 100644
index fcfc479fbc..0000000000
--- a/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 3b43f93ec02611c4d554612953f5b64765b8683b Mon Sep 17 00:00:00 2001
2From: Chris Liddell <chris.liddell@artifex.com>
3Date: Wed, 13 Jan 2016 02:14:55 -0500
4Subject: [PATCH 2/2] Bug 696497 (part 2): fix support for building with a JPX
5 decoder
6
7Author: Chris Liddell <chris.liddell@artifex.com>
8
9Upstream-Status: Backport
10http://bugs.ghostscript.com/show_bug.cgi?id=696497
11http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=b0f5a975
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 base/lib.mak | 3 +++
15 psi/int.mak | 3 +++
16 2 files changed, 6 insertions(+)
17
18diff --git a/base/lib.mak b/base/lib.mak
19index daa7056..8853dd5 100644
20--- a/base/lib.mak
21+++ b/base/lib.mak
22@@ -1774,6 +1774,9 @@ $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
23 $(gdebug_h) $(strimpl_h) $(sjpx_h) $(MAKEDIRS)
24 $(GLJASCC) $(GLO_)sjpx.$(OBJ) $(C_) $(GLSRC)sjpx.c
25
26+$(GLD)sjpx_.dev : $(LIB_MAK) $(ECHOGS_XE) $(LIB_MAK) $(MAKEDIRS)
27+ $(SETMOD) $(GLD)sjpx_
28+
29 # luratech version
30 sjpx_luratech=$(GLOBJ)sjpx_luratech.$(OBJ)
31 $(GLD)sjpx_luratech.dev : $(LIB_MAK) $(ECHOGS_XE) \
32diff --git a/psi/int.mak b/psi/int.mak
33index f9d667d..db01b65 100644
34--- a/psi/int.mak
35+++ b/psi/int.mak
36@@ -1290,6 +1290,9 @@ $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev\
37 $(MAKEDIRS)
38 $(CP_) $(PSD)jpx_$(JPX_LIB).dev $(PSD)jpx.dev
39
40+$(PSD)jpx_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS)
41+ $(SETMOD) $(PSD)jpx_
42+
43 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ)
44
45 $(PSOBJ)zfjpx.$(OBJ) : $(PSSRC)zfjpx.c $(OP) $(memory__h)\
46--
471.9.1
48
diff --git a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
index b445a6c9e9..c3e44fe86a 100644
--- a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
+++ b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
@@ -16,17 +16,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16 1 file changed, 2 insertions(+), 2 deletions(-) 16 1 file changed, 2 insertions(+), 2 deletions(-)
17 17
18diff --git a/configure.ac b/configure.ac 18diff --git a/configure.ac b/configure.ac
19index ab30a97..b762fd7 100644 19index bf6d3f5..01df03f 100644
20--- a/configure.ac 20--- a/configure.ac
21+++ b/configure.ac 21+++ b/configure.ac
22@@ -955,11 +955,11 @@ AC_SUBST(ZLIBDIR) 22@@ -930,11 +930,11 @@ AC_SUBST(ZLIBDIR)
23 AC_SUBST(FT_SYS_ZLIB) 23 AC_SUBST(FT_SYS_ZLIB)
24 24
25 dnl png for the png output device; it also requires zlib 25 dnl png for the png output device; it also requires zlib
26-LIBPNGDIR=src 26-LIBPNGDIR=src
27+LIBPNGDIR=$srcdir/libpng 27+LIBPNGDIR=$srcdir/libpng
28 PNGDEVS='' 28 PNGDEVS=''
29 PNGDEVS_ALL='png48 png16m pnggray pngmono png256 png16 pngalpha' 29 PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha'
30 AC_MSG_CHECKING([for local png library source]) 30 AC_MSG_CHECKING([for local png library source])
31-if test -f $srcdir/libpng/pngread.c; then 31-if test -f $srcdir/libpng/pngread.c; then
32+if false; then 32+if false; then
@@ -34,5 +34,5 @@ index ab30a97..b762fd7 100644
34 SHARE_LIBPNG=0 34 SHARE_LIBPNG=0
35 LIBPNGDIR=$srcdir/libpng 35 LIBPNGDIR=$srcdir/libpng
36-- 36--
371.9.1 372.8.1
38 38
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
index bc29be5070..e709195d8c 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
@@ -1,4 +1,4 @@
1ust use commands provided by ghostscript-native, preventing recompile them when 1Just use commands provided by ghostscript-native, preventing recompile them when
2compile ghostscript. 2compile ghostscript.
3Way to enable cross compile. 3Way to enable cross compile.
4 4
@@ -7,94 +7,93 @@ Upstream-Status: Pending
7Signed-off-by: Kang Kai <kai.kang@windriver.com> 7Signed-off-by: Kang Kai <kai.kang@windriver.com>
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
9 9
10Rebase to 9.19
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 base/unix-aux.mak | 64 +++++++++++++++++++++++++++----------------------------
14 1 file changed, 32 insertions(+), 32 deletions(-)
15
10diff --git a/base/unix-aux.mak b/base/unix-aux.mak 16diff --git a/base/unix-aux.mak b/base/unix-aux.mak
11index a91fb26..c991d11 100644 17index 0110667..e2eb1a1 100644
12--- a/base/unix-aux.mak 18--- a/base/unix-aux.mak
13+++ b/base/unix-aux.mak 19+++ b/base/unix-aux.mak
14@@ -69,46 +69,46 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\ 20@@ -71,44 +71,44 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\
15 $(MAKEDIRS)
16 $(GLCC) $(GLO_)gp_sysv.$(OBJ) $(C_) $(GLSRC)gp_sysv.c
17 21
18-# -------------------------- Auxiliary programs --------------------------- # 22 # -------------------------- Auxiliary programs --------------------------- #
19- 23
20-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) 24-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
21- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) 25- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
22- 26-
23-# On the RS/6000 (at least), compiling genarch.c with gcc with -O 27+#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS)
24-# produces a buggy executable. 28+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
25-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS) 29+#
30 # On the RS/6000 (at least), compiling genarch.c with gcc with -O
31 # produces a buggy executable.
32-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
26- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) 33- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
27- 34-
28-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) 35-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
29- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) 36- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
30- 37-
31-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) 38-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
32- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) 39- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
33- 40-
34-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) 41-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
35- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) 42- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
36- 43-
37-# To get GS to use the system zlib, you remove/hide the gs/zlib directory 44+#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
38-# which means that the mkromfs build can't find the zlib source it needs.
39-# So it's split into two targets, one using the zlib source directly.....
40-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
41- $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
42- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
43-
44-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(MAKEDIRS)
45- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
46-
47-# .... and one using the zlib library linked via the command line
48-MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
49- $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
50- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
51- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
52-
53-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(MAKEDIRS)
54- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
55-
56-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
57- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
58+## -------------------------- Auxiliary programs --------------------------- #
59+#
60+#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
61+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS)
62+#
63+## On the RS/6000 (at least), compiling genarch.c with gcc with -O
64+## produces a buggy executable.
65+#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
66+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) 45+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS)
67+# 46+#
68+#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) 47+#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
69+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) 48+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS)
70+# 49+#
71+#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) 50+#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
72+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) 51+# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS)
73+# 52+#
74+#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) 53+#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS)
75+# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) 54+# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS)
76+# 55+#
77+## To get GS to use the system zlib, you remove/hide the gs/zlib directory 56 # To get GS to use the system zlib, you remove/hide the gs/zlib directory
78+## which means that the mkromfs build can't find the zlib source it needs. 57 # which means that the mkromfs build can't find the zlib source it needs.
79+## So it's split into two targets, one using the zlib source directly..... 58 # So it's split into two targets, one using the zlib source directly.....
59-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
60- $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
61- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
62-
63-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS)
64- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
65-
80+#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ 66+#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
81+# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ 67+# $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
82+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) 68+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
83+# 69+#
84+#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(MAKEDIRS) 70+#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS)
85+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) 71+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS)
86+# 72+#
87+## .... and one using the zlib library linked via the command line 73 # .... and one using the zlib library linked via the command line
74-MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
75- $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
76- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
77- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
78-
79-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS)
80- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
81-
82-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS)
83- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
88+#MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ 84+#MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \
89+# $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ 85+# $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
90+# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ 86+# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
91+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) 87+# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ)
92+# 88+#
93+#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(MAKEDIRS) 89+#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS)
94+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) 90+# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
95+# 91+#
96+#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) 92+#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS)
97+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) 93+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
98 94
99 # Query the environment to construct gconfig_.h. 95 # Query the environment to construct gconfig_.h.
100 # These are all defined conditionally (except the JasPER one), so that 96 # These are all defined conditionally (except the JasPER one), so that
97--
982.8.1
99
diff --git a/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch b/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
index da900ead3a..8b84986ef2 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/png_mak.patch
@@ -1,21 +1,32 @@
1ghostscript: add dependency for pnglibconf.h 1ghostscript: add dependency for pnglibconf.h
2 2
3When using parallel make jobs, we need to be sure that 3When using parallel make jobs, we need to be sure that
4pnglibconf.h is created before we try to reference it, 4pnglibconf.h is created before we try to reference it,
5so add a rule to png.mak. 5so add a rule to png.mak.
6 6
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
9Signed-off-by: Joe Slater <jslater@windriver.com> 9Signed-off-by: Joe Slater <jslater@windriver.com>
10 10
11Rebase to 9.19
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 base/png.mak | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/base/png.mak b/base/png.mak
18index fe5c6e2..8abb53a 100644
11--- a/base/png.mak 19--- a/base/png.mak
12+++ b/base/png.mak 20+++ b/base/png.mak
13@@ -81,6 +81,8 @@ png.config-clean : 21@@ -74,6 +74,8 @@ png.clean-not-config-clean :
14 $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt 22
15 $(CP_) $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt $(pnglibconf_h) 23 pnglibconf_h=$(PNGGENDIR)$(D)pnglibconf.h
16 24
17+$(MAKEDIRS) : $(pnglibconf_h) 25+$(MAKEDIRS) : $(pnglibconf_h)
18+ 26+
19 PDEP=$(AK) $(pnglibconf_h) $(MAKEDIRS) 27 png.config-clean :
20 28 $(RM_) $(pnglibconf_h)
21 png_1=$(PNGOBJ)png.$(OBJ) $(PNGOBJ)pngmem.$(OBJ) $(PNGOBJ)pngerror.$(OBJ) $(PNGOBJ)pngset.$(OBJ) 29 $(RM_) $(PNGGEN)lpg*.dev
30--
312.8.1
32
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.18.bb b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
index eddf18dbd8..fe2016b15a 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.18.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
@@ -18,12 +18,10 @@ DEPENDS_class-native = "libpng-native"
18 18
19UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases" 19UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases"
20 20
21SRC_URI_BASE = "http://downloads.ghostscript.com/public/old-gs-releases/ghostscript-${PV}.tar.gz \ 21SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs919/${BPN}-${PV}.tar.gz \
22 file://ghostscript-9.15-parallel-make.patch \ 22 file://ghostscript-9.15-parallel-make.patch \
23 file://ghostscript-9.16-Werror-return-type.patch \ 23 file://ghostscript-9.16-Werror-return-type.patch \
24 file://png_mak.patch \ 24 file://png_mak.patch \
25 file://0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch \
26 file://0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch \
27 file://do-not-check-local-libpng-source.patch \ 25 file://do-not-check-local-libpng-source.patch \
28" 26"
29 27
@@ -39,14 +37,13 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
39 file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ 37 file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
40 " 38 "
41 39
42SRC_URI[md5sum] = "33a47567d7a591c00a253caddd12a88a" 40SRC_URI[md5sum] = "c9682ce6b852f9197c69905a43928907"
43SRC_URI[sha256sum] = "5fc93079749a250be5404c465943850e3ed5ffbc0d5c07e10c7c5ee8afbbdb1b" 41SRC_URI[sha256sum] = "cf3c0dce67db1557a87366969945f9c5235887989c0b585e037af366dc035989"
44 42
45EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ 43EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
46 --with-fontpath=${datadir}/fonts \ 44 --with-fontpath=${datadir}/fonts \
47 --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \ 45 --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \
48 --with-cups-datadir=${datadir}/cups \ 46 --with-cups-datadir=${datadir}/cups \
49 ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--enable-little-endian', '--enable-big-endian', d)} \
50 " 47 "
51 48
52EXTRA_OECONF_append_mips = " --with-large_color_index=0" 49EXTRA_OECONF_append_mips = " --with-large_color_index=0"