summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2016-02-29 19:41:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 16:58:12 +0000
commitee8ff4263476f2f5c45c08b212e0e7423e6abedf (patch)
treeda96eda24a596dca6255ac8b61542e96ee842f01 /meta
parent3f5725c8458e31a2403ba643a5de0ada42f7e277 (diff)
downloadpoky-ee8ff4263476f2f5c45c08b212e0e7423e6abedf.tar.gz
ghostscript: 9.16 -> 9.18
- Backport patches to fix build failure caused by '--without-jbig2dec' and '--without-jbig2dec'. ... |make[1]: *** No rule to make target `obj/sjbig2_.dev', needed by `obj/sjbig2.dev'. Stop. ... http://bugs.ghostscript.com/show_bug.cgi?id=696497 - Previously, it did not build the whole local libpng source in ghostscript, only picked up specific files and compile them. But on ghostscript 9.18, when the arm's FPU has been set to NEON (-mfpu=neon * with GCC), the selected file "libpng/pngrutil.c" needs to link 'png_init_filter_functions_neon' which should be compiled by a non-selected file "libpng/arm/arm_init.c". ... |./obj/pngrutil.o: In function `png_init_filter_functions': |armv7a-neon-poky-linux-gnueabi/ghostscript/9.18-r0/build/../ ghostscript-9.18/libpng/pngrutil.c:3921: undefined reference to `png_init_filter_functions_neon' ... So do not compile local libpng source in ghostscript, use shared libpng to instead. (From OE-Core rev: c7da39c43fc20e634c45212151400c663b39399a) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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.patch38
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.18.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.16.bb)11
4 files changed, 174 insertions, 4 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 @@
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
new file mode 100644
index 0000000000..fcfc479fbc
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/files/0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch
@@ -0,0 +1,48 @@
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
new file mode 100644
index 0000000000..b445a6c9e9
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch
@@ -0,0 +1,38 @@
1From 5ef8b85bc98f3bd9a15d5f47e24d3e23ae27c265 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 18 Jan 2016 01:00:30 -0500
4Subject: [PATCH] configure.ac: do not check local png source
5
6In oe-core, it did not need to compile local libpng
7source in ghostscript, so do not check local png
8source, and directly check the existance of shared
9libpng library.
10
11Upstream-Status: Inappropriate [OE-Core specific]
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 configure.ac | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index ab30a97..b762fd7 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -955,11 +955,11 @@ AC_SUBST(ZLIBDIR)
23 AC_SUBST(FT_SYS_ZLIB)
24
25 dnl png for the png output device; it also requires zlib
26-LIBPNGDIR=src
27+LIBPNGDIR=$srcdir/libpng
28 PNGDEVS=''
29 PNGDEVS_ALL='png48 png16m pnggray pngmono png256 png16 pngalpha'
30 AC_MSG_CHECKING([for local png library source])
31-if test -f $srcdir/libpng/pngread.c; then
32+if false; then
33 AC_MSG_RESULT([yes])
34 SHARE_LIBPNG=0
35 LIBPNGDIR=$srcdir/libpng
36--
371.9.1
38
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.16.bb b/meta/recipes-extended/ghostscript/ghostscript_9.18.bb
index d584c49b07..d4222c773d 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.16.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.18.bb
@@ -13,13 +13,16 @@ SECTION = "console/utils"
13LICENSE = "GPLv3" 13LICENSE = "GPLv3"
14LIC_FILES_CHKSUM = "file://LICENSE;md5=b17cea54743435ab2a581c237bea294a" 14LIC_FILES_CHKSUM = "file://LICENSE;md5=b17cea54743435ab2a581c237bea294a"
15 15
16DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" 16DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng"
17DEPENDS_class-native = "" 17DEPENDS_class-native = "libpng-native"
18 18
19SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz \ 19SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz \
20 file://ghostscript-9.15-parallel-make.patch \ 20 file://ghostscript-9.15-parallel-make.patch \
21 file://ghostscript-9.16-Werror-return-type.patch \ 21 file://ghostscript-9.16-Werror-return-type.patch \
22 file://png_mak.patch \ 22 file://png_mak.patch \
23 file://0001-Bug-696497-Fix-support-for-building-with-no-jbig2-de.patch \
24 file://0002-Bug-696497-part-2-fix-support-for-building-with-a-JP.patch \
25 file://do-not-check-local-libpng-source.patch \
23" 26"
24 27
25SRC_URI = "${SRC_URI_BASE} \ 28SRC_URI = "${SRC_URI_BASE} \
@@ -34,8 +37,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
34 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 \
35 " 38 "
36 39
37SRC_URI[md5sum] = "829319325bbdb83f5c81379a8f86f38f" 40SRC_URI[md5sum] = "33a47567d7a591c00a253caddd12a88a"
38SRC_URI[sha256sum] = "746d77280cca8afdd3d4c2c1389e332ed9b0605bd107bcaae1d761b061d1a68d" 41SRC_URI[sha256sum] = "5fc93079749a250be5404c465943850e3ed5ffbc0d5c07e10c7c5ee8afbbdb1b"
39 42
40EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ 43EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
41 --with-fontpath=${datadir}/fonts \ 44 --with-fontpath=${datadir}/fonts \