diff options
| author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2017-06-21 01:22:20 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-06-24 11:17:03 +0200 |
| commit | a32b6e25b51a449015bda4bcb5c672c052dd9adb (patch) | |
| tree | b522ec8cf968b31a87a0025c07b0900a5c6dbc56 /rules/libgd.make | |
| parent | 89ab141d5c8c752082f9991fddf5eb53e34aae21 (diff) | |
| download | ptxdist-a32b6e25b51a449015bda4bcb5c672c052dd9adb.tar.gz ptxdist-a32b6e25b51a449015bda4bcb5c672c052dd9adb.tar.xz | |
libgd: version bump 2.0.36RC1 -> 2.2.4
Even with the freetype patch, the old libgd was not compatible.
Let's therefore also update libgd to the most recent stable version to
fix this.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libgd.make')
| -rw-r--r-- | rules/libgd.make | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/rules/libgd.make b/rules/libgd.make index c2a9a35e8..850046231 100644 --- a/rules/libgd.make +++ b/rules/libgd.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_LIBGD) += libgd # # Paths and names # -LIBGD_VERSION := 2.0.36RC1 -LIBGD_MD5 := 39ac48e6d5e0012a3bd2248a0102f209 +LIBGD_VERSION := 2.2.4 +LIBGD_MD5 := 0a3c307b5075edbe1883543dd1153c02 LIBGD := gd-$(LIBGD_VERSION) LIBGD_SUFFIX := tar.gz -LIBGD_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(LIBGD).$(LIBGD_SUFFIX) +LIBGD_URL := https://github.com/libgd/libgd/releases/download/$(LIBGD)/libgd-$(LIBGD_VERSION).$(LIBGD_SUFFIX) LIBGD_SOURCE := $(SRCDIR)/$(LIBGD).$(LIBGD_SUFFIX) LIBGD_DIR := $(BUILDDIR)/$(LIBGD) @@ -34,43 +34,20 @@ LIBGD_ENV := $(CROSS_ENV) # # autoconf # -LIBGD_AUTOCONF := $(CROSS_AUTOCONF_USR) - -ifdef PTXCONF_LIBGD_X -LIBGD_AUTOCONF += --with-x -else -LIBGD_AUTOCONF += --without-x -endif - -ifdef PTXCONF_LIBGD_JPEG -LIBGD_AUTOCONF += --with-jpeg=$(SYSROOT)/usr -else -LIBGD_AUTOCONF += --without-jpeg -endif - -ifdef PTXCONF_LIBGD_PNG -LIBGD_AUTOCONF += --with-png=$(SYSROOT)/usr -else -LIBGD_AUTOCONF += --without-png -endif - -ifdef PTXCONF_LIBGD_XPM -LIBGD_AUTOCONF += --with-xpm=$(SYSROOT)/usr --with-x -else -LIBGD_AUTOCONF += --without-xpm --without-x -endif - -ifdef PTXCONF_LIBGD_FREETYPE -LIBGD_AUTOCONF += --with-freetype=$(SYSROOT)/usr -else -LIBGD_AUTOCONF += --without-freetype -endif - -ifdef PTXCONF_LIBGD_FONTCONFIG -LIBGD_AUTOCONF += --with-fontconfig=$(SYSROOT)/usr -else -LIBGD_AUTOCONF += --without-fontconfig -endif +LIBGD_AUTOCONF := \ + $(CROSS_AUTOCONF_USR) \ + --disable-rpath \ + --disable-werror \ + --$(call ptx/wwo, PTXCONF_LIBGD_X)-x \ + --with-zlib \ + --$(call ptx/wwo, PTXCONF_LIBGD_PNG)-png \ + --$(call ptx/wwo, PTXCONF_LIBGD_FREETYPE)-freetype \ + --$(call ptx/wwo, PTXCONF_LIBGD_FONTCONFIG)-fontconfig \ + --$(call ptx/wwo, PTXCONF_LIBGD_JPEG)-jpeg \ + --without-liq \ + --$(call ptx/wwo, PTXCONF_LIBGD_XPM)-xpm \ + --without-tiff \ + --without-webp # ---------------------------------------------------------------------------- # Target-Install |