diff options
Diffstat (limited to 'meta/recipes-extended/ghostscript')
10 files changed, 80 insertions, 447 deletions
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 deleted file mode 100644 index a9afb9948c..0000000000 --- a/meta/recipes-extended/ghostscript/files/do-not-check-local-libpng-source.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 2adaa7366064a8f18af864eda74e52877a89620c Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Mon, 18 Jan 2016 01:00:30 -0500 | ||
4 | Subject: [PATCH] configure.ac: do not check local png source | ||
5 | |||
6 | In oe-core, it did not need to compile local libpng | ||
7 | source in ghostscript, so do not check local png | ||
8 | source, and directly check the existance of shared | ||
9 | libpng library. | ||
10 | |||
11 | Upstream-Status: Inappropriate [OE-Core specific] | ||
12 | |||
13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
14 | |||
15 | --- | ||
16 | configure.ac | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 698abd3..e65ac8b 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -1241,7 +1241,7 @@ else | ||
24 | PNGDEVS='' | ||
25 | PNGDEVS_ALL='png48 png16m pnggray pngmono pngmonod png256 png16 pngalpha' | ||
26 | AC_MSG_CHECKING([for local png library source]) | ||
27 | - if test -f $srcdir/libpng/pngread.c; then | ||
28 | + if false; then | ||
29 | AC_MSG_RESULT([yes]) | ||
30 | SHARE_LIBPNG=0 | ||
31 | LIBPNGDIR=$srcdir/libpng | ||
diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch index e8cb16c36b..67f14bd368 100644 --- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch +++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch | |||
@@ -1,12 +1,11 @@ | |||
1 | From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001 | 1 | From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
3 | Date: Thu, 29 Mar 2018 16:02:05 +0800 | 3 | Date: Thu, 29 Mar 2018 16:02:05 +0800 |
4 | Subject: [PATCH 04/10] avoid host contamination | 4 | Subject: [PATCH] avoid host contamination |
5 | 5 | ||
6 | Remove hardcode path refer to host to avoid host contamination. | 6 | Remove hardcode path refer to host to avoid host contamination. |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [embedded specific] | 8 | Upstream-Status: Pending |
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 9 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
11 | 10 | ||
12 | Rebase to 9.23 | 11 | Rebase to 9.23 |
@@ -16,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 16 | ||
18 | diff --git a/devices/devs.mak b/devices/devs.mak | 17 | diff --git a/devices/devs.mak b/devices/devs.mak |
19 | index 846aa50..9570182 100644 | 18 | index 186f704..88ab8c9 100644 |
20 | --- a/devices/devs.mak | 19 | --- a/devices/devs.mak |
21 | +++ b/devices/devs.mak | 20 | +++ b/devices/devs.mak |
22 | @@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ | 21 | @@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ |
23 | ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT | 22 | ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT |
24 | 23 | ||
25 | $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) | 24 | $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) |
@@ -28,6 +27,3 @@ index 846aa50..9570182 100644 | |||
28 | 27 | ||
29 | ###### --------------- Memory-buffered printer devices --------------- ###### | 28 | ###### --------------- Memory-buffered printer devices --------------- ###### |
30 | 29 | ||
31 | -- | ||
32 | 1.8.3.1 | ||
33 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch b/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch deleted file mode 100644 index 7d80066a80..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 9ca6f795409b988d38dd98bc2a6ecb68a9392312 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 29 Mar 2018 16:37:40 +0800 | ||
4 | Subject: [PATCH 10/10] base/genht.c: add a preprocessor define to allow fopen | ||
5 | calling | ||
6 | |||
7 | The commit in upstream: | ||
8 | http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=773c69e46e70bdd5482676437dafd2ca83397643 | ||
9 | |||
10 | Replace all fopen calls with gp_fopen and add a preprocessor define so | ||
11 | that any unintential calls directly to fopen will cause an error. | ||
12 | |||
13 | Only exceptions are those in the platform specific code, and mkromfs.c. | ||
14 | This patch add a preprocessor define to allow fopen calling in | ||
15 | base/genht.c. | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Rebase to 9.23 | ||
20 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
21 | --- | ||
22 | base/genht.c | 4 ++++ | ||
23 | 1 file changed, 4 insertions(+) | ||
24 | |||
25 | diff --git a/base/genht.c b/base/genht.c | ||
26 | index e597e72..e96bfb5 100644 | ||
27 | --- a/base/genht.c | ||
28 | +++ b/base/genht.c | ||
29 | @@ -16,6 +16,10 @@ | ||
30 | |||
31 | /* Generate C code for compiling halftones into ROM. */ | ||
32 | #include "malloc_.h" | ||
33 | + | ||
34 | +/* prevent gp.h from defining fopen */ | ||
35 | +#define fopen fopen | ||
36 | + | ||
37 | #include "stdio_.h" | ||
38 | #include "string_.h" | ||
39 | #include "gscdefs.h" | ||
40 | -- | ||
41 | 1.8.3.1 | ||
42 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch b/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch deleted file mode 100644 index 4c9bb22fa2..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/cups-no-gcrypt.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 9129eb7fa9dc160d64a7d9df9279a3b1dae4d793 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Thu, 29 Mar 2018 16:16:18 +0800 | ||
4 | Subject: [PATCH 08/10] cups no gcrypt | ||
5 | |||
6 | Don't build-depend on libgcrypt, as nothing is used from it | ||
7 | |||
8 | Backported from | ||
9 | http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch | ||
10 | |||
11 | This addresses the cryto dependency seen during build. | ||
12 | |||
13 | Upstream-Status: Backport | ||
14 | |||
15 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
16 | |||
17 | Rebase to 9.23 | ||
18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
19 | --- | ||
20 | cups/libs/cups/http-private.h | 1 - | ||
21 | 1 file changed, 1 deletion(-) | ||
22 | |||
23 | diff --git a/cups/libs/cups/http-private.h b/cups/libs/cups/http-private.h | ||
24 | index 99a85c3..a674852 100644 | ||
25 | --- a/cups/libs/cups/http-private.h | ||
26 | +++ b/cups/libs/cups/http-private.h | ||
27 | @@ -80,7 +80,6 @@ typedef int socklen_t; | ||
28 | # elif defined HAVE_GNUTLS | ||
29 | # include <gnutls/gnutls.h> | ||
30 | # include <gnutls/x509.h> | ||
31 | -# include <gcrypt.h> | ||
32 | # elif defined(HAVE_CDSASSL) | ||
33 | # include <CoreFoundation/CoreFoundation.h> | ||
34 | # include <Security/Security.h> | ||
35 | -- | ||
36 | 1.8.3.1 | ||
37 | |||
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 deleted file mode 100644 index 5b57da2a97..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.15-parallel-make.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 04a86a613e0f9bfbbad99874f72217f75e8c53a3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 29 Mar 2018 15:59:05 +0800 | ||
4 | Subject: [PATCH] contrib.mak: fix for parallel build | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
9 | |||
10 | Rebase to 9.23 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
12 | |||
13 | --- | ||
14 | contrib/contrib.mak | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/contrib/contrib.mak b/contrib/contrib.mak | ||
18 | index 2edee7a..c9100e8 100644 | ||
19 | --- a/contrib/contrib.mak | ||
20 | +++ b/contrib/contrib.mak | ||
21 | @@ -1241,6 +1241,7 @@ $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ | ||
22 | ### ----------------- Additional .upp files ---------------- ### | ||
23 | |||
24 | extra-upp-install: install-libdata | ||
25 | + mkdir -p $(DESTDIR)$(gsdatadir)$(D)lib | ||
26 | for f in $(CONTRIBSRC)uniprint$(D)*.upp; do \ | ||
27 | $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \ | ||
28 | done | ||
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch deleted file mode 100644 index a382c7f891..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-native-fix-disable-system-libtiff.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 0124b1c29b9cfe46d73ae82ce023dd7c5b055744 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 29 Mar 2018 16:36:12 +0800 | ||
4 | Subject: [PATCH 09/10] ghostscript-native:fix disable-system-libtiff | ||
5 | |||
6 | Modify configure to add the check to make sure | ||
7 | ghostscrip could work while system-libtiff is | ||
8 | disabled. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
13 | |||
14 | Rebase to ghostscript 9.25. | ||
15 | |||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
17 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | ||
18 | --- | ||
19 | configure.ac | 5 +++++ | ||
20 | 1 file changed, 5 insertions(+) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 80a60b1..f3e9efb 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -1319,6 +1319,7 @@ AC_TRY_COMPILE([], [return 0;], | ||
27 | CFLAGS=$CGLAGS_STORE | ||
28 | |||
29 | if test x"$SHARE_LIBTIFF" = x"0" ; then | ||
30 | + if test -e $LIBTIFFDIR/configure; then | ||
31 | echo "Running libtiff configure script..." | ||
32 | olddir=`pwd` | ||
33 | if ! test -d "$LIBTIFFCONFDIR" ; then | ||
34 | @@ -1337,6 +1338,10 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then | ||
35 | |||
36 | echo | ||
37 | echo "Continuing with Ghostscript configuration..." | ||
38 | + else | ||
39 | + AC_MSG_NOTICE([Could not find local copy of libtiff. | ||
40 | +Disabling tiff output devices.]) | ||
41 | + fi | ||
42 | fi | ||
43 | |||
44 | AC_SUBST(SHARE_LIBTIFF) | ||
45 | -- | ||
46 | 1.8.3.1 | ||
47 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch deleted file mode 100644 index c76915fb81..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.21-prevent_recompiling.patch +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | From 239d681306a8d97ed10954788d32ba2f4b55f77c Mon Sep 17 00:00:00 2001 | ||
2 | From: Kang Kai <kai.kang@windriver.com> | ||
3 | Date: Thu, 29 Mar 2018 16:10:16 +0800 | ||
4 | Subject: [PATCH 06/10] prevent recompiling | ||
5 | |||
6 | Just use commands provided by ghostscript-native, preventing recompile | ||
7 | them when compile ghostscript. Way to enable cross compile. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | ||
12 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
13 | |||
14 | Rebase to 9.25 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | ||
17 | --- | ||
18 | base/unix-aux.mak | 44 -------------------------------------------- | ||
19 | 1 file changed, 44 deletions(-) | ||
20 | |||
21 | diff --git a/base/unix-aux.mak b/base/unix-aux.mak | ||
22 | index 5bf72e9..9cb39d7 100644 | ||
23 | --- a/base/unix-aux.mak | ||
24 | +++ b/base/unix-aux.mak | ||
25 | @@ -54,50 +54,6 @@ $(AUX)gp_stdia.$(OBJ): $(GLSRC)gp_stdia. | ||
26 | $(stdio__h) $(time__h) $(unistd__h) $(gx_h) $(gp_h) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
27 | $(GLCCAUX) $(AUXO_)gp_stdia.$(OBJ) $(C_) $(GLSRC)gp_stdia.c | ||
28 | |||
29 | -# -------------------------- Auxiliary programs --------------------------- # | ||
30 | - | ||
31 | -$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
32 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c $(AUXEXTRALIBS) | ||
33 | - | ||
34 | -$(PACKPS_XE): $(GLSRC)pack_ps.c $(stdpre_h) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
35 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(PACKPS_XE) $(GLSRC)pack_ps.c $(AUXEXTRALIBS) | ||
36 | - | ||
37 | -# On the RS/6000 (at least), compiling genarch.c with gcc with -O | ||
38 | -# produces a buggy executable. | ||
39 | -$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
40 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(AUXEXTRALIBS) | ||
41 | - | ||
42 | -$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
43 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(AUXEXTRALIBS) | ||
44 | - | ||
45 | -$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
46 | - $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(AUXEXTRALIBS) | ||
47 | - | ||
48 | -$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
49 | - $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c $(AUXEXTRALIBS) | ||
50 | - | ||
51 | -# To get GS to use the system zlib, you remove/hide the gs/zlib directory | ||
52 | -# which means that the mkromfs build can't find the zlib source it needs. | ||
53 | -# So it's split into two targets, one using the zlib source directly..... | ||
54 | -MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | ||
55 | - $(AUX)gscdefs.$(OBJ) $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
56 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) | ||
57 | - | ||
58 | -$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
59 | - $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) $(AUXEXTRALIBS) | ||
60 | - | ||
61 | -# .... and one using the zlib library linked via the command line | ||
62 | -MKROMFS_OBJS_1=$(AUX)gscdefs.$(OBJ) \ | ||
63 | - $(AUX)gpmisc.$(OBJ) $(AUX)gp_getnv.$(OBJ) \ | ||
64 | - $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \ | ||
65 | - $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) | ||
66 | - | ||
67 | -$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
68 | - $(CCAUX_) $(GENOPTAUX) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS) | ||
69 | - | ||
70 | -$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(UNIX_AUX_MAK) $(MAKEDIRS) | ||
71 | - $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) | ||
72 | - | ||
73 | # Query the environment to construct gconfig_.h. | ||
74 | # These are all defined conditionally (except the JasPER one), so that | ||
75 | # they can be overridden by settings from the configure script. | ||
76 | -- | ||
77 | 1.8.3.1 | ||
78 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch b/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch deleted file mode 100644 index 3e6d3e3c48..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/mkdir-p.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 2b23026f8e2a352417fb1c4da94bf69b19bef267 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Thu, 29 Mar 2018 16:04:32 +0800 | ||
4 | Subject: [PATCH 05/10] ghostscript: allow directories to be created more than | ||
5 | once | ||
6 | |||
7 | When doing parallel builds, we might try to create directories | ||
8 | more than once. This should not cause an error. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
13 | |||
14 | Rebase to 9.23 | ||
15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
16 | --- | ||
17 | base/unix-end.mak | 17 ++++++++--------- | ||
18 | 1 file changed, 8 insertions(+), 9 deletions(-) | ||
19 | |||
20 | diff --git a/base/unix-end.mak b/base/unix-end.mak | ||
21 | index 9ce599a..feff5a6 100644 | ||
22 | --- a/base/unix-end.mak | ||
23 | +++ b/base/unix-end.mak | ||
24 | @@ -17,15 +17,14 @@ | ||
25 | UNIX_END_MAK=$(GLSRC)unix-end.mak $(TOP_MAKEFILES) | ||
26 | # Define the rule for building standard configurations. | ||
27 | directories: $(UNIX_END_MAK) | ||
28 | - @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir $(BINDIR); fi | ||
29 | - @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir $(GLGENDIR); fi | ||
30 | - @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir $(GLOBJDIR); fi | ||
31 | - @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir $(DEVGENDIR); fi | ||
32 | - @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir $(DEVOBJDIR); fi | ||
33 | - @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir $(AUXDIR); fi | ||
34 | - @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR); then mkdir $(PSGENDIR); fi | ||
35 | - @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir $(PSGENDIR)/cups; fi | ||
36 | - @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir $(PSOBJDIR); fi | ||
37 | + @if test "$(BINDIR)" != "" -a ! -d $(BINDIR); then mkdir -p $(BINDIR); fi | ||
38 | + @if test "$(GLGENDIR)" != "" -a ! -d $(GLGENDIR); then mkdir -p $(GLGENDIR); fi | ||
39 | + @if test "$(GLOBJDIR)" != "" -a ! -d $(GLOBJDIR); then mkdir -p $(GLOBJDIR); fi | ||
40 | + @if test "$(DEVGENDIR)" != "" -a ! -d $(DEVGENDIR); then mkdir -p $(DEVGENDIR); fi | ||
41 | + @if test "$(DEVOBJDIR)" != "" -a ! -d $(DEVOBJDIR); then mkdir -p $(DEVOBJDIR); fi | ||
42 | + @if test "$(AUXDIR)" != "" -a ! -d $(AUXDIR); then mkdir -p $(AUXDIR); fi | ||
43 | + @if test "$(PSGENDIR)" != "" -a ! -d $(PSGENDIR)/cups; then mkdir -p $(PSGENDIR)/cups; fi | ||
44 | + @if test "$(PSOBJDIR)" != "" -a ! -d $(PSOBJDIR); then mkdir -p $(PSOBJDIR); fi | ||
45 | |||
46 | |||
47 | gs: .gssubtarget $(UNIX_END_MAK) | ||
48 | -- | ||
49 | 1.8.3.1 | ||
50 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb new file mode 100644 index 0000000000..ff7d38676e --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb | |||
@@ -0,0 +1,75 @@ | |||
1 | SUMMARY = "The GPL Ghostscript PostScript/PDF interpreter" | ||
2 | DESCRIPTION = "Ghostscript is used for PostScript/PDF preview and printing. Usually as \ | ||
3 | a back-end to a program such as ghostview, it can display PostScript and PDF \ | ||
4 | documents in an X11 environment. \ | ||
5 | \ | ||
6 | Furthermore, it can render PostScript and PDF files as graphics to be printed \ | ||
7 | on non-PostScript printers. Supported printers include common \ | ||
8 | dot-matrix, inkjet and laser models. \ | ||
9 | " | ||
10 | HOMEPAGE = "http://www.ghostscript.com" | ||
11 | SECTION = "console/utils" | ||
12 | |||
13 | LICENSE = "AGPL-3.0-or-later" | ||
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f98ffa763e50cded76f49bce73aade16" | ||
15 | |||
16 | DEPENDS = "tiff jpeg fontconfig cups libpng freetype zlib" | ||
17 | |||
18 | UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases" | ||
19 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | ||
20 | |||
21 | def gs_verdir(v): | ||
22 | return "".join(v.split(".")) | ||
23 | |||
24 | |||
25 | SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ | ||
26 | file://ghostscript-9.16-Werror-return-type.patch \ | ||
27 | file://avoid-host-contamination.patch \ | ||
28 | " | ||
29 | |||
30 | SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59" | ||
31 | |||
32 | PACKAGECONFIG ??= "" | ||
33 | PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" | ||
34 | PACKAGECONFIG[libidn] = "--with-libidn,--without-libidn,libidn" | ||
35 | PACKAGECONFIG[libpaper] = "--with-libpaper,--without-libpaper,libpaper" | ||
36 | PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}, \ | ||
37 | --without-x, virtual/libx11 libxext libxt" | ||
38 | |||
39 | EXTRA_OECONF = "--with-jbig2dec \ | ||
40 | --with-fontpath=${datadir}/fonts \ | ||
41 | CUPSCONFIG="${STAGING_BINDIR_CROSS}/cups-config" \ | ||
42 | PKGCONFIG=pkg-config \ | ||
43 | " | ||
44 | |||
45 | EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0" | ||
46 | |||
47 | EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}" | ||
48 | EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}" | ||
49 | |||
50 | # Uses autoconf but not automake, can't do out-of-tree | ||
51 | inherit autotools-brokensep pkgconfig | ||
52 | |||
53 | # Prune the source tree of libraries that we're using our packaging of, so that | ||
54 | # ghostscript can't link to them. Can't prune zlib as that's needed for the | ||
55 | # native tools. | ||
56 | prune_sources() { | ||
57 | rm -rf ${S}/jpeg/ ${S}/libpng/ ${S}/tiff/ ${S}/expat/ ${S}/freetype/ ${S}/cups/lib | ||
58 | } | ||
59 | do_unpack[postfuncs] += "prune_sources" | ||
60 | |||
61 | do_install:append () { | ||
62 | oe_runmake DESTDIR=${D} install-so | ||
63 | oe_runmake DESTDIR=${D} install-data | ||
64 | cp -r ${S}/Resource ${D}${datadir}/ghostscript/${PV}/ | ||
65 | cp -r ${S}/iccprofiles ${D}${datadir}/ghostscript/${PV}/ | ||
66 | } | ||
67 | |||
68 | # ghostscript does not supports "arc" | ||
69 | COMPATIBLE_HOST = "^(?!arc).*" | ||
70 | |||
71 | # some entries in NVD uses gpl_ghostscript | ||
72 | CVE_PRODUCT = "ghostscript gpl_ghostscript" | ||
73 | |||
74 | CVE_STATUS[CVE-2023-38560] = "not-applicable-config: PCL isn't part of the Ghostscript release" | ||
75 | CVE_STATUS[CVE-2023-38559] = "cpe-incorrect: Issue only appears in versions before 10.02.0" | ||
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb b/meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb deleted file mode 100644 index cbf60c8c85..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript_9.53.3.bb +++ /dev/null | |||
@@ -1,125 +0,0 @@ | |||
1 | SUMMARY = "The GPL Ghostscript PostScript/PDF interpreter" | ||
2 | DESCRIPTION = "Ghostscript is used for PostScript/PDF preview and printing. Usually as \ | ||
3 | a back-end to a program such as ghostview, it can display PostScript and PDF \ | ||
4 | documents in an X11 environment. \ | ||
5 | \ | ||
6 | Furthermore, it can render PostScript and PDF files as graphics to be printed \ | ||
7 | on non-PostScript printers. Supported printers include common \ | ||
8 | dot-matrix, inkjet and laser models. \ | ||
9 | " | ||
10 | HOMEPAGE = "http://www.ghostscript.com" | ||
11 | SECTION = "console/utils" | ||
12 | |||
13 | LICENSE = "GPLv3" | ||
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=70dc2bac4d0ce4448da873cd86b123fc" | ||
15 | |||
16 | DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng" | ||
17 | DEPENDS_class-native = "libpng-native" | ||
18 | |||
19 | UPSTREAM_CHECK_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases" | ||
20 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | ||
21 | |||
22 | def gs_verdir(v): | ||
23 | return "".join(v.split(".")) | ||
24 | |||
25 | |||
26 | SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ | ||
27 | file://ghostscript-9.15-parallel-make.patch \ | ||
28 | file://ghostscript-9.16-Werror-return-type.patch \ | ||
29 | file://do-not-check-local-libpng-source.patch \ | ||
30 | file://avoid-host-contamination.patch \ | ||
31 | file://mkdir-p.patch \ | ||
32 | " | ||
33 | |||
34 | SRC_URI = "${SRC_URI_BASE} \ | ||
35 | file://ghostscript-9.21-prevent_recompiling.patch \ | ||
36 | file://cups-no-gcrypt.patch \ | ||
37 | " | ||
38 | |||
39 | SRC_URI_class-native = "${SRC_URI_BASE} \ | ||
40 | file://ghostscript-9.21-native-fix-disable-system-libtiff.patch \ | ||
41 | file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \ | ||
42 | " | ||
43 | |||
44 | SRC_URI[sha256sum] = "6eaf422f26a81854a230b80fd18aaef7e8d94d661485bd2e97e695b9dce7bf7f" | ||
45 | |||
46 | # Put something like | ||
47 | # | ||
48 | # PACKAGECONFIG_append_pn-ghostscript = " x11" | ||
49 | # | ||
50 | # in local.conf to enable building with X11. Be careful. The order | ||
51 | # of the overrides matters! | ||
52 | # | ||
53 | #PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" | ||
54 | PACKAGECONFIG_class-native = "" | ||
55 | |||
56 | PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}, \ | ||
57 | --without-x, virtual/libx11 libxext libxt gtk+3\ | ||
58 | " | ||
59 | |||
60 | EXTRA_OECONF = "--without-libpaper --with-system-libtiff --without-jbig2dec \ | ||
61 | --with-fontpath=${datadir}/fonts \ | ||
62 | --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \ | ||
63 | --with-cups-datadir=${datadir}/cups \ | ||
64 | CUPSCONFIG="${STAGING_BINDIR_CROSS}/cups-config" \ | ||
65 | " | ||
66 | |||
67 | EXTRA_OECONF_append_mipsarcho32 = " --with-large_color_index=0" | ||
68 | |||
69 | # Explicity disable libtiff, fontconfig, | ||
70 | # freetype, cups for ghostscript-native | ||
71 | EXTRA_OECONF_class-native = "--without-x --with-system-libtiff=no \ | ||
72 | --without-jbig2dec --without-libpaper \ | ||
73 | --with-fontpath=${datadir}/fonts \ | ||
74 | --without-libidn --disable-fontconfig \ | ||
75 | --enable-freetype --disable-cups " | ||
76 | |||
77 | # This has been fixed upstream but for now we need to subvert the check for time.h | ||
78 | # http://bugs.ghostscript.com/show_bug.cgi?id=692443 | ||
79 | # http://bugs.ghostscript.com/show_bug.cgi?id=692426 | ||
80 | CFLAGS += "-DHAVE_SYS_TIME_H=1" | ||
81 | BUILD_CFLAGS += "-DHAVE_SYS_TIME_H=1" | ||
82 | |||
83 | inherit autotools-brokensep | ||
84 | |||
85 | do_configure_prepend_class-target () { | ||
86 | rm -rf ${S}/jpeg/ | ||
87 | } | ||
88 | |||
89 | do_configure_append () { | ||
90 | # copy tools from the native ghostscript build | ||
91 | if [ "${PN}" != "ghostscript-native" ]; then | ||
92 | mkdir -p obj/aux soobj | ||
93 | for i in genarch genconf mkromfs echogs gendev genht packps; do | ||
94 | cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i | ||
95 | done | ||
96 | fi | ||
97 | } | ||
98 | |||
99 | do_install_append () { | ||
100 | mkdir -p ${D}${datadir}/ghostscript/${PV}/ | ||
101 | cp -r ${S}/Resource ${D}${datadir}/ghostscript/${PV}/ | ||
102 | cp -r ${S}/iccprofiles ${D}${datadir}/ghostscript/${PV}/ | ||
103 | } | ||
104 | |||
105 | do_compile_class-native () { | ||
106 | mkdir -p obj | ||
107 | for i in genarch genconf mkromfs echogs gendev genht packps; do | ||
108 | oe_runmake obj/aux/$i | ||
109 | done | ||
110 | } | ||
111 | |||
112 | do_install_class-native () { | ||
113 | install -d ${D}${bindir}/ghostscript-${PV} | ||
114 | for i in genarch genconf mkromfs echogs gendev genht packps; do | ||
115 | install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i | ||
116 | done | ||
117 | } | ||
118 | |||
119 | BBCLASSEXTEND = "native" | ||
120 | |||
121 | # ghostscript does not supports "arc" | ||
122 | COMPATIBLE_HOST = "^(?!arc).*" | ||
123 | |||
124 | # some entries in NVD uses gpl_ghostscript | ||
125 | CVE_PRODUCT = "ghostscript gpl_ghostscript" | ||