diff options
| author | Haibo Huang <hhb@google.com> | 2019-12-29 11:19:42 -0800 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-12-29 11:29:54 -0800 |
| commit | 05d45b04c079c65263b6aea8e19b702e60d06eab (patch) | |
| tree | a7e2baef36f9bcb473fb0bfadf3f9a6d6adf7b93 /config | |
| parent | e19a1b942eb189f31ed579f552d1b45e3c1c6087 (diff) | |
| parent | f6ac9af7bf81558e6d86d8d702ebac054d2f2ed2 (diff) | |
| download | ImageMagick-05d45b04c079c65263b6aea8e19b702e60d06eab.tar.gz | |
Upgrade ImageMagick to 'f6ac9af7bf81558e6d86d8d702ebac054d2f2ed2'
This fixed the issue that caused the revert of aosp/1198489
Change-Id: I671140adb5d61561132a02c4327c7102d0c430b7
Diffstat (limited to 'config')
| -rw-r--r-- | config/configure.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config/configure.xml b/config/configure.xml index 879172bb3..f267a1bca 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,36 +10,36 @@ ImageMagick build configuration. --> <configuremap> - <configure name="CC" value="/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang"/> + <configure name="CC" value="/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang"/> <configure name="CFLAGS" value=" -fopenmp -fPIE -fPIC -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/> <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/coders"/> <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick-7/"/> - <configure name="CONFIGURE" value="./configure '--host=x86_64-linux-android' '--without-zlib' 'host_alias=x86_64-linux-android' 'CC=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'LDFLAGS=-pie' 'CXX=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++'"/> + <configure name="CONFIGURE" value="./configure '--host=x86_64-linux-android' '--without-zlib' 'host_alias=x86_64-linux-android' 'CC=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'LDFLAGS=-pie' 'CXX=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++'"/> <configure name="COPYRIGHT" value="Copyright (C) 1999-2020 ImageMagick Studio LLC"/> <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick-7"/> <configure name="CXXFLAGS" value="-g -O2 -pthread"/> - <configure name="CXX" value="/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++"/> + <configure name="CXX" value="/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++"/> <configure name="DEFS" value="-DHAVE_CONFIG_H"/> <configure name="DELEGATES" value="mpeg ps"/> - <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'CXX=/src/ndk/out/android-ndk-r22-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++' 'LDFLAGS=-pie' --disable-deprecated --with-quantum-depth=16 --with-jemalloc=no --with-umem=no --with-zlib=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-rsvg=no --with-perl=no "/> + <configure name="DISTCHECK_CONFIG_FLAGS" value="'CC=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang' 'CFLAGS=-fPIE -fPIC' 'CXX=/src/ndk/out/android-ndk-r21-canary/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android28-clang++' 'LDFLAGS=-pie' --disable-deprecated --with-quantum-depth=16 --with-jemalloc=no --with-umem=no --with-zlib=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-rsvg=no --with-perl=no "/> <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-7"/> <configure name="EXEC-PREFIX" value="/usr/local"/> <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/> <configure name="FEATURES" value="DPC HDRI Cipher OpenMP"/> <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.9/modules-Q16HDRI/filters"/> - <configure name="GIT_REVISION" value="16549:6da7143d9:20191222" /> + <configure name="GIT_REVISION" value="16588:7fdd47ede:20191227" /> <configure name="HOST" value="x86_64-pc-linux-android"/> <configure name="INCLUDE_PATH" value="/usr/local/include/ImageMagick-7"/> <configure name="LDFLAGS" value="-L/usr/local/lib -pie"/> <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.9"/> <configure name="LIBS" value=" -lm "/> - <configure name="LIB_VERSION_NUMBER" value="7,0,9,11"/> + <configure name="LIB_VERSION_NUMBER" value="7,0,9,13"/> <configure name="LIB_VERSION" value="0x709"/> <configure name="NAME" value="ImageMagick"/> <configure name="PCFLAGS" value="-fopenmp -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/> <configure name="PREFIX" value="/usr/local"/> <configure name="QuantumDepth" value="16"/> - <configure name="RELEASE_DATE" value="2019-12-23"/> + <configure name="RELEASE_DATE" value="2019-12-29"/> <configure name="SHAREARCH_PATH" value="/usr/local/lib/ImageMagick-7.0.9/config-Q16HDRI"/> <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7"/> <configure name="TARGET_CPU" value="x86_64"/> |