commit: 007e54fcfd0d8d1c3a29e16db246490066181d09 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jul 20 00:04:24 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 20 00:05:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=007e54fc
media-libs/libwebp: fix libpng linkage Was being thrown away w/ -Wl,--as-needed b/c lost the -D, but also fix ./configure output too. Closes: https://bugs.gentoo.org/859430 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libwebp-1.2.3-libpng-pkg-config.patch | 32 ++++++---------------- ...ibwebp-1.2.3.ebuild => libwebp-1.2.3-r1.ebuild} | 0 2 files changed, 9 insertions(+), 23 deletions(-) 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 index fe33b97fa270..b219206c23b0 100644 --- 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 @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -518,43 +518,15 @@ AS_IF([test "x$enable_sdl" != "xno"], [ +@@ -518,42 +518,20 @@ AS_IF([test "x$enable_sdl" != "xno"], [ AM_CONDITIONAL([BUILD_VWEBP_SDL], [test "$build_vwebp_sdl" = "yes"]) dnl === check for PNG support === @@ -18,9 +18,13 @@ - PNG_INCLUDES=`$LIBPNG_CONFIG --cflags` - PNG_LIBS="`$LIBPNG_CONFIG --ldflags`" - fi -- ++ LIBCHECK_PROLOGUE([PNG]) ++ PKG_CHECK_MODULES([LIBPNG], [libpng]) + - WITHLIB_OPTION([png], [PNG]) -- ++ AC_DEFINE(WEBP_HAVE_PNG, [1], [Set to 1 if PNG library is installed]) ++ png_support=yes + - LIBCHECK_PROLOGUE([PNG]) - AC_CHECK_HEADER(png.h, - AC_SEARCH_LIBS(png_get_libpng_ver, [png], @@ -41,26 +45,8 @@ - PNG_INCLUDES="" - ], - ) -- LIBCHECK_EPILOGUE([PNG]) -+ PKG_CHECK_MODULES([LIBPNG], [libpng]) -+ PNG_INCLUDES="${LIBPNG_CFLAGS}" ++ PNG_INCLUDES="${LIBPNG_CFLAGS} -DWEBP_HAVE_PNG" + PNG_LIBS="${LIBPNG_LIBS}" + LIBCHECK_EPILOGUE([PNG]) ]) - 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 === diff --git a/media-libs/libwebp/libwebp-1.2.3.ebuild b/media-libs/libwebp/libwebp-1.2.3-r1.ebuild similarity index 100% rename from media-libs/libwebp/libwebp-1.2.3.ebuild rename to media-libs/libwebp/libwebp-1.2.3-r1.ebuild
