Merge branch '8.4'
This commit is contained in:
commit
c1ca76f6a2
@ -15,6 +15,9 @@
|
||||
- IM6/IM7 magickload supports page/n/page-height, all_frames deprecated
|
||||
- gifload supports n/page-height
|
||||
|
||||
8/12/16 started 8.4.5
|
||||
- allow libgsf-1.14.26 to help centos, thanks tdiprima
|
||||
|
||||
11/11/16 started 8.4.4
|
||||
- fix crash in vips.exe arg parsing on Windows, thanks Yury
|
||||
|
||||
|
@ -404,9 +404,12 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
|
||||
AC_ARG_WITH([gsf],
|
||||
AS_HELP_STRING([--without-gsf], [build without libgsf-1 (default: test)]))
|
||||
|
||||
# libgsf-1 1.14.21 crashes, .27 is known-good, not sure about 22-26
|
||||
# libgsf-1 1.14.21 crashes
|
||||
# .27 is known to work well
|
||||
# .26 seems OK but has not been tested much
|
||||
# not sure about 22-25
|
||||
if test x"$with_gsf" != "xno"; then
|
||||
PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.14.27,
|
||||
PKG_CHECK_MODULES(GSF, libgsf-1 >= 1.14.26,
|
||||
[AC_DEFINE(HAVE_GSF,1,[define if you have libgsf-1 installed.])
|
||||
with_gsf=yes
|
||||
PACKAGES_USED="$PACKAGES_USED libgsf-1"
|
||||
@ -1095,7 +1098,7 @@ file import/export with libtiff: $with_tiff
|
||||
file import/export with giflib: $with_giflib
|
||||
file import/export with libjpeg: $with_jpeg
|
||||
image pyramid export: $with_gsf
|
||||
(requires libgsf-1 1.14.27 or later)
|
||||
(requires libgsf-1 1.14.26 or later)
|
||||
use libexif to load/save JPEG metadata: $with_libexif
|
||||
])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user