[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-2007-gc535c0c
[email protected] (Chris Liddell) Mon, 2 Dec 2019 13:25:12 +0000 (UTC)
| Newsgroups | gmane.comp.printing.ghostscript.cvs |
|---|---|
| Message-ID | <[email protected]> |
The ghostpdl branch, master has been updated
via c535c0c879162ccd7c88c5b8cc6c3a0847c0babe (commit)
via aa4fa650fa837a6f7b22caad33699bbbf9156bc1 (commit)
from c2b492ad627bdcb476fa3cd15a1c31cc3b6b788d (commit)
----------------------------------------------------------------------
commit c535c0c879162ccd7c88c5b8cc6c3a0847c0babe
Author: Chris Liddell <[email protected]>
Date: Sun Dec 1 22:04:21 2019 +0000
Create devdevs.tr correctly
devdevs.tr is an interim list of output and core library "devs" that gets
created and then used, ultimately, to create the gconfig.h header file
(which has the bulid configuration of the graphics library), and the linker
scripts.
When devdevs.tr required creation, we were always appending to the file (if it
already existed), not overwriting it, meaning the list would grow indefinitely,
and contain duplicates.
This looks like a typo: the first line of devdevs.tr creation used a '-a'
echogs paramater, rather than the '-w' parameter.
I think this should solve the problem.
diff --git a/base/gs.mak b/base/gs.mak
index a6bc6da..d1b3235 100644
--- a/base/gs.mak
+++ b/base/gs.mak
@@ -428,7 +428,7 @@ $(GLGENDIR)$(D)fdevs.tr: $(GS_MAK) $(ECHOGS_XE) $(GSPLAT_DEVS_ALL) $(FEATURE_DEV
$(EXP)$(ECHOGS_XE) -a $(GLGENDIR)$(D)fdevs.tr -+ $(FEATURE_DEVS_EXTRA)
$(GLGENDIR)$(D)devdevs.tr: $(GS_MAK) $(ECHOGS_XE) $(DEVICE_DEVS_ALL) $(MAKEDIRS)
- $(EXP)$(ECHOGS_XE) -a $(GLGENDIR)$(D)devdevs.tr -+ $(DEVICE_DEVS)
+ $(EXP)$(ECHOGS_XE) -w $(GLGENDIR)$(D)devdevs.tr -+ $(DEVICE_DEVS)
$(EXP)$(ECHOGS_XE) -a $(GLGENDIR)$(D)devdevs.tr -+ $(DEVICE_DEVS1)
$(EXP)$(ECHOGS_XE) -a $(GLGENDIR)$(D)devdevs.tr -+ $(DEVICE_DEVS2)
$(EXP)$(ECHOGS_XE) -a $(GLGENDIR)$(D)devdevs.tr -+ $(DEVICE_DEVS3)
----------------------------------------------------------------------
commit aa4fa650fa837a6f7b22caad33699bbbf9156bc1
Author: Chris Liddell <[email protected]>
Date: Sun Dec 1 21:55:48 2019 +0000
Bug 701957: Explicitly disable webp and ztsd for libtiff
diff --git a/configure.ac b/configure.ac
index 6742cf8..adbbc71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1435,7 +1435,7 @@ if test x"$SHARE_LIBTIFF" = x"0" ; then
if ! test -d "$LIBTIFFCONFDIR" ; then
mkdir "$LIBTIFFCONFDIR"
fi
- cd "$LIBTIFFCONFDIR" && "$absolute_source_path/$LIBTIFFDIR/configure" --disable-jbig --disable-lzma $SUBCONFIG_OPTS
+ cd "$LIBTIFFCONFDIR" && "$absolute_source_path/$LIBTIFFDIR/configure" --disable-jbig --disable-lzma --disable-zstd --disable-webp $SUBCONFIG_OPTS
status=$?
if test $status -ne 0 ; then
AC_MSG_ERROR([libtiff configure script failed], $status)
Summary of changes:
base/gs.mak | 2 +-
configure.ac | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)