sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '8.5'

Browse Source
This commit is contained in:
John Cupitt 2017-08-30 14:59:16 +01:00
commit 820c279697
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -17,6 +17,7 @@
29/8/17 started 8.5.9 29/8/17 started 8.5.9
- make --fail stop jpeg read on any libjpeg warning, thanks @mceachen - make --fail stop jpeg read on any libjpeg warning, thanks @mceachen
- don't build enumtypes so often, removing perl as a compile dependancy
2/8/17 started 8.5.8 2/8/17 started 8.5.8
- fix transparency detection in merge, thanks Haida - fix transparency detection in merge, thanks Haida

8
libvips/include/vips/Makefile.am
View File

@ -72,11 +72,7 @@ vips_scan_headers = \
${top_srcdir}/libvips/include/vips/morphology.h \ ${top_srcdir}/libvips/include/vips/morphology.h \
${top_srcdir}/libvips/include/vips/draw.h \ ${top_srcdir}/libvips/include/vips/draw.h \
${top_srcdir}/libvips/include/vips/basic.h \ ${top_srcdir}/libvips/include/vips/basic.h \
${top_srcdir}/libvips/include/vips/version.h \
${top_srcdir}/libvips/include/vips/object.h ${top_srcdir}/libvips/include/vips/object.h
enumtypes.h: $(vips_scan_headers) Makefile enumtypes.h: $(vips_scan_headers) Makefile.am
glib-mkenums --template enumtemplate \ glib-mkenums --template enumtemplate $(vips_scan_headers) > enumtypes.h
$(vips_scan_headers) > xgen-geth && \
( cmp -s xgen-geth enumtypes.h || cp xgen-geth enumtypes.h ) && \
rm -f xgen-geth

8
libvips/iofuncs/Makefile.am
View File

@ -70,11 +70,7 @@ vips_scan_headers = \
${top_srcdir}/libvips/include/vips/morphology.h \ ${top_srcdir}/libvips/include/vips/morphology.h \
${top_srcdir}/libvips/include/vips/draw.h \ ${top_srcdir}/libvips/include/vips/draw.h \
${top_srcdir}/libvips/include/vips/basic.h \ ${top_srcdir}/libvips/include/vips/basic.h \
${top_srcdir}/libvips/include/vips/version.h \
${top_srcdir}/libvips/include/vips/object.h ${top_srcdir}/libvips/include/vips/object.h
enumtypes.c: $(vips_scan_headers) Makefile enumtypes.c: $(vips_scan_headers) Makefile.am
glib-mkenums --template enumtemplate \ glib-mkenums --template enumtemplate $(vips_scan_headers) > enumtypes.c
$(vips_scan_headers) > xgen-getc && \
( cmp -s xgen-getc enumtypes.c || cp xgen-getc enumtypes.c ) && \
rm -f xgen-getc