mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
4ab468b0ab
commit
bd06c3641a
+17
-18
@@ -1,40 +1,39 @@
|
||||
From be1e1b33191afdcfe3c2ecc4ff3e361a5859e9c6 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Fri, 30 Jan 2015 00:40:22 -0800
|
||||
Subject: [PATCH] contrib.mak: fix for parallel build
|
||||
From 14937d9247330065359ca0fb648c28dfa5c3b224 Mon Sep 17 00:00:00 2001
|
||||
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
Date: Tue, 13 Dec 2016 18:16:41 +0900
|
||||
Subject: [PATCH] ghostscript-9.15-parallel-make
|
||||
|
||||
Fixed:
|
||||
rm: cannot remove `/usr/share/ghostscript/9.15/lib': Is a directory
|
||||
From 767bdf8a412b0cce2b734998e9b7e55abeaf932c Mon Sep 17 00:00:00 2001
|
||||
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
Date: Tue, 13 Dec 2016 17:55:54 +0900
|
||||
Subject: [PATCH] Robert Yang <liezhi.yang@windriver.com> Date: Fri, 30 Jan
|
||||
2015 00:40:22 -0800 Subject: [PATCH] contrib.mak: fix for parallel build
|
||||
|
||||
Create lib before install to fix the race issue.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
|
||||
---
|
||||
contrib/contrib.mak | 2 ++
|
||||
contrib/contrib.mak | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/contrib/contrib.mak b/contrib/contrib.mak
|
||||
index 08a80d1..de2e20d 100644
|
||||
index 55415b3..0b6b5ae 100644
|
||||
--- a/contrib/contrib.mak
|
||||
+++ b/contrib/contrib.mak
|
||||
@@ -947,6 +947,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h
|
||||
@@ -1099,6 +1099,7 @@ $(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h \
|
||||
$(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
|
||||
|
||||
extra-dmprt-install:
|
||||
extra-dmprt-install: install-libdata
|
||||
+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
|
||||
$(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
|
||||
$(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
|
||||
$(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
|
||||
@@ -1088,6 +1089,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH)
|
||||
@@ -1267,6 +1268,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \
|
||||
### ----------------- Additional .upp files ---------------- ###
|
||||
|
||||
extra-upp-install:
|
||||
extra-upp-install: install-libdata
|
||||
+ mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib
|
||||
for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
|
||||
done
|
||||
--
|
||||
1.7.9.5
|
||||
2.7.4
|
||||
|
||||
|
||||
+4
-4
@@ -11,14 +11,14 @@ HOMEPAGE = "http://www.ghostscript.com"
|
||||
SECTION = "console/utils"
|
||||
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=b17cea54743435ab2a581c237bea294a"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=70dc2bac4d0ce4448da873cd86b123fc"
|
||||
|
||||
DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng"
|
||||
DEPENDS_class-native = "libpng-native"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases"
|
||||
|
||||
SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs919/${BPN}-${PV}.tar.gz \
|
||||
SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/${BPN}-${PV}.tar.gz \
|
||||
file://ghostscript-9.15-parallel-make.patch \
|
||||
file://ghostscript-9.16-Werror-return-type.patch \
|
||||
file://png_mak.patch \
|
||||
@@ -37,8 +37,8 @@ SRC_URI_class-native = "${SRC_URI_BASE} \
|
||||
file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "c9682ce6b852f9197c69905a43928907"
|
||||
SRC_URI[sha256sum] = "cf3c0dce67db1557a87366969945f9c5235887989c0b585e037af366dc035989"
|
||||
SRC_URI[md5sum] = "93c5987cd3ab341108be1ebbaadc24fe"
|
||||
SRC_URI[sha256sum] = "949b64b46ecf8906db54a94ecf83ab97534ebf946f770d3c3f283cb469cb6e14"
|
||||
|
||||
EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
|
||||
--with-fontpath=${datadir}/fonts \
|
||||
Reference in New Issue
Block a user