Mercurial > mxe-octave

changeset 4527:d3c12e857e9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphicsmagick: enable jbig * src/graphicsmagick.mk: and as dependancy and enable jbig, in windows dont use clock_xxxx functions
author John D
date Wed, 08 Nov 2017 15:55:54 -0500
parents c283aa086767
children 6e25a72b02a7
files src/graphicsmagick.mk
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/graphicsmagick.mk	Wed Nov 08 08:20:54 2017 -0500
+++ b/src/graphicsmagick.mk	Wed Nov 08 15:55:54 2017 -0500
@@ -8,11 +8,17 @@
 $(PKG)_SUBDIR   := GraphicsMagick-$($(PKG)_VERSION)
 $(PKG)_FILE     := GraphicsMagick-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := zlib bzip2 jpeg jasper lcms libpng tiff freetype libxml2
+$(PKG)_DEPS     := zlib bzip2 libjbig jpeg jasper lcms libpng tiff freetype libxml2
 ifneq ($(MXE_SYSTEM),msvc)
     $(PKG)_DEPS += pthreads libtool
 endif
 
+$(PKG)_CONFIGURE_OPTIONS :=
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+    $(PKG)_CONFIGURE_OPTIONS += ac_cv_func_clock_getres=no ac_cv_func_clock_gettime=no
+endif
+
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/' | \
     $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
@@ -23,6 +29,7 @@
     # This can be removed once the patch "graphicsmagick-1-fix-xml2-config.patch" is accepted by upstream
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
+        $($(PKG)_CONFIGURE_OPTIONS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
          $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
@@ -36,7 +43,7 @@
         --without-dps \
         --without-fpx \
         --without-gslib \
-        --without-jbig \
+        --with-jbig \
         --with-jpeg \
         --with-jp2 \
         --with-lcms2 \