GraphicsMagick: Enable JXL and HEIF in the oss-fuzz build.
GraphicsMagick Commits <[email protected]> Sat, 02 Dec 2023 10:37:54 -0600
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.8485.1701535084.7940.graphicsmagick-commit@lists.sourceforge.net> |
changeset e83ca0dead36 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=e83ca0dead36 summary: Enable JXL and HEIF in the oss-fuzz build. diffstat: ChangeLog | 11 + VisualMagick/installer/inc/version.isx | 4 +- configure | 141 ++++++++++---- configure.ac | 141 ++++++++++---- fuzzing/coder_list.cc | 12 + fuzzing/oss-fuzz-build.sh | 310 ++++++++++++++++++-------------- magick/version.h | 4 +- www/Changelog.html | 11 + 8 files changed, 405 insertions(+), 229 deletions(-) diffs (truncated from 1092 to 500 lines): diff -r eda85ada83a6 -r e83ca0dead36 ChangeLog --- a/ChangeLog Thu Nov 30 16:50:56 2023 -0600 +++ b/ChangeLog Sat Dec 02 10:37:50 2023 -0600 @@ -1,3 +1,14 @@ +2023-12-02 Bob Friesenhahn <[email protected]> + + * configure.ac: Print data returned from PKG_CHECK_MODULES if + VERBOSE is defined to some value. + + * fuzzing/oss-fuzz-build.sh: Add LIBS=-lc++ until GM's static + linking with C++ libraries is perfected. Enable JXL and HEIF in + the oss-fuzz build. + + * fuzzing/coder_list.cc: Exclude more formats. + 2023-11-30 Bob Friesenhahn <[email protected]> * fuzzing/oss-fuzz-build.sh: Add bzip2 and libjbig to the oss-fuzz diff -r eda85ada83a6 -r e83ca0dead36 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Thu Nov 30 16:50:56 2023 -0600 +++ b/VisualMagick/installer/inc/version.isx Sat Dec 02 10:37:50 2023 -0600 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020231130" -#define public MagickPackageReleaseDate "snapshot-20231130" +#define public MagickPackageVersionAddendum ".020231202" +#define public MagickPackageReleaseDate "snapshot-20231202" diff -r eda85ada83a6 -r e83ca0dead36 configure --- a/configure Thu Nov 30 16:50:56 2023 -0600 +++ b/configure Sat Dec 02 10:37:50 2023 -0600 @@ -3253,6 +3253,7 @@ # # Save initial user-tunable values # +#printf "LIBS=${LIBS}\n" LIBS_USER=$LIBS for var in CC CFLAGS CPPFLAGS CXX CXXCPP LDFLAGS LIBS ; do eval isset=\${$var+set} @@ -23981,9 +23982,12 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "ZLIB_LIBS=${ZLIB_LIBS}\n" - #printf "ZLIB_CFLAGS=${ZLIB_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "ZLIB_LIBS=${ZLIB_LIBS}\n" + printf "ZLIB_CFLAGS=${ZLIB_CFLAGS}\n" + fi pkg_config_to_flags 'zlib' "${ZLIB_LIBS}" "${ZLIB_CFLAGS}" fi ac_fn_c_check_header_mongrel "$LINENO" "zconf.h" "ac_cv_header_zconf_h" "$ac_includes_default" @@ -24534,9 +24538,12 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "LZMA_LIBS=${LZMA_LIBS}\n" - #printf "LZMA_CFLAGS=${LZMA_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "LZMA_LIBS=${LZMA_LIBS}\n" + printf "LZMA_CFLAGS=${LZMA_CFLAGS}\n" + fi pkg_config_to_flags 'liblzma' "${LZMA_LIBS}" "${LZMA_CFLAGS}" fi ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default" @@ -24720,9 +24727,12 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "ZSTD_LIBS=${ZSTD_LIBS}\n" - #printf "ZSTD_CFLAGS=${ZSTD_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "ZSTD_LIBS=${ZSTD_LIBS}\n" + printf "ZSTD_CFLAGS=${ZSTD_CFLAGS}\n" + fi pkg_config_to_flags 'libzstd' "${ZSTD_LIBS}" "${ZSTD_CFLAGS}" fi ac_fn_c_check_header_mongrel "$LINENO" "zstd.h" "ac_cv_header_zstd_h" "$ac_includes_default" @@ -24905,10 +24915,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "XML_LIBS=${XML_LIBS}\n" - #printf "XML_CFLAGS=${XML_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libxml-2.0' "${XML_LIBS}" "${XML_CFLAGS}" + if test -n "$VERBOSE" + then + printf "XML_LIBS=${XML_LIBS}\n" + printf "XML_CFLAGS=${XML_CFLAGS}\n" + fi + pkg_config_to_flags 'libxml-2.0' "${XML_LIBS}" "${XML_CFLAGS}" fi failed=0 passed=0 @@ -26437,10 +26450,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "LCMS2_LIBS=${LCMS2_LIBS}\n" - #printf "LCMS2_CFLAGS=${LCMS2_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'lcms2' "${LCMS2_LIBS}" "${LCMS2_CFLAGS}" + if test -n "$VERBOSE" + then + printf "LCMS2_LIBS=${LCMS2_LIBS}\n" + printf "LCMS2_CFLAGS=${LCMS2_CFLAGS}\n" + fi + pkg_config_to_flags 'lcms2' "${LCMS2_LIBS}" "${LCMS2_CFLAGS}" fi # Check for <lcms2.h> @@ -26652,10 +26668,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "PNG_LIBS=${PNG_LIBS}\n" - #printf "PNG_CFLAGS=${PNG_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libpng' "${PNG_LIBS}" "${PNG_CFLAGS}" + if test -n "$VERBOSE" + then + printf "PNG_LIBS=${PNG_LIBS}\n" + printf "PNG_CFLAGS=${PNG_CFLAGS}\n" + fi + pkg_config_to_flags 'libpng' "${PNG_LIBS}" "${PNG_CFLAGS}" fi if test "$with_png" != 'yes'; then @@ -27267,9 +27286,12 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "JPEG_LIBS=${JPEG_LIBS}\n" - #printf "JPEG_CFLAGS=${JPEG_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "JPEG_LIBS=${JPEG_LIBS}\n" + printf "JPEG_CFLAGS=${JPEG_CFLAGS}\n" + fi pkg_config_to_flags 'libjpeg' "${JPEG_LIBS}" "${JPEG_CFLAGS}" fi @@ -27533,10 +27555,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "FREETYPE_LIBS=${FREETYPE_LIBS}\n" - #printf "FREETYPE_CFLAGS=${FREETYPE_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'freetype2' "${FREETYPE_LIBS}" "${FREETYPE_CFLAGS}" + if test -n "$VERBOSE" + then + printf "FREETYPE_LIBS=${FREETYPE_LIBS}\n" + printf "FREETYPE_CFLAGS=${FREETYPE_CFLAGS}\n" + fi + pkg_config_to_flags 'freetype2' "${FREETYPE_LIBS}" "${FREETYPE_CFLAGS}" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 @@ -27787,18 +27812,24 @@ $as_echo "yes" >&6; } fi - #printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n" - #printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libwebpmux' "${WEBPMUX_LIBS}" "${WEBPMUX_CFLAGS}" + if test -n "$VERBOSE" + then + printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n" + printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n" + fi + pkg_config_to_flags 'libwebpmux' "${WEBPMUX_LIBS}" "${WEBPMUX_CFLAGS}" fi # We are not currently using libwebpdemux #PKG_CHECK_MODULES([WEBPDEMUX], [libwebpdemux], [], []) - #printf "WEBPDMUX_LIBS=${WEBPDMUX_LIBS}\n" - #printf "WEBPDMUX_CFLAGS=${WEBPDMUX_CFLAGS}\n" #if test $failed -eq 0 ; then - # pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}" + # if test -n "$VERBOSE" + # then + # printf "WEBPDMUX_LIBS=${WEBPDMUX_LIBS}\n" + # printf "WEBPDMUX_CFLAGS=${WEBPDMUX_CFLAGS}\n" + # fi + # pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}" #fi # pkg-config libwebp --static --libs @@ -27874,10 +27905,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "WEBP_LIBS=${WEBP_LIBS}\n" - #printf "WEBP_CFLAGS=${WEBP_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libwebp' "${WEBP_LIBS}" "${WEBP_CFLAGS}" + if test -n "$VERBOSE" + then + printf "WEBP_LIBS=${WEBP_LIBS}\n" + printf "WEBP_CFLAGS=${WEBP_CFLAGS}\n" + fi + pkg_config_to_flags 'libwebp' "${WEBP_LIBS}" "${WEBP_CFLAGS}" fi ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default" @@ -28250,8 +28284,11 @@ #set -x if test $failed -eq 0 then - #printf "TIFF_LIBS=${TIFF_LIBS}\n" - #printf "TIFF_CFLAGS=${TIFF_CFLAGS}\n" + if test -n "$VERBOSE" + then + printf "TIFF_LIBS=${TIFF_LIBS}\n" + printf "TIFF_CFLAGS=${TIFF_CFLAGS}\n" + fi pkg_config_to_flags 'libtiff-4' "${TIFF_LIBS}" "${TIFF_CFLAGS}" fi #set +x @@ -28649,10 +28686,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "LIBJXL_THREADS_LIBS=${LIBJXL_THREADS_LIBS}\n" - #printf "LIBJXL_THREADS_CFLAGS=${LIBJXL_THREADS_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libjxl_threads' "${LIBJXL_THREADS_LIBS}" "${LIBJXL_THREADS_CFLAGS}" + if test -n "$VERBOSE" + then + printf "LIBJXL_THREADS_LIBS=${LIBJXL_THREADS_LIBS}\n" + printf "LIBJXL_THREADS_CFLAGS=${LIBJXL_THREADS_CFLAGS}\n" + fi + pkg_config_to_flags 'libjxl_threads' "${LIBJXL_THREADS_LIBS}" "${LIBJXL_THREADS_CFLAGS}" fi # [libjxl @@ -28727,10 +28767,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "LIBJXL_LIBS=${LIBJXL_LIBS}\n" - #printf "LIBJXL_CFLAGS=${LIBJXL_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libjxl' "${LIBJXL_LIBS}" "${LIBJXL_CFLAGS}" + if test -n "$VERBOSE" + then + printf "LIBJXL_LIBS=${LIBJXL_LIBS}\n" + printf "LIBJXL_CFLAGS=${LIBJXL_CFLAGS}\n" + fi + pkg_config_to_flags 'libjxl' "${LIBJXL_LIBS}" "${LIBJXL_CFLAGS}" fi ac_fn_cxx_check_header_mongrel "$LINENO" "jxl/decode.h" "ac_cv_header_jxl_decode_h" "$ac_includes_default" @@ -29127,10 +29170,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "HEIF_LIBS=${HEIF_LIBS}\n" - #printf "HEIF_CFLAGS=${HEIF_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libheif' "${HEIF_LIBS}" "${HEIF_CFLAGS}" + if test -n "$VERBOSE" + then + printf "HEIF_LIBS=${HEIF_LIBS}\n" + printf "HEIF_CFLAGS=${HEIF_CFLAGS}\n" + fi + pkg_config_to_flags 'libheif' "${HEIF_LIBS}" "${HEIF_CFLAGS}" fi ac_fn_c_check_header_mongrel "$LINENO" "libheif/heif.h" "ac_cv_header_libheif_heif_h" "$ac_includes_default" if test "x$ac_cv_header_libheif_heif_h" = xyes; then : @@ -29344,10 +29390,13 @@ $as_echo "yes" >&6; } passed=`expr $passed + 1` fi - #printf "JASPER_LIBS=${JASPER_LIBS}\n" - #printf "JASPER_CFLAGS=${JASPER_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'jasper' "${JASPER_LIBS}" "${JASPER_CFLAGS}" + if test -n "$VERBOSE" + then + printf "JASPER_LIBS=${JASPER_LIBS}\n" + printf "JASPER_CFLAGS=${JASPER_CFLAGS}\n" + fi + pkg_config_to_flags 'jasper' "${JASPER_LIBS}" "${JASPER_CFLAGS}" fi ac_fn_c_check_header_mongrel "$LINENO" "jasper/jasper.h" "ac_cv_header_jasper_jasper_h" "$ac_includes_default" @@ -32037,10 +32086,12 @@ # to be built as modules. This requires libltdl ($LIB_LTDL). # Removed $LIB_OMP and $LIB_THREAD +#printf "LIBS=${LIBS}\n" + if test "$build_modules" != 'no' then MAGICK_DEP_LIBS='' - for token in $LIBS_USER $LCMS2_LIBS $FREETYPE_LIBS $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $ZLIB_LIBS $LIB_LTDL $LIB_TRIO $LIB_GDI32 $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC + for token in $LCMS2_LIBS $FREETYPE_LIBS $LIB_GS $LIB_XEXT $LIB_IPC $LIB_X11 $LIB_BZLIB $ZLIB_LIBS $LIB_LTDL $LIB_TRIO $LIB_GDI32 $LIBS_USER $LIB_MATH $LIB_THREAD $LIB_TCMALLOC $LIB_UMEM $LIB_MTMALLOC do case $token in -l*) @@ -32068,6 +32119,8 @@ MAGICK_DEP_LIBS="$LIBS" fi MAGICK_EXTRA_DEP_LIBS="$LIB_OMP" # Extra libraries typically added due to CFLAGS +#printf "MAGICK_DEP_LIBS=${MAGICK_DEP_LIBS}\n" +#printf "MAGICK_EXTRA_DEP_LIBS=${MAGICK_EXTRA_DEP_LIBS}\n" diff -r eda85ada83a6 -r e83ca0dead36 configure.ac --- a/configure.ac Thu Nov 30 16:50:56 2023 -0600 +++ b/configure.ac Sat Dec 02 10:37:50 2023 -0600 @@ -26,6 +26,7 @@ # # Save initial user-tunable values # +#printf "LIBS=${LIBS}\n" LIBS_USER=$LIBS for var in CC CFLAGS CPPFLAGS CXX CXXCPP LDFLAGS LIBS ; do eval isset=\${$var+set} @@ -1850,9 +1851,12 @@ failed=0 passed=0 PKG_CHECK_MODULES([ZLIB], [zlib], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "ZLIB_LIBS=${ZLIB_LIBS}\n" - #printf "ZLIB_CFLAGS=${ZLIB_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "ZLIB_LIBS=${ZLIB_LIBS}\n" + printf "ZLIB_CFLAGS=${ZLIB_CFLAGS}\n" + fi pkg_config_to_flags 'zlib' "${ZLIB_LIBS}" "${ZLIB_CFLAGS}" fi AC_CHECK_HEADER([zconf.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) @@ -1958,9 +1962,12 @@ failed=0 passed=0 PKG_CHECK_MODULES([LZMA], [liblzma], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "LZMA_LIBS=${LZMA_LIBS}\n" - #printf "LZMA_CFLAGS=${LZMA_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "LZMA_LIBS=${LZMA_LIBS}\n" + printf "LZMA_CFLAGS=${LZMA_CFLAGS}\n" + fi pkg_config_to_flags 'liblzma' "${LZMA_LIBS}" "${LZMA_CFLAGS}" fi AC_CHECK_HEADER([lzma.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) @@ -2011,9 +2018,12 @@ OLD_LDFLAGS=$LDFLAGS OLD_LIBS=$LIBS PKG_CHECK_MODULES([ZSTD], [libzstd], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "ZSTD_LIBS=${ZSTD_LIBS}\n" - #printf "ZSTD_CFLAGS=${ZSTD_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "ZSTD_LIBS=${ZSTD_LIBS}\n" + printf "ZSTD_CFLAGS=${ZSTD_CFLAGS}\n" + fi pkg_config_to_flags 'libzstd' "${ZSTD_LIBS}" "${ZSTD_CFLAGS}" fi AC_CHECK_HEADER([zstd.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`]) @@ -2063,10 +2073,13 @@ xml2_cflags='' xml2_libs='' PKG_CHECK_MODULES([XML], [libxml-2.0], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "XML_LIBS=${XML_LIBS}\n" - #printf "XML_CFLAGS=${XML_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libxml-2.0' "${XML_LIBS}" "${XML_CFLAGS}" + if test -n "$VERBOSE" + then + printf "XML_LIBS=${XML_LIBS}\n" + printf "XML_CFLAGS=${XML_CFLAGS}\n" + fi + pkg_config_to_flags 'libxml-2.0' "${XML_LIBS}" "${XML_CFLAGS}" fi failed=0 passed=0 @@ -2280,10 +2293,13 @@ have_lcms_header='no' PKG_CHECK_MODULES([LCMS2], [lcms2], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "LCMS2_LIBS=${LCMS2_LIBS}\n" - #printf "LCMS2_CFLAGS=${LCMS2_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'lcms2' "${LCMS2_LIBS}" "${LCMS2_CFLAGS}" + if test -n "$VERBOSE" + then + printf "LCMS2_LIBS=${LCMS2_LIBS}\n" + printf "LCMS2_CFLAGS=${LCMS2_CFLAGS}\n" + fi + pkg_config_to_flags 'lcms2' "${LCMS2_LIBS}" "${LCMS2_CFLAGS}" fi # Check for <lcms2.h> @@ -2357,10 +2373,13 @@ failed=0 passed=0 PKG_CHECK_MODULES([PNG], [libpng], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "PNG_LIBS=${PNG_LIBS}\n" - #printf "PNG_CFLAGS=${PNG_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libpng' "${PNG_LIBS}" "${PNG_CFLAGS}" + if test -n "$VERBOSE" + then + printf "PNG_LIBS=${PNG_LIBS}\n" + printf "PNG_CFLAGS=${PNG_CFLAGS}\n" + fi + pkg_config_to_flags 'libpng' "${PNG_LIBS}" "${PNG_CFLAGS}" fi if test "$with_png" != 'yes'; then @@ -2482,9 +2501,12 @@ PKG_CHECK_MODULES([JPEG], [libturbojpeg], [passed=`expr $passed + 1`], [PKG_CHECK_MODULES([JPEG], [libjpeg], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`])]) - #printf "JPEG_LIBS=${JPEG_LIBS}\n" - #printf "JPEG_CFLAGS=${JPEG_CFLAGS}\n" if test $failed -eq 0 ; then + if test -n "$VERBOSE" + then + printf "JPEG_LIBS=${JPEG_LIBS}\n" + printf "JPEG_CFLAGS=${JPEG_CFLAGS}\n" + fi pkg_config_to_flags 'libjpeg' "${JPEG_LIBS}" "${JPEG_CFLAGS}" fi @@ -2583,10 +2605,13 @@ freeype_libs='' freetype_config='' PKG_CHECK_MODULES([FREETYPE], [freetype2], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "FREETYPE_LIBS=${FREETYPE_LIBS}\n" - #printf "FREETYPE_CFLAGS=${FREETYPE_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'freetype2' "${FREETYPE_LIBS}" "${FREETYPE_CFLAGS}" + if test -n "$VERBOSE" + then + printf "FREETYPE_LIBS=${FREETYPE_LIBS}\n" + printf "FREETYPE_CFLAGS=${FREETYPE_CFLAGS}\n" + fi + pkg_config_to_flags 'freetype2' "${FREETYPE_LIBS}" "${FREETYPE_CFLAGS}" fi dnl First see if there is a library @@ -2677,27 +2702,36 @@ # libwebp, libwebpmux, libwebpdemux PKG_CHECK_MODULES([WEBPMUX], [libwebpmux], [], []) - #printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n" - #printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libwebpmux' "${WEBPMUX_LIBS}" "${WEBPMUX_CFLAGS}" + if test -n "$VERBOSE" + then + printf "WEBPMUX_LIBS=${WEBPMUX_LIBS}\n" + printf "WEBPMUX_CFLAGS=${WEBPMUX_CFLAGS}\n" + fi + pkg_config_to_flags 'libwebpmux' "${WEBPMUX_LIBS}" "${WEBPMUX_CFLAGS}" fi # We are not currently using libwebpdemux #PKG_CHECK_MODULES([WEBPDEMUX], [libwebpdemux], [], []) - #printf "WEBPDMUX_LIBS=${WEBPDMUX_LIBS}\n" - #printf "WEBPDMUX_CFLAGS=${WEBPDMUX_CFLAGS}\n" #if test $failed -eq 0 ; then - # pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}" + # if test -n "$VERBOSE" + # then + # printf "WEBPDMUX_LIBS=${WEBPDMUX_LIBS}\n" + # printf "WEBPDMUX_CFLAGS=${WEBPDMUX_CFLAGS}\n" + # fi + # pkg_config_to_flags 'libwebpdemux' "${WEBPDMUX_LIBS}" "${WEBPDMUX_CFLAGS}" #fi # pkg-config libwebp --static --libs #-L/work/lib -lwebp -lm -lsharpyuv -lm PKG_CHECK_MODULES([WEBP], [libwebp], [passed=`expr $passed + 1`], [failed=`expr $failed + 1`]) - #printf "WEBP_LIBS=${WEBP_LIBS}\n" - #printf "WEBP_CFLAGS=${WEBP_CFLAGS}\n" if test $failed -eq 0 ; then - pkg_config_to_flags 'libwebp' "${WEBP_LIBS}" "${WEBP_CFLAGS}" + if test -n "$VERBOSE" + then + printf "WEBP_LIBS=${WEBP_LIBS}\n"