summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch36
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch144
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch44
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch45
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.14.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_9.07.bb)42
5 files changed, 132 insertions, 179 deletions
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
new file mode 100644
index 0000000000..d97d4ecd7d
--- /dev/null
+++ b/meta/recipes-extended/ghostscript/ghostscript/base-genht.c-add-a-preprocessor-define-to-allow-fope.patch
@@ -0,0 +1,36 @@
1base/genht.c: add a preprocessor define to allow fopen calling
2
3The commit in upstream:
4http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=773c69e46e70bdd5482676437dafd2ca83397643
5
6Replace all fopen calls with gp_fopen and add a preprocessor define so
7that any unintential calls directly to fopen will cause an error.
8
9Only exceptions are those in the platform specific code, and mkromfs.c.
10This patch add a preprocessor define to allow fopen calling in base/genht.c.
11
12Upstream-Status: Pending
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 base/genht.c | 4 ++++
17 1 file changed, 4 insertions(+)
18
19diff --git a/base/genht.c b/base/genht.c
20index 4b04085..cc82fff 100644
21--- a/base/genht.c
22+++ b/base/genht.c
23@@ -16,6 +16,10 @@
24
25 /* Generate C code for compiling halftones into ROM. */
26 #include "malloc_.h"
27+
28+/* prevent gp.h from defining fopen */
29+#define fopen fopen
30+
31 #include "stdio_.h"
32 #include "string_.h"
33 #include "gscdefs.h"
34--
351.8.1.2
36
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
index ec373078d3..601f5f127e 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-parallel-make.patch
@@ -10,6 +10,8 @@ RP: Extended || true to all CP_ operations, they all can race e.g.:
10| cp -f ./obj/gconfxx.h ./obj/gconfig.h 10| cp -f ./obj/gconfxx.h ./obj/gconfig.h
11| cp: cannot create regular file `./obj/gconfig.h': File exists 11| cp: cannot create regular file `./obj/gconfig.h': File exists
12 12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14
13diff --git a/base/expat.mak b/base/expat.mak 15diff --git a/base/expat.mak b/base/expat.mak
14index 4ee9c8c..2e16a9d 100644 16index 4ee9c8c..2e16a9d 100644
15--- a/base/expat.mak 17--- a/base/expat.mak
@@ -37,7 +39,7 @@ index 16f2b95..409f75b 100644
37 # Define the shared version. 39 # Define the shared version.
38 $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE) 40 $(FTGEN)freetype_1.dev : $(TOP_MAKEFILES) $(FT_MAK) $(ECHOGS_XE)
39diff --git a/base/gs.mak b/base/gs.mak 41diff --git a/base/gs.mak b/base/gs.mak
40index b804a3e..a343190 100644 42index 7d75fb0..2a9596c 100644
41--- a/base/gs.mak 43--- a/base/gs.mak
42+++ b/base/gs.mak 44+++ b/base/gs.mak
43@@ -433,7 +433,7 @@ $(gconfxx_h) : $(ld_tr) 45@@ -433,7 +433,7 @@ $(gconfxx_h) : $(ld_tr)
@@ -408,7 +410,7 @@ index 0f09a3a..36495dd 100644
408 # Define the compiled in target 410 # Define the compiled in target
409 $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs) 411 $(JPEGXR_GEN)jpegxr_0.dev : $(JPEGXR_MAK) $(ECHOGS_XE) $(jpegxr_objs)
410diff --git a/base/lcms.mak b/base/lcms.mak 412diff --git a/base/lcms.mak b/base/lcms.mak
411index dc7f9e5..2bccacd 100644 413index 18cfa09..269e7ff 100644
412--- a/base/lcms.mak 414--- a/base/lcms.mak
413+++ b/base/lcms.mak 415+++ b/base/lcms.mak
414@@ -84,7 +84,7 @@ LCMSO_=$(O_)$(LCMSOBJ) 416@@ -84,7 +84,7 @@ LCMSO_=$(O_)$(LCMSOBJ)
@@ -421,7 +423,7 @@ index dc7f9e5..2bccacd 100644
421 # dev file for shared (separately built) lcms library 423 # dev file for shared (separately built) lcms library
422 $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE) 424 $(LCMSGEN)lcms_1.dev : $(TOP_MAKEFILES) $(LCMS_MAK) $(ECHOGS_XE)
423diff --git a/base/lcms2.mak b/base/lcms2.mak 425diff --git a/base/lcms2.mak b/base/lcms2.mak
424index 4e25f2e..be29d06 100644 426index 52f750c..33a9c16 100644
425--- a/base/lcms2.mak 427--- a/base/lcms2.mak
426+++ b/base/lcms2.mak 428+++ b/base/lcms2.mak
427@@ -85,7 +85,7 @@ LCMS2O_=$(O_)$(LCMS2OBJ) 429@@ -85,7 +85,7 @@ LCMS2O_=$(O_)$(LCMS2OBJ)
@@ -481,7 +483,7 @@ index 0bfb3ac..fcdb170 100644
481+ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true 483+ $(CP_) $(LIBCUPSSRC)util.c $(LIBCUPSGEN)cups_util.c || true
482 $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c 484 $(LCUPS_CC) $(LCUPSO_)cups_util.$(OBJ) $(C_) $(LIBCUPSGEN)cups_util.c
483diff --git a/base/lcupsi.mak b/base/lcupsi.mak 485diff --git a/base/lcupsi.mak b/base/lcupsi.mak
484index ae1ecff..96d4003 100644 486index ea4047f..0102d93 100644
485--- a/base/lcupsi.mak 487--- a/base/lcupsi.mak
486+++ b/base/lcupsi.mak 488+++ b/base/lcupsi.mak
487@@ -73,7 +73,7 @@ libcupsi.config-clean : 489@@ -73,7 +73,7 @@ libcupsi.config-clean :
@@ -507,10 +509,10 @@ index 3f50892..97c76a0 100644
507 # external link .dev 509 # external link .dev
508 $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE) 510 $(LDF_JB2_GEN)ldf_jb2_1.dev : $(TOP_MAKEFILES) $(LDF_JB2_MAK) $(ECHOGS_XE)
509diff --git a/base/lib.mak b/base/lib.mak 511diff --git a/base/lib.mak b/base/lib.mak
510index 7c1677b..179fed0 100644 512index 3ad7db3..87b4f01 100644
511--- a/base/lib.mak 513--- a/base/lib.mak
512+++ b/base/lib.mak 514+++ b/base/lib.mak
513@@ -328,7 +328,7 @@ md5_=$(GLOBJ)md5.$(OBJ) 515@@ -343,7 +343,7 @@ md5_=$(GLOBJ)md5.$(OBJ)
514 $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE) 516 $(GLOBJ)md5.$(OBJ) : $(GLSRC)md5.c $(AK) $(md5_h) $(std_h) $(MAKEDIRS) $(EXP)$(ECHOGS_XE)
515 $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22 517 $(EXP)$(ECHOGS_XE) -w $(GLGEN)md5.h -x 23 include -x 2022 memory_.h -x 22
516 $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h 518 $(EXP)$(ECHOGS_XE) -a $(GLGEN)md5.h -+R $(GLSRC)md5.h
@@ -519,7 +521,7 @@ index 7c1677b..179fed0 100644
519 $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c 521 $(GLCC) $(GLO_)md5.$(OBJ) $(C_) $(GLGEN)md5.c
520 $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h 522 $(RM_) $(GLGEN)md5.c $(GLGEN)md5.h
521 523
522@@ -598,19 +598,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\ 524@@ -624,19 +624,19 @@ $(GLOBJ)gconfig.$(OBJ) : $(gconfig_h) $(GLSRC)gconf.c $(AK) $(gx_h)\
523 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\ 525 $(gxdevice_h) $(gxiclass_h) $(gxiodev_h) $(gxiparam_h) $(TOP_MAKEFILES)\
524 $(MAKEDDIRS) 526 $(MAKEDDIRS)
525 $(RM_) $(GLGEN)gconfig.c 527 $(RM_) $(GLGEN)gconfig.c
@@ -539,10 +541,10 @@ index 7c1677b..179fed0 100644
539 $(RM_) $(AUX)gscdefs.c 541 $(RM_) $(AUX)gscdefs.c
540- $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c 542- $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c
541+ $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c || true 543+ $(CP_) $(GLSRC)gscdef.c $(AUX)gscdefs.c || true
542 $(GLCCAUX) $(AUXO_)gscdefs.$(OBJ) $(C_) $(AUX)gscdefs.c 544 $(GLCCAUX) $(C_) $(AUXO_)gscdefs.$(OBJ) $(AUX)gscdefs.c
543 545
544 $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\ 546 $(GLOBJ)gxacpath.$(OBJ) : $(GLSRC)gxacpath.c $(AK) $(gx_h)\
545@@ -1513,7 +1513,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\ 547@@ -1527,7 +1527,7 @@ $(GLOBJ)sjpegc_0.$(OBJ) : $(GLSRC)sjpegc.c $(AK) $(stdio__h) $(string__h)\
546 $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c 548 $(GLJCC) $(GLO_)sjpegc_0.$(OBJ) $(C_) $(GLSRC)sjpegc.c
547 549
548 $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ) 550 $(GLOBJ)sjpegc.$(OBJ) : $(GLOBJ)sjpegc_$(SHARE_JPEG).$(OBJ)
@@ -551,7 +553,7 @@ index 7c1677b..179fed0 100644
551 553
552 # sdcparam is used by the filter operator and the PS/PDF writer. 554 # sdcparam is used by the filter operator and the PS/PDF writer.
553 # It is not included automatically in sdcte/d. 555 # It is not included automatically in sdcte/d.
554@@ -1541,7 +1541,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\ 556@@ -1555,7 +1555,7 @@ $(GLOBJ)sdcte_0.$(OBJ) : $(GLSRC)sdcte.c $(AK)\
555 $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c 557 $(GLJCC) $(GLO_)sdcte_0.$(OBJ) $(C_) $(GLSRC)sdcte.c
556 558
557 $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 559 $(GLOBJ)sdcte.$(OBJ) : $(GLOBJ)sdcte_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -560,7 +562,7 @@ index 7c1677b..179fed0 100644
560 562
561 563
562 $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ 564 $(GLOBJ)sjpege_1.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
563@@ -1557,7 +1557,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\ 565@@ -1571,7 +1571,7 @@ $(GLOBJ)sjpege_0.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
564 $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c 566 $(GLJCC) $(GLO_)sjpege_0.$(OBJ) $(C_) $(GLSRC)sjpege.c
565 567
566 $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 568 $(GLOBJ)sjpege.$(OBJ) : $(GLOBJ)sjpege_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -569,7 +571,7 @@ index 7c1677b..179fed0 100644
569 571
570 # sdeparam is used by the filter operator and the PS/PDF writer. 572 # sdeparam is used by the filter operator and the PS/PDF writer.
571 # It is not included automatically in sdcte. 573 # It is not included automatically in sdcte.
572@@ -1589,7 +1589,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\ 574@@ -1603,7 +1603,7 @@ $(GLOBJ)sdctd_0.$(OBJ) : $(GLSRC)sdctd.c $(AK)\
573 $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c 575 $(GLJCC) $(GLO_)sdctd_0.$(OBJ) $(C_) $(GLSRC)sdctd.c
574 576
575 $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 577 $(GLOBJ)sdctd.$(OBJ) : $(GLOBJ)sdctd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -578,7 +580,7 @@ index 7c1677b..179fed0 100644
578 580
579 581
580 $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ 582 $(GLOBJ)sjpegd_1.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
581@@ -1606,7 +1606,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\ 583@@ -1620,7 +1620,7 @@ $(GLOBJ)sjpegd_0.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
582 584
583 585
584 $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS) 586 $(GLOBJ)sjpegd.$(OBJ) : $(GLOBJ)sjpegd_$(SHARE_JPEG).$(OBJ) $(MAKEDIRS)
@@ -587,7 +589,7 @@ index 7c1677b..179fed0 100644
587 589
588 # sddparam is used by the filter operator. 590 # sddparam is used by the filter operator.
589 # It is not included automatically in sdctd. 591 # It is not included automatically in sdctd.
590@@ -1629,7 +1629,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_) 592@@ -1643,7 +1643,7 @@ $(GLD)lzwe.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwe_)
591 593
592 # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory. 594 # We need slzwe.dev as a synonym for lzwe.dev for BAND_LIST_STORAGE = memory.
593 $(GLD)slzwe.dev : $(GLD)lzwe.dev 595 $(GLD)slzwe.dev : $(GLD)lzwe.dev
@@ -596,7 +598,7 @@ index 7c1677b..179fed0 100644
596 598
597 $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\ 599 $(GLOBJ)slzwe.$(OBJ) : $(GLSRC)slzwe.c $(AK) $(stdio__h) $(gdebug_h)\
598 $(slzwx_h) $(strimpl_h) $(MAKEDIRS) 600 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
599@@ -1645,7 +1645,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_) 601@@ -1659,7 +1659,7 @@ $(GLD)lzwd.dev : $(LIB_MAK) $(ECHOGS_XE) $(lzwd_)
600 602
601 # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory. 603 # We need slzwd.dev as a synonym for lzwd.dev for BAND_LIST_STORAGE = memory.
602 $(GLD)slzwd.dev : $(GLD)lzwd.dev 604 $(GLD)slzwd.dev : $(GLD)lzwd.dev
@@ -605,7 +607,7 @@ index 7c1677b..179fed0 100644
605 607
606 $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\ 608 $(GLOBJ)slzwd.$(OBJ) : $(GLSRC)slzwd.c $(AK) $(stdio__h) $(gdebug_h)\
607 $(slzwx_h) $(strimpl_h) $(MAKEDIRS) 609 $(slzwx_h) $(strimpl_h) $(MAKEDIRS)
608@@ -1695,7 +1695,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\ 610@@ -1709,7 +1709,7 @@ $(GLOBJ)saes.$(OBJ) : $(GLSRC)saes.c $(AK) $(memory__h)\
609 # ---------------- JBIG2 compression filter ---------------- # 611 # ---------------- JBIG2 compression filter ---------------- #
610 612
611 $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev 613 $(GLD)sjbig2.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjbig2_$(JBIG2_LIB).dev
@@ -614,7 +616,7 @@ index 7c1677b..179fed0 100644
614 616
615 # jbig2dec version 617 # jbig2dec version
616 sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ) 618 sjbig2_jbig2dec=$(GLOBJ)sjbig2.$(OBJ)
617@@ -1731,7 +1731,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \ 619@@ -1745,7 +1745,7 @@ $(GLOBJ)sjbig2_luratech.$(OBJ) : $(GLSRC)sjbig2_luratech.c $(AK) \
618 # ---------------- JPEG 2000 compression filter ---------------- # 620 # ---------------- JPEG 2000 compression filter ---------------- #
619 621
620 $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev 622 $(GLD)sjpx.dev : $(LIB_MAK) $(ECHOGS_XE) $(GLD)sjpx_$(JPX_LIB).dev
@@ -623,7 +625,7 @@ index 7c1677b..179fed0 100644
623 625
624 $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \ 626 $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
625 $(memory__h) $(gsmalloc_h) \ 627 $(memory__h) $(gsmalloc_h) \
626@@ -1860,7 +1860,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\ 628@@ -1874,7 +1874,7 @@ $(GLOBJ)szlibc_0.$(OBJ) : $(GLSRC)szlibc.c $(AK) $(std_h)\
627 $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c 629 $(GLZCC) $(GLO_)szlibc_0.$(OBJ) $(C_) $(GLSRC)szlibc.c
628 630
629 $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 631 $(GLOBJ)szlibc.$(OBJ) : $(GLOBJ)szlibc_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -632,7 +634,7 @@ index 7c1677b..179fed0 100644
632 634
633 szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ) 635 szlibe_=$(szlibc_) $(GLOBJ)szlibe.$(OBJ)
634 $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_) 636 $(GLD)szlibe.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibe.dev $(szlibe_)
635@@ -1876,7 +1876,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\ 637@@ -1890,7 +1890,7 @@ $(GLOBJ)szlibe_0.$(OBJ) : $(GLSRC)szlibe.c $(AK) $(std_h)\
636 $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c 638 $(GLZCC) $(GLO_)szlibe_0.$(OBJ) $(C_) $(GLSRC)szlibe.c
637 639
638 $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 640 $(GLOBJ)szlibe.$(OBJ) : $(GLOBJ)szlibe_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -641,7 +643,7 @@ index 7c1677b..179fed0 100644
641 643
642 szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ) 644 szlibd_=$(szlibc_) $(GLOBJ)szlibd.$(OBJ)
643 $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_) 645 $(GLD)szlibd.dev : $(LIB_MAK) $(ECHOGS_XE) $(ZGENDIR)$(D)zlibd.dev $(szlibd_)
644@@ -1892,7 +1892,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\ 646@@ -1906,7 +1906,7 @@ $(GLOBJ)szlibd_0.$(OBJ) : $(GLSRC)szlibd.c $(AK) $(std_h) $(memory__h)\
645 $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c 647 $(GLZCC) $(GLO_)szlibd_0.$(OBJ) $(C_) $(GLSRC)szlibd.c
646 648
647 $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 649 $(GLOBJ)szlibd.$(OBJ) : $(GLOBJ)szlibd_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -650,25 +652,25 @@ index 7c1677b..179fed0 100644
650 652
651 # ---------------- Page devices ---------------- # 653 # ---------------- Page devices ---------------- #
652 # We include this here, rather than in devs.mak, because it is more like 654 # We include this here, rather than in devs.mak, because it is more like
653@@ -2843,7 +2843,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\ 655@@ -2796,7 +2796,7 @@ $(GLOBJ)gsicc_lcms_0.$(OBJ) : $(GLSRC)gsicc_lcms.c\
654 $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c 656 $(GLLCMSCC) $(GLO_)gsicc_lcms_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms.c
655 657
656 $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) 658 $(GLOBJ)gsicc_lcms.$(OBJ) : $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(gp_h)
657- $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) 659- $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ)
658+ $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) || true 660+ $(CP_) $(GLOBJ)gsicc_lcms_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms.$(OBJ) || true
659 661
660 662
661 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ 663 $(GLOBJ)gsicc_lcms2_1.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
662@@ -2855,7 +2855,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\ 664@@ -2808,7 +2808,7 @@ $(GLOBJ)gsicc_lcms2_0.$(OBJ) : $(GLSRC)gsicc_lcms2.c\
663 $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c 665 $(GLLCMS2CC) $(GLO_)gsicc_lcms2_0.$(OBJ) $(C_) $(GLSRC)gsicc_lcms2.c
664 666
665 $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) 667 $(GLOBJ)gsicc_lcms2.$(OBJ) : $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(gp_h)
666- $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) 668- $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ)
667+ $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true 669+ $(CP_) $(GLOBJ)gsicc_lcms2_$(SHARE_LCMS).$(OBJ) $(GLOBJ)gsicc_lcms2.$(OBJ) || true
668 670
669 # Note that gsicc_create requires compile with lcms to obtain icc34.h 671 # Note that gsicc_create requires compile with lcms to obtain icc34.h
670 # header file that is used for creating ICC structures from PS objects. 672 # header file that is used for creating ICC structures from PS objects.
671@@ -2875,7 +2875,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\ 673@@ -2828,7 +2828,7 @@ $(GLOBJ)gsicc_create_0.$(OBJ) : $(GLSRC)gsicc_create.c $(AK) $(string__h)\
672 $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c 674 $(GLLCMSCC) $(GLO_)gsicc_create_0.$(OBJ) $(C_) $(GLSRC)gsicc_create.c
673 675
674 $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS) 676 $(GLOBJ)gsicc_create.$(OBJ) : $(GLOBJ)gsicc_create_$(SHARE_LCMS).$(OBJ) $(MAKEDIRS)
@@ -677,7 +679,7 @@ index 7c1677b..179fed0 100644
677 679
678 680
679 #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */ 681 #include "icc34.h" /* Note this header is needed even if lcms is not compiled as default CMS */
680@@ -3146,7 +3146,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS) 682@@ -3132,7 +3132,7 @@ $(GLGEN)gsromfs1_1.c : $(MKROMFS_XE) $(PS_ROMFS_DEPS) $(MAKEDIRS)
681 $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS) 683 $(PS_ROMFS_ARGS) $(GL_ROMFS_ARGS)
682 684
683 $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS) 685 $(GLGEN)gsromfs1.c : $(GLGEN)gsromfs1_$(UFST_BRIDGE).c $(MAKEDIRS)
@@ -686,7 +688,7 @@ index 7c1677b..179fed0 100644
686 688
687 # the following module is only included if the romfs.dev FEATURE is enabled 689 # the following module is only included if the romfs.dev FEATURE is enabled
688 $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ 690 $(GLOBJ)gsiorom_1.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
689@@ -3162,7 +3162,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \ 691@@ -3148,7 +3148,7 @@ $(GLOBJ)gsiorom_0.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
690 $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c 692 $(GLCC) $(GLO_)gsiorom_0.$(OBJ) $(I_)$(ZI_)$(_I) $(C_) $(GLSRC)gsiorom.c
691 693
692 $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS) 694 $(GLOBJ)gsiorom.$(OBJ) : $(GLOBJ)gsiorom_$(SHARE_ZLIB).$(OBJ) $(MAKEDIRS)
@@ -709,10 +711,10 @@ index ca1b7cc..ad6446d 100644
709 # external link .dev 711 # external link .dev
710 $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE) 712 $(LWF_JP2_GEN)lwf_jp2_1.dev : $(TOP_MAKEFILES) $(LWF_JP2_MAK) $(ECHOGS_XE)
711diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak 713diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak
712index 5387a99..725ec73 100644 714index 4ded7f3..3599ed9 100644
713--- a/base/macos-mcp.mak 715--- a/base/macos-mcp.mak
714+++ b/base/macos-mcp.mak 716+++ b/base/macos-mcp.mak
715@@ -380,11 +380,11 @@ CWPROJ_XML=./ghostscript.mcp.xml 717@@ -383,11 +383,11 @@ CWPROJ_XML=./ghostscript.mcp.xml
716 718
717 $(CWPROJ_XML): $(gconfigd_h) 719 $(CWPROJ_XML): $(gconfigd_h)
718 -mkdir -p obj/sys 720 -mkdir -p obj/sys
@@ -729,15 +731,10 @@ index 5387a99..725ec73 100644
729 731
730 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) 732 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(CWPROJ_XML) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
731diff --git a/base/openjpeg.mak b/base/openjpeg.mak 733diff --git a/base/openjpeg.mak b/base/openjpeg.mak
732index 489dd3b..60e2015 100644 734index 32be240..4a6b429 100644
733--- a/base/openjpeg.mak 735--- a/base/openjpeg.mak
734+++ b/base/openjpeg.mak 736+++ b/base/openjpeg.mak
735@@ -94,11 +94,11 @@ open_jpeg_HDRS = \ 737@@ -99,7 +99,7 @@ open_jpeg_HDRS = \
736 $(OPEN_JPEG_SRC)indexbox_manager.h \
737
738 $(OPEN_JPEG_CONFIG_H): $(TOP_MAKEFILES) $(JPXSRCDIR)$(D)opj_config.h.in.user
739- $(CP_) $(JPXSRCDIR)$(D)opj_config.h.in.user $(OPEN_JPEG_CONFIG_H)
740+ $(CP_) $(JPXSRCDIR)$(D)opj_config.h.in.user $(OPEN_JPEG_CONFIG_H) || true
741 738
742 # switch in the selected library .dev 739 # switch in the selected library .dev
743 $(OPEN_JPEG_GEN)openjpeg.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev 740 $(OPEN_JPEG_GEN)openjpeg.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_GEN)openjpeg_$(SHARE_JPX).dev
@@ -747,10 +744,10 @@ index 489dd3b..60e2015 100644
747 # external link .dev 744 # external link .dev
748 $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE) 745 $(OPEN_JPEG_GEN)openjpeg_1.dev : $(TOP_MAKEFILES) $(OPEN_JPEG_MAK) $(ECHOGS_XE)
749diff --git a/base/openvms.mak b/base/openvms.mak 746diff --git a/base/openvms.mak b/base/openvms.mak
750index 8e4c3dd..117dca4 100644 747index e5ae40b..286ee84 100644
751--- a/base/openvms.mak 748--- a/base/openvms.mak
752+++ b/base/openvms.mak 749+++ b/base/openvms.mak
753@@ -362,7 +362,7 @@ SH= 750@@ -365,7 +365,7 @@ SH=
754 751
755 # Define generic commands. 752 # Define generic commands.
756 753
@@ -760,10 +757,10 @@ index 8e4c3dd..117dca4 100644
760 # Define the command for deleting (a) file(s) (including wild cards) 757 # Define the command for deleting (a) file(s) (including wild cards)
761 758
762diff --git a/base/png.mak b/base/png.mak 759diff --git a/base/png.mak b/base/png.mak
763index 66fc3c8..59535be 100644 760index f01c426..8a89884 100644
764--- a/base/png.mak 761--- a/base/png.mak
765+++ b/base/png.mak 762+++ b/base/png.mak
766@@ -77,7 +77,7 @@ png.config-clean : 763@@ -79,7 +79,7 @@ png.config-clean :
767 $(RM_) $(PNGGEN)lpg*.dev 764 $(RM_) $(PNGGEN)lpg*.dev
768 765
769 $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt 766 $(pnglibconf_h) : $(PNGSRC)scripts$(D)pnglibconf.h.prebuilt
@@ -772,7 +769,7 @@ index 66fc3c8..59535be 100644
772 769
773 PDEP=$(AK) $(pnglibconf_h) 770 PDEP=$(AK) $(pnglibconf_h)
774 771
775@@ -132,7 +132,7 @@ $(PNGOBJ)pngget.$(OBJ) : $(PNGSRC)pngget.c $(PDEP) 772@@ -134,7 +134,7 @@ $(PNGOBJ)pngget.$(OBJ) : $(PNGSRC)pngget.c $(PDEP)
776 773
777 # Define the version of libpng.dev that we are actually using. 774 # Define the version of libpng.dev that we are actually using.
778 $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev 775 $(PNGGEN)libpng.dev : $(TOP_MAKEFILES) $(PNGGEN)libpng_$(SHARE_LIBPNG).dev
@@ -782,33 +779,33 @@ index 66fc3c8..59535be 100644
782 # Define the shared version of libpng. 779 # Define the shared version of libpng.
783 # Note that it requires libz, which must be searched *after* libpng. 780 # Note that it requires libz, which must be searched *after* libpng.
784diff --git a/base/tiff.mak b/base/tiff.mak 781diff --git a/base/tiff.mak b/base/tiff.mak
785index 22e3906..317fb14 100644 782index 0ea9f9e..80d8926 100644
786--- a/base/tiff.mak 783--- a/base/tiff.mak
787+++ b/base/tiff.mak 784+++ b/base/tiff.mak
788@@ -49,11 +49,11 @@ tiff_10=$(TIFFOBJ)tif_zip.$(OBJ) 785@@ -53,11 +53,11 @@ tiff_11=$(TIFFOBJ)gstiffio.$(OBJ)
789 786
790 $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in 787 $(TIFFSRC)libtiff$(D)tif_config.unix.h : $(TIFFSRC)libtiff$(D)tif_config.h.in
791 cd $(TIFFSRC) && ./configure 788 cd $(TIFFSRC) && ./configure
792- $(CP_) $(TIFFSRC)libtiff$(D)tif_config.h $(TIFFSRC)libtiff$(D)tif_config.unix.h 789- $(CP_) $(TIFFCONF)libtiff$(D)tif_config.h $(TIFFCONF)libtiff$(D)tif_config.unix.h
793+ $(CP_) $(TIFFSRC)libtiff$(D)tif_config.h $(TIFFSRC)libtiff$(D)tif_config.unix.h || true 790+ $(CP_) $(TIFFCONF)libtiff$(D)tif_config.h $(TIFFCONF)libtiff$(D)tif_config.unix.h || true
794 791
795 $(TIFFSRC)libtiff$(D)tiffconf.unix.h : $(TIFFSRC)libtiff$(D)tiffconf.h.in 792 $(TIFFSRC)libtiff$(D)tiffconf.unix.h : $(TIFFSRC)libtiff$(D)tiffconf.h.in
796 cd $(TIFFSRC) && ./configure 793 cd $(TIFFSRC) && ./configure
797- $(CP_) $(TIFFSRC)libtiff$(D)tiffconf.h $(TIFFSRC)libtiff$(D)tiffconf.unix.h 794- $(CP_) $(TIFFCONF)libtiff$(D)tiffconf.h $(TIFFCONF)libtiff$(D)tiffconf.unix.h
798+ $(CP_) $(TIFFSRC)libtiff$(D)tiffconf.h $(TIFFSRC)libtiff$(D)tiffconf.unix.h || true 795+ $(CP_) $(TIFFCONF)libtiff$(D)tiffconf.h $(TIFFCONF)libtiff$(D)tiffconf.unix.h || true
799 796
800 $(TIFFOBJ)tif_aux.$(OBJ) : $(TIFFSRC)/libtiff/tif_aux.c $(TIFFDEP) 797 $(TIFFOBJ)tif_aux.$(OBJ) : $(TIFFSRC)/libtiff/tif_aux.c $(TIFFDEP)
801 $(TIFFCC) $(TIFFO_)tif_aux.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_aux.c 798 $(TIFFCC) $(TIFFO_)tif_aux.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_aux.c
802@@ -179,14 +179,14 @@ $(TIFFOBJ)tif_unix.$(OBJ) : $(TIFFSRC)/libtiff/tif_unix.c $(TIFFDEP) 799@@ -189,14 +189,14 @@ $(TIFFOBJ)gstiffio.$(OBJ) : $(GLSRC)gstiffio.c $(gstiffio_h) $(PDEVH) $(stdint__
803 $(TIFFCC) $(TIFFO_)tif_unix.$(OBJ) $(C_) $(TIFFSRC)/libtiff/tif_unix.c 800 $(TIFFCC) $(TIFFO_)gstiffio.$(OBJ) $(D_)SHARE_LIBTIFF=$(SHARE_LIBTIFF) $(C_) $(GLSRC)gstiffio.c
804 801
805 $(TIFFGEN)tif_config.h: $(TIFFCONFIG) 802 $(TIFFGEN)tif_config.h: $(TIFFCONFIG_H)
806- $(CP_) $(TIFFCONFIG) $(TIFFGEN)tif_config.h 803- $(CP_) $(TIFFCONFIG_H) $(TIFFGEN)tif_config.h
807+ $(CP_) $(TIFFCONFIG) $(TIFFGEN)tif_config.h || true 804+ $(CP_) $(TIFFCONFIG_H) $(TIFFGEN)tif_config.h || true
808 805
809 $(TIFFGEN)tiffconf.h: $(TIFFCONF) 806 $(TIFFGEN)tiffconf.h: $(TIFFCONF_H)
810- $(CP_) $(TIFFCONF) $(TIFFGEN)tiffconf.h 807- $(CP_) $(TIFFCONF_H) $(TIFFGEN)tiffconf.h
811+ $(CP_) $(TIFFCONF) $(TIFFGEN)tiffconf.h || true 808+ $(CP_) $(TIFFCONF_H) $(TIFFGEN)tiffconf.h || true
812 809
813 # Define the version of libtiff.dev that we are actually using. 810 # Define the version of libtiff.dev that we are actually using.
814 $(TIFFGEN)libtiff.dev : $(TOP_MAKEFILES) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev 811 $(TIFFGEN)libtiff.dev : $(TOP_MAKEFILES) $(TIFFGEN)libtiff_$(SHARE_LIBTIFF).dev
@@ -831,10 +828,10 @@ index 1ddad78..6b24422 100644
831 # Query the environment to construct gconfig_.h. 828 # Query the environment to construct gconfig_.h.
832 # These are all defined conditionally (except the JasPER one), so that 829 # These are all defined conditionally (except the JasPER one), so that
833diff --git a/base/unixhead.mak b/base/unixhead.mak 830diff --git a/base/unixhead.mak b/base/unixhead.mak
834index 67b5434..c4582c1 100644 831index 6aa3599..70a61f8 100644
835--- a/base/unixhead.mak 832--- a/base/unixhead.mak
836+++ b/base/unixhead.mak 833+++ b/base/unixhead.mak
837@@ -55,7 +55,7 @@ SH=$(SHELL) 834@@ -53,7 +53,7 @@ SH=$(SHELL)
838 835
839 # Define generic commands. 836 # Define generic commands.
840 837
@@ -874,8 +871,21 @@ index 6c50605..7fb8c9b 100644
874 871
875 $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE) 872 $(ZGEN)zlibd_1.dev : $(TOP_MAKEFILES) $(ZLIB_MAK) $(ECHOGS_XE)
876 $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME) 873 $(SETMOD) $(ZGEN)zlibd_1 -lib $(ZLIB_NAME)
874diff --git a/devices/devs.mak b/devices/devs.mak
875index bc22594..4bd0a11 100644
876--- a/devices/devs.mak
877+++ b/devices/devs.mak
878@@ -1555,7 +1555,7 @@ libpng_dev=$(PNGGENDIR)$(D)libpng.dev
879 png_i_=-include $(PNGGENDIR)$(D)libpng
880
881 $(DEVOBJ)gdevpng.$(OBJ) : $(DEVSRC)gdevpng.c\
882- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h)
883+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h) $(PDEP)
884 $(CC_) $(I_)$(DEVI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(DEVO_)gdevpng.$(OBJ) $(C_) $(DEVSRC)gdevpng.c
885
886 $(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV)
877diff --git a/psi/int.mak b/psi/int.mak 887diff --git a/psi/int.mak b/psi/int.mak
878index 92f296e..ee6b136 100644 888index 62cba0e..a1e963a 100644
879--- a/psi/int.mak 889--- a/psi/int.mak
880+++ b/psi/int.mak 890+++ b/psi/int.mak
881@@ -274,7 +274,7 @@ $(PSOBJ)iconfig.$(OBJ) : $(gconfig_h) $(PSSRC)iconf.c $(stdio__h)\ 891@@ -274,7 +274,7 @@ $(PSOBJ)iconfig.$(OBJ) : $(gconfig_h) $(PSSRC)iconf.c $(stdio__h)\
@@ -905,7 +915,7 @@ index 92f296e..ee6b136 100644
905 915
906 # We -include dpsand2 first so that geninit will have access to the 916 # We -include dpsand2 first so that geninit will have access to the
907 # system name table as soon as possible. 917 # system name table as soon as possible.
908@@ -1208,7 +1208,7 @@ $(PSOBJ)zfjbig2_luratech.$(OBJ) : $(PSSRC)zfjbig2.c $(OP) $(memory__h)\ 918@@ -1193,7 +1193,7 @@ $(PSOBJ)zfjbig2_luratech.$(OBJ) : $(PSSRC)zfjbig2.c $(OP) $(memory__h)\
909 # this can be turned on and off with a FEATURE_DEV 919 # this can be turned on and off with a FEATURE_DEV
910 920
911 $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev 921 $(PSD)jpx.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)jpx_$(JPX_LIB).dev
@@ -914,16 +924,6 @@ index 92f296e..ee6b136 100644
914 924
915 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ) 925 fjpx_luratech=$(PSOBJ)zfjpx_luratech.$(OBJ)
916 926
917Index: ghostscript-9.07/base/devs.mak 927--
918=================================================================== 9281.8.1.2
919--- ghostscript-9.07.orig/base/devs.mak 2013-02-14 07:58:13.000000000 +0000 929
920+++ ghostscript-9.07/base/devs.mak 2013-09-06 22:50:06.331064815 +0000
921@@ -1511,7 +1511,7 @@
922 png_i_=-include $(PNGGENDIR)$(D)libpng
923
924 $(GLOBJ)gdevpng.$(OBJ) : $(GLSRC)gdevpng.c\
925- $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h)
926+ $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h) $(PDEP)
927 $(CC_) $(I_)$(GLI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(GLO_)gdevpng.$(OBJ) $(C_) $(GLSRC)gdevpng.c
928
929 $(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
deleted file mode 100644
index 14c036e5c5..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.05-NOT-check-endian.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1configure will check endianness of build machine. When cross compile it fails.
2So remove the check for Yocto.
3
4Upstream-Status: Pending
5
6Signed-off-by: Kang Kai <kai.kang@windriver.com>
7Signed-off-by: Sen Zhang <sen.zhang@windriver.com>
8Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
9
10--- ghostscript/base/configure.ac.orig 2013-06-24 03:58:26.224723002 -0400
11+++ ghostscript/base/configure.ac 2013-06-24 04:03:29.730807957 -0400
12@@ -255,13 +255,13 @@
13
14 AC_MSG_CHECKING([for big endian])
15
16-AC_RUN_IFELSE(
17- [AC_LANG_PROGRAM([#include <stdio.h>], [
18- static const int one = 1;
19- return (*(char*)&one == 0 ? 0 : 1);
20- ])],
21- [BIGENDIAN=1;AC_MSG_RESULT(big)],
22- [BIGENDIAN=0;AC_MSG_RESULT(little)])
23+#AC_RUN_IFELSE(
24+# [AC_LANG_PROGRAM([#include <stdio.h>], [
25+# static const int one = 1;
26+# return (*(char*)&one == 0 ? 0 : 1);
27+# ])],
28+# [BIGENDIAN=1;AC_MSG_RESULT(big)],
29+# [BIGENDIAN=0;AC_MSG_RESULT(little)])
30
31
32
33@@ -1922,9 +1922,11 @@
34 if test "x$BIGENDIAN" != "x0"; then
35 LCMS_ENDIAN="-DUSE_BIG_ENDIAN=$BIGENDIAN"
36 LCMS2_ENDIAN="-DCMS_USE_BIG_ENDIAN=$BIGENDIAN"
37+ AC_MSG_RESULT(big)
38 else
39 LCMS_ENDIAN=
40 LCMS2_ENDIAN=
41+ AC_MSG_RESULT(little)
42 fi
43
44 AC_SUBST(LCMS_ENDIAN)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
index 40afd372d1..9158117d01 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-native-fix-disable-system-libtiff.patch
@@ -7,44 +7,31 @@ disabled.
7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
8Upstream-Status: Pending 8Upstream-Status: Pending
9--- 9---
10diff --git a/base/configure.ac b/base/configure.ac 10 configure.ac | 5 +++++
11index bb05105..4b817ac 100644 11 1 file changed, 5 insertions(+)
12--- a/base/configure.ac 12
13+++ b/base/configure.ac 13diff --git a/configure.ac b/configure.ac
14@@ -951,17 +951,22 @@ 14--- a/configure.ac
15+++ b/configure.ac
16@@ -1055,6 +1055,7 @@ Disabling tiff output devices.])
15 esac 17 esac
16 18
17 if test $SHARE_LIBTIFF -eq 0; then 19 if test $SHARE_LIBTIFF -eq 0; then
18- echo
19- echo "Running libtiff configure script..."
20- olddir=`pwd`
21- cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS
22- status=$?
23- if test "$status" -ne 0 ; then
24- AC_MSG_ERROR([libtiff configure script failed], $status)
25- fi
26- cd "$olddir"
27- echo
28- echo "Continuing with Ghostscript configuration..."
29+ if test -e $LIBTIFFDIR/configure; then 20+ if test -e $LIBTIFFDIR/configure; then
30+ echo 21 echo
31+ echo "Running libtiff configure script..." 22 echo "Running libtiff configure script..."
32+ olddir=`pwd` 23 olddir=`pwd`
33+ cd "$LIBTIFFDIR" && ./configure --disable-jbig --disable-lzma $SUBCONFIG_OPTS 24@@ -1069,6 +1070,10 @@ if test $SHARE_LIBTIFF -eq 0; then
34+ status=$? 25 cd "$olddir"
35+ if test "$status" -ne 0 ; then 26 echo
36+ AC_MSG_ERROR([libtiff configure script failed], $status) 27 echo "Continuing with Ghostscript configuration..."
37+ fi
38+ cd "$olddir"
39+ echo
40+ echo "Continuing with Ghostscript configuration..."
41+ else 28+ else
42+ AC_MSG_NOTICE([Could not find local copy of libtiff. 29+ AC_MSG_NOTICE([Could not find local copy of libtiff.
43+Disabling tiff output devices.]) 30+Disabling tiff output devices.])
44+ fi 31+ fi
45 fi 32 fi
46 33
47 AC_SUBST(SHARE_LIBTIFF) 34 AC_SUBST(SHARE_LIBTIFF)
48-- 35--
491.7.10.4 361.8.1.2
50 37
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.07.bb b/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
index 64dc6f267f..73cebbc86a 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.07.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.14.bb
@@ -13,7 +13,7 @@ HOMEPAGE = "http://www.ghostscript.com"
13SECTION = "console/utils" 13SECTION = "console/utils"
14 14
15LICENSE = "GPLv3" 15LICENSE = "GPLv3"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=a5146dadaa8cd9f5f913b7577d49bf19" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=aad21ea85123608e6a0a58d54ee23567"
17 17
18DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" 18DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
19DEPENDS_class-native = "" 19DEPENDS_class-native = ""
@@ -25,19 +25,21 @@ SRC_URI = "${SRC_URI_BASE} \
25 file://ghostscript-9.02-genarch.patch \ 25 file://ghostscript-9.02-genarch.patch \
26 file://objarch.h \ 26 file://objarch.h \
27 file://ghostscript-9.02-parallel-make.patch \ 27 file://ghostscript-9.02-parallel-make.patch \
28 file://ghostscript-9.05-NOT-check-endian.patch \
29 " 28 "
30 29
31SRC_URI_class-native = "${SRC_URI_BASE} \ 30SRC_URI_class-native = "${SRC_URI_BASE} \
32 file://ghostscript-native-fix-disable-system-libtiff.patch \ 31 file://ghostscript-native-fix-disable-system-libtiff.patch \
32 file://base-genht.c-add-a-preprocessor-define-to-allow-fope.patch \
33 " 33 "
34 34
35SRC_URI[md5sum] = "57ebf17c5abcf0fc95a386bfff08c1a4" 35SRC_URI[md5sum] = "586494befb443363338c1b6379f13973"
36SRC_URI[sha256sum] = "44800d004c53f13192d1b5db413119198ddfc8a11c4d2a030aac2f2fda822ebf" 36SRC_URI[sha256sum] = "ab2ba5ce11c8db396c9acf774a497182d7686d04670976cc3e690ada7db9f0d4"
37 37
38EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \ 38EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
39 --with-fontpath=${datadir}/fonts --with-install-cups \ 39 --with-fontpath=${datadir}/fonts \
40 --without-libidn \ 40 --without-libidn --with-cups-serverbin=${exec_prefix}/lib/cups \
41 --with-cups-datadir=${datadir}/cups \
42 ${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--enable-little-endian', '--enable-big-endian', d)} \
41 " 43 "
42 44
43# Explicity disable libtiff, fontconfig, 45# Explicity disable libtiff, fontconfig,
@@ -62,13 +64,6 @@ do_configure_prepend () {
62 if [ -e ${WORKDIR}/objarch.h ]; then 64 if [ -e ${WORKDIR}/objarch.h ]; then
63 cp ${WORKDIR}/objarch.h obj/arch.h 65 cp ${WORKDIR}/objarch.h obj/arch.h
64 fi 66 fi
65 if [ ${SITEINFO_ENDIANNESS} = "le" ]; then
66 export BIGENDIAN="0"
67 export BIGENDIAN="0"
68 else
69 export BIGENDIAN="1"
70 export BIGENDIAN="1"
71 fi
72} 67}
73 68
74do_configure_append () { 69do_configure_append () {
@@ -79,22 +74,12 @@ do_configure_append () {
79 cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i 74 cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i
80 done 75 done
81 fi 76 fi
82
83 # replace cups paths from sysroots/.../usr/bin/crossscripts/cups-config with target paths
84 # CUPSDATA is compiled into a utility, and CUPSSERVERBIN is used as an install path
85 CUPSSERVERBIN=${exec_prefix}/lib/cups # /usr/lib NOT libdir
86 CUPSDATA=${datadir}/cups
87
88 sed -e "s#^CUPSSERVERBIN=.*#CUPSSERVERBIN=${CUPSSERVERBIN}#" -i Makefile
89 sed -e "s#^CUPSDATA=.*#CUPSDATA=${CUPSDATA}#" -i Makefile
90} 77}
91 78
92do_install_append () { 79do_install_append () {
93 mkdir -p ${D}${datadir}/ghostscript/${PV}/ 80 mkdir -p ${D}${datadir}/ghostscript/${PV}/
94 cp -r Resource ${D}${datadir}/ghostscript/${PV}/ 81 cp -r Resource ${D}${datadir}/ghostscript/${PV}/
95 cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/ 82 cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
96
97 chown -R root:lp ${D}${sysconfdir}/cups
98} 83}
99 84
100do_compile_class-native () { 85do_compile_class-native () {
@@ -117,14 +102,3 @@ BBCLASSEXTEND = "native"
117# directories during install and parallel make causes problems. 102# directories during install and parallel make causes problems.
118PARALLEL_MAKEINST="" 103PARALLEL_MAKEINST=""
119 104
120PACKAGES =+ "${PN}-cups"
121
122FILES_${PN}-dbg += "${exec_prefix}/lib/cups/filter/.debug"
123
124FILES_${PN}-cups += "${exec_prefix}/lib/cups/filter/gstoraster \
125 ${exec_prefix}/lib/cups/filter/gstopxl \
126 ${datadir}/cups \
127 ${sysconfdir}/cups \
128 "
129
130RDEPENDS_${PN}-cups = "${PN}"