diff options
| author |   Sam James <sam@gentoo.org> | 2022-04-04 15:45:59 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-04-17 12:59:02 +0100 |
| commit | 56e9b1647b14fc9a2d7cc6200bb86a9f415b00fb (patch) | |
| tree | e8eab7ba7e3b46887da2c60b58c8abd6cc54543d /base | |
| parent | Import Ghostscript 9.56.0 (diff) | |
| download | ghostscript-gpl-patches-56e9b1647b14fc9a2d7cc6200bb86a9f415b00fb.tar.gz ghostscript-gpl-patches-56e9b1647b14fc9a2d7cc6200bb86a9f415b00fb.tar.bz2 ghostscript-gpl-patches-56e9b1647b14fc9a2d7cc6200bb86a9f415b00fb.zip | |
Import Ghostscript 9.56.1ghostscript-9.56.1ghostscript-9
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'base')
| -rw-r--r-- | base/gdevp14.c | 2 | ||||
| -rw-r--r-- | base/msvclib.mak | 5 | ||||
| -rw-r--r-- | base/unix-dll.mak | 11 | ||||
| -rw-r--r-- | base/version.mak | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/base/gdevp14.c b/base/gdevp14.c index 124b66de..b3018f85 100644 --- a/base/gdevp14.c +++ b/base/gdevp14.c @@ -10162,7 +10162,7 @@ pdf14_create_clist_device(gs_memory_t *mem, gs_gstate * pgs, proper blending. During put_image we will convert from RGB to CIELAB */ if ((target_profile->data_cs == gsCIELAB || target_profile->islab) && - pdev->blend_cs_state != PDF14_BLEND_CS_UNSPECIFIED) { + pdev->blend_cs_state == PDF14_BLEND_CS_UNSPECIFIED) { pdev->blend_cs_state = PDF14_BLEND_CS_TARGET_CIELAB; rc_assign(pdev->icc_struct->device_profile[GS_DEFAULT_DEVICE_PROFILE], pgs->icc_manager->default_rgb, "pdf14_create_clist_device"); diff --git a/base/msvclib.mak b/base/msvclib.mak index fe156d29..ba70f67c 100644 --- a/base/msvclib.mak +++ b/base/msvclib.mak @@ -660,6 +660,11 @@ MS_TOOLSET_VERSION=14.29.30133 MSVC_VERSION=16 MS_TOOLSET_VERSION=14.29.30133 !endif +!if "$(_NMAKE_VER)" == "14.29.30141.0" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.29.30133 +!endif !endif !ifndef MSVC_VERSION diff --git a/base/unix-dll.mak b/base/unix-dll.mak index 0e4bbab4..89dfa5a2 100644 --- a/base/unix-dll.mak +++ b/base/unix-dll.mak @@ -193,15 +193,16 @@ gpdl-so-links-subtarget: $(GPDL_SO) $(UNIX_DLL_MAK) $(MAKEDIRS) $(NO_OP) # Build the small Ghostscript loaders, with Gtk+ and without -$(GLOBJ)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS) +$(GLO)dxmainc.$(OBJ): $(PSSRC)dxmainc.c $(UNIX_DLL_MAK) $(MAKEDIRS) $(GLCC) $(GLO_)dxmainc.$(OBJ) $(C_) $(PSSRC)dxmainc.c -$(GSSOC_XE): gs-so-links-subtarget $(GLOBJ)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) - $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE) +$(GLO)dxmain.$(OBJ): $(PSSRC)dxmain.c $(UNIX_DLL_MAK) $(MAKEDIRS) + $(GLCC) $(SOC_CFLAGS) $(GLO_)dxmain.$(OBJ) $(C_) $(PSSRC)dxmain.c -$(GLO_)$(SOC_LOADER).$(OBJ): $(PSSRC)$(SOC_LOADER).c $(UNIX_DLL_MAK) $(MAKEDIRS) +$(GSSOC_XE): gs-so-links-subtarget $(GLO)dxmainc.$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) + $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOC_XE) $(GLOBJ)dxmainc.$(OBJ) -l$(GS_SO_BASE) -$(GSSOX_XE): gs-so-links-subtarget $(GLO_)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) +$(GSSOX_XE): gs-so-links-subtarget $(GLO)$(SOC_LOADER).$(OBJ) $(UNIX_DLL_MAK) $(MAKEDIRS) $(GLCC) -L$(BINDIR) $(LDFLAGS) $(O_) $(GSSOX_XE) $(GLOBJ)$(SOC_LOADER).$(OBJ) -l$(GS_SO_BASE) $(SOC_LIBS) $(PCLSOC_XE): gpcl6-so-links-subtarget $(UNIX_DLL_MAK) $(PLOBJ)$(REALMAIN_SRC).$(OBJ) $(MAKEDIRS) diff --git a/base/version.mak b/base/version.mak index 44eb4bae..98fb46e1 100644 --- a/base/version.mak +++ b/base/version.mak @@ -15,9 +15,9 @@ # Major, minor and patch version numbers. GS_VERSION_MAJOR=9 GS_VERSION_MINOR=56 -GS_VERSION_PATCH=0 +GS_VERSION_PATCH=1 # Revision date: year x 10000 + month x 100 + day. -GS_REVISIONDATE=20220329 +GS_REVISIONDATE=20220404 # Derived values GS_VERSION=$(GS_VERSION_MAJOR)$(GS_VERSION_MINOR)$(GS_VERSION_PATCH) GS_DOT_VERSION=$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR).$(GS_VERSION_PATCH) |