From 1fd4e372381e1318aae1b7d3338c04156e5da974 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Jul 2022 19:46:11 +0100 Subject: gentoo auto-resync : 16:07:2022 - 19:46:10 --- .../files/libwebp-1.2.3-libpng-pkg-config.patch | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 media-libs/libwebp/files/libwebp-1.2.3-libpng-pkg-config.patch (limited to 'media-libs/libwebp/files/libwebp-1.2.3-libpng-pkg-config.patch') diff --git a/media-libs/libwebp/files/libwebp-1.2.3-libpng-pkg-config.patch b/media-libs/libwebp/files/libwebp-1.2.3-libpng-pkg-config.patch new file mode 100644 index 000000000000..fe33b97fa270 --- /dev/null +++ b/media-libs/libwebp/files/libwebp-1.2.3-libpng-pkg-config.patch @@ -0,0 +1,66 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -518,43 +518,15 @@ AS_IF([test "x$enable_sdl" != "xno"], [ + AM_CONDITIONAL([BUILD_VWEBP_SDL], [test "$build_vwebp_sdl" = "yes"]) + + dnl === check for PNG support === ++PKG_PROG_PKG_CONFIG + + AC_ARG_ENABLE([png], AS_HELP_STRING([--disable-png], + [Disable detection of PNG format support + @<:@default=auto@:>@])) + AS_IF([test "x$enable_png" != "xno"], [ +- CLEAR_LIBVARS([PNG]) +- AC_PATH_PROGS([LIBPNG_CONFIG], +- [libpng-config libpng16-config libpng15-config libpng14-config \ +- libpng12-config]) +- if test -n "$LIBPNG_CONFIG"; then +- PNG_INCLUDES=`$LIBPNG_CONFIG --cflags` +- PNG_LIBS="`$LIBPNG_CONFIG --ldflags`" +- fi +- +- WITHLIB_OPTION([png], [PNG]) +- +- LIBCHECK_PROLOGUE([PNG]) +- AC_CHECK_HEADER(png.h, +- AC_SEARCH_LIBS(png_get_libpng_ver, [png], +- [test "$ac_cv_search_png_get_libpng_ver" = "none required" \ +- || PNG_LIBS="$PNG_LIBS $ac_cv_search_png_get_libpng_ver" +- PNG_INCLUDES="$PNG_INCLUDES -DWEBP_HAVE_PNG" +- AC_DEFINE(WEBP_HAVE_PNG, [1], +- [Set to 1 if PNG library is installed]) +- png_support=yes +- ], +- [AC_MSG_WARN(Optional png library not found) +- PNG_LIBS="" +- PNG_INCLUDES="" +- ], +- [$MATH_LIBS]), +- [AC_MSG_WARN(png library not available - no png.h) +- PNG_LIBS="" +- PNG_INCLUDES="" +- ], +- ) +- LIBCHECK_EPILOGUE([PNG]) ++ PKG_CHECK_MODULES([LIBPNG], [libpng]) ++ PNG_INCLUDES="${LIBPNG_CFLAGS}" ++ PNG_LIBS="${LIBPNG_LIBS}" + ]) + + dnl === check for JPEG support === +diff --git a/configure.ac b/configure.ac +index b7a0d3e..5709913 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -524,9 +524,11 @@ AC_ARG_ENABLE([png], AS_HELP_STRING([--disable-png], + [Disable detection of PNG format support + @<:@default=auto@:>@])) + AS_IF([test "x$enable_png" != "xno"], [ ++ LIBCHECK_PROLOGUE([PNG]) + PKG_CHECK_MODULES([LIBPNG], [libpng]) + PNG_INCLUDES="${LIBPNG_CFLAGS}" + PNG_LIBS="${LIBPNG_LIBS}" ++ LIBCHECK_EPILOGUE([PNG]) + ]) + + dnl === check for JPEG support === -- cgit v1.2.3