summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ghostscript/files
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-06-13 05:16:27 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 08:35:02 +0100
commit16fbcbb57a160c4363b0823463b62c1d70fa0abc (patch)
tree780541b8e181fb53a3da9d4818f8893edf28afdc /meta/recipes-extended/ghostscript/files
parentc6930da838df8e1cabe2f71180e02d1f6ecc15a6 (diff)
downloadpoky-16fbcbb57a160c4363b0823463b62c1d70fa0abc.tar.gz
ghostscript: upgrade to 9.19
- Ghostscript and GhostPDL releases from version 9.19 have been moved to GitHub hosting, tweak download site - Drop 0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch, and 0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch, ghostscript 9.19 has fixed them. - Fix QA Warning unrecognised options: --enable-little-endian. It use AC_C_BIGENDIAN to detect big/little endian. http://www.delorie.com/gnu/docs/autoconf/autoconf_64.html (From OE-Core rev: 227ca0a373b5a93602a419296ff1da1a96615ba2) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ghostscript/files')
-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
3 files changed, 4 insertions, 133 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