From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Sun, 1 Apr 2018 14:06:14 +0000 (-0500)
Subject: add xz and libraw, change build process for freetype
X-Git-Tag: 7.0.7-29~218
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3453b1d7c7aaf064e9daa402e5b0f20c3b0d64b5;p=imagemagick

add xz and libraw, change build process for freetype
---

diff --git a/Magick++/fuzz/build.sh b/Magick++/fuzz/build.sh
index 16d9ae65a..36735ea91 100644
--- a/Magick++/fuzz/build.sh
+++ b/Magick++/fuzz/build.sh
@@ -7,6 +7,14 @@ make -j$(nproc) CFLAGS="$CFLAGS -fPIC"
 make install
 popd
 
+# build xz
+pushd "$SRC/xz"
+./autogen.sh
+./configure --disable-xz --disable-xzdec --disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-scripts --disable-doc --disable-shared --with-pic=yes --prefix="$WORK"
+make -j$(nproc)
+make install
+popd
+
 # Build libtiff
 pushd "$SRC/libtiff"
 ./autogen.sh
@@ -22,15 +30,21 @@ make -j$(nproc)
 make install
 popd
 
+# build libraw
+pushd "$SRC/libraw"
+autoreconf -fiv
+./configure --prefix="$WORK" --disable-shared --with-pic=yes --disable-examples PKG_CONFIG_PATH="$WORK/lib/pkgconfig"
+make -j$(nproc)
+make install
+popd
+
 # Build freetype2
 pushd "$SRC/freetype2"
-mkdir build
-pushd build
-cmake -DCMAKE_INSTALL_PREFIX=$WORK -DBUILD_SHARED_LIBS=false ..
+./autogen.sh
+./configure --prefix="$WORK" --disable-shared PKG_CONFIG_PATH="$WORK/lib/pkgconfig"
 make -j$(nproc)
 make install
 popd
-popd
 
 # Build libde265
 pushd "$SRC/libde265"
@@ -65,7 +79,7 @@ MAGICK_COMPILER=$CXX
 MAGICK_COMPILER_FLAGS=$CXXFLAGS
 MAGICK_INCLUDE="$WORK/include/ImageMagick-7"
 MAGICK_SRC="$SRC/imagemagick/Magick++/fuzz"
-MAGICK_LIBS="-lFuzzingEngine $WORK/lib/libMagick++-7.Q16HDRI.a $WORK/lib/libMagickWand-7.Q16HDRI.a $WORK/lib/libMagickCore-7.Q16HDRI.a $WORK/lib/libz.a $WORK/lib/libtiff.a $WORK/lib/libde265.a $WORK/lib/libopenjp2.a $WORK/lib/libwebp.a $WORK/lib/libturbojpeg.a $WORK/lib/libjpeg.a $WORK/lib/libfreetype.a"
+MAGICK_LIBS="-lFuzzingEngine $WORK/lib/libMagick++-7.Q16HDRI.a $WORK/lib/libMagickWand-7.Q16HDRI.a $WORK/lib/libMagickCore-7.Q16HDRI.a $WORK/lib/libz.a $WORK/lib/liblzma.a $WORK/lib/libtiff.a $WORK/lib/libde265.a $WORK/lib/libopenjp2.a $WORK/lib/libwebp.a $WORK/lib/libturbojpeg.a $WORK/lib/libjpeg.a $WORK/lib/libfreetype.a $WORK/lib/libraw.a"
 MAGICK_OUTPUT=$OUT
 MAGICK_FAST_BUILD=0