summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorHuang Qiyu <huangqy.fnst@cn.fujitsu.com>2016-12-13 15:05:39 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-17 09:57:03 +0000
commitbd06c3641a0c5c30302d421cf27de22effed93da (patch)
tree111a10859d1fa72a2f748183f2ac92a098ba24df /meta/recipes-extended
parent4ab468b0ab3e7fca277801329b5100e3215a9598 (diff)
downloadpoky-bd06c3641a0c5c30302d421cf27de22effed93da.tar.gz
ghostscript 9.19 -> 9.20
1)Upgrade ghostscript from 9.19 to 9.20. 2)Modify ghostscript-9.15-parallel-make.patch, since the data has been changed. (From OE-Core rev: 4f3483c3a0ba22f46d768d78d6f56880e8ac5608) (From OE-Core rev: 9133ba6b8138951f3ef798f0a1cc6f694fe71868) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch35
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.20.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.19.bb)8
2 files changed, 21 insertions, 22 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
index 797b8947cf..8fa2c4022c 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch
@@ -1,40 +1,39 @@
1From be1e1b33191afdcfe3c2ecc4ff3e361a5859e9c6 Mon Sep 17 00:00:00 2001 1From 14937d9247330065359ca0fb648c28dfa5c3b224 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Fri, 30 Jan 2015 00:40:22 -0800 3Date: Tue, 13 Dec 2016 18:16:41 +0900
4Subject: [PATCH] contrib.mak: fix for parallel build 4Subject: [PATCH] ghostscript-9.15-parallel-make
5 5
6Fixed: 6From 767bdf8a412b0cce2b734998e9b7e55abeaf932c Mon Sep 17 00:00:00 2001
7rm: cannot remove `/usr/share/ghostscript/9.15/lib': Is a directory 7From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
8Date: Tue, 13 Dec 2016 17:55:54 +0900
9Subject: [PATCH] Robert Yang <liezhi.yang@windriver.com> Date: Fri, 30 Jan
102015 00:40:22 -0800 Subject: [PATCH] contrib.mak: fix for parallel build
8 11
9Create lib before install to fix the race issue. 12Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
10
11Upstream-Status: Pending
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14--- 13---
15 contrib/contrib.mak | 2 ++ 14 contrib/contrib.mak | 2 ++
16 1 file changed, 2 insertions(+) 15 1 file changed, 2 insertions(+)
17 16
18diff --git a/contrib/contrib.mak b/contrib/contrib.mak 17diff --git a/contrib/contrib.mak b/contrib/contrib.mak
19index 08a80d1..de2e20d 100644 18index 55415b3..0b6b5ae 100644
20--- a/contrib/contrib.mak 19--- a/contrib/contrib.mak
21+++ b/contrib/contrib.mak 20+++ b/contrib/contrib.mak
22@@ -947,6 +947,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h 21@@ -1099,6 +1099,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \
23 $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c 22 $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
24 23
25 extra-dmprt-install: 24 extra-dmprt-install: install-libdata
26+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib 25+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
27 $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 26 $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
28 $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 27 $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
29 $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1 28 $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
30@@ -1088,6 +1089,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) 29@@ -1267,6 +1268,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
31 ### ----------------- Additional .upp files ---------------- ### 30 ### ----------------- Additional .upp files ---------------- ###
32 31
33 extra-upp-install: 32 extra-upp-install: install-libdata
34+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib 33+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
35 for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ 34 for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
36 $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ 35 $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
37 done 36 done
38-- 37--
391.7.9.5 382.7.4
40 39
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
index 8524591a0a..0800b4ed48 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.20.bb
@@ -11,14 +11,14 @@ HOMEPAGE = "http://www.ghostscript.com"
11SECTION = "console/utils" 11SECTION = "console/utils"
12 12
13LICENSE = "GPLv3" 13LICENSE = "GPLv3"
14LIC_FILES_CHKSUM = "file://LICENSE;md5=b17cea54743435ab2a581c237bea294a" 14LIC_FILES_CHKSUM = "file://LICENSE;md5=70dc2bac4d0ce4448da873cd86b123fc"
15 15
16DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng" 16DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng"
17DEPENDS_class-native = "libpng-native" 17DEPENDS_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 = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs919/${BPN}-${PV}.tar.gz \ 21SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/${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 \
@@ -37,8 +37,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
37 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 \
38 " 38 "
39 39
40SRC_URI[md5sum] = "c9682ce6b852f9197c69905a43928907" 40SRC_URI[md5sum] = "93c5987cd3ab341108be1ebbaadc24fe"
41SRC_URI[sha256sum] = "cf3c0dce67db1557a87366969945f9c5235887989c0b585e037af366dc035989" 41SRC_URI[sha256sum] = "949b64b46ecf8906db54a94ecf83ab97534ebf946f770d3c3f283cb469cb6e14"
42 42
43EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ 43EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
44 --with-fontpath=${datadir}/fonts \ 44 --with-fontpath=${datadir}/fonts \