Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
@@ -9,8 +9,8 @@ config BR2_PACKAGE_IMAGEMAGICK
|
||||
JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF.
|
||||
Use ImageMagick to translate, flip, mirror, rotate, scale,
|
||||
shear and transform images, adjust image colors, apply various
|
||||
special effects, or draw text,
|
||||
lines, polygons, ellipses and Bézier curves.
|
||||
special effects, or draw text, lines, polygons, ellipses and
|
||||
Bézier curves.
|
||||
|
||||
http://www.imagemagick.org/
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 e7c1b19923bb97ed456c78b63b3259b809ebc8e3967c6d086450370c67eedf06 7.0.7-39.tar.gz
|
||||
sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c LICENSE
|
||||
sha256 2a1ca5f9c38e6596a5ee9fdbbaebba1d21b57618e892c72c8e4e63ced571af40 7.0.8-42.tar.gz
|
||||
sha256 5b47db932754743460eba7a226aea85b63e3408d3c7affb4d0117f70c9594ded LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IMAGEMAGICK_VERSION = 7.0.7-39
|
||||
IMAGEMAGICK_VERSION = 7.0.8-42
|
||||
IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz
|
||||
IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive
|
||||
IMAGEMAGICK_LICENSE = Apache-2.0
|
||||
@@ -40,6 +40,14 @@ IMAGEMAGICK_CONF_OPTS = \
|
||||
|
||||
IMAGEMAGICK_DEPENDENCIES = host-pkgconf
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
|
||||
# Like postgreSQL, imagemagick does not build against uClibc with
|
||||
# locales enabled, due to an uClibc bug, see
|
||||
# http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html
|
||||
# so overwrite automatic detection and disable locale support
|
||||
IMAGEMAGICK_CONF_ENV += ac_cv_func_newlocale=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-fontconfig
|
||||
IMAGEMAGICK_DEPENDENCIES += fontconfig
|
||||
@@ -113,11 +121,11 @@ else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FFTW),y)
|
||||
ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y)
|
||||
# configure script misdetects these leading to build errors
|
||||
IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes
|
||||
IMAGEMAGICK_CONF_OPTS += --with-fftw
|
||||
IMAGEMAGICK_DEPENDENCIES += fftw
|
||||
IMAGEMAGICK_DEPENDENCIES += fftw-double
|
||||
else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-fftw
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user