gentoo auto-resync : 20:07:2022 - 02:40:19

3 files changed, 11 insertions, 25 deletions

diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 6e8ab866d85b..fdcbd6897808 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,4 +1,4 @@
-AUX libwebp-1.2.3-libpng-pkg-config.patch 2361 BLAKE2B ed27d0f54a9839199a6d0fdb86bbe0c7cf9edcf7fee875de3443c0dd069901310424adfcc59eeb85dd4e80b1cc2d18c530fe7bc6d410a37574992577b48ab31e SHA512 c9211fb17b1c6ef586b2d63841df89c7bd01b1dc93f791bd659d6d10342c4fa49f88672706c0de7c58dadc20d661f3dde4d73a4279dd2cb398079f219744a45e
+AUX libwebp-1.2.3-libpng-pkg-config.patch 1894 BLAKE2B 80c19e65b1f913fdf0e9dd37ca603bcf89bd7dd71cf81ebd8beab6bcf671b76482b3d6d053f53558463c7f3e139897382c90aad5a5cebbd8c49ce4512e7f048c SHA512 3b80c89eb4643a315af594158ca370b71f38ab285cfaa3d1b8d90b09aa420750dccd46f1222b1b9a983af6e9dc501da2d6c732c05a2a3b097ba0437785cc80c7
 DIST libwebp-1.1.0.tar.gz 4033877 BLAKE2B ac6c2267f43ba42079975938c8fecb75237a494ab8a4ca71b68a49c3d219afa92079fd94431ccbcc363a1e6aef890642a658f429b8d75cd90dd5d735fa37dcef SHA512 c8440059a985587d4876a5e7fc2d07523bc7f582a04ee5dab0ef07df32b9635b907224de2cc15246c831dd5d9215569770196626badccc3171fe2832d7cb4549
 DIST libwebp-1.2.0.tar.gz 4092120 BLAKE2B 213b2385f646dd0fbaa7c9103b0d33a9cb5e7285d9df91107db722f514428ab8cc896704d71a3913ca1aedffeb706fcda4c7a59a3960ebc21c74ca9422632605 SHA512 c46b41899a543cc80914c89646dd607dbb5d025a9727dd83ef70994b9310eedc697666bd812141a90aa16632a9a354a031d9360a9ee1112295c7e154e69f0b74
 DIST libwebp-1.2.1.tar.gz 4100806 BLAKE2B 6bbc6dd1a3ec094a6ad0045fd483bcce055c5f3dd15022595de090c4719e5b7bfec60818a8c88886ab2546325a515526d750c9fd31017278ac6d747218570f5e SHA512 5208ac9532c89ea9fec01122cb307afacdbf5c501ed1c6056e9ffc98e2a3386e637224e0301da88ae3a32aa0c210364e1e4eac79487e465ef9e54eb9b1af80aa
@@ -8,5 +8,5 @@ EBUILD libwebp-1.1.0.ebuild 1854 BLAKE2B 8b7c661b253198816a6987d2e0d5b42572211f0
 EBUILD libwebp-1.2.0.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
 EBUILD libwebp-1.2.1.ebuild 1868 BLAKE2B 0887de53bb12d90b72f844c2716d7e3613ef3e96aac44a68ccaab1c6c5d581ab7767003e79bf5cc6ecc9cf3ec74ec5afc9d93f2792b00abb2ce56958e877dea1 SHA512 e97316bc68a5b593c4c8c098ad5790d7929adca010d776151d94492ccf2be6db1ae5726988af93d4e7d2f843bd8461cb1261f4179e939eb5670cd7f5f077557e
 EBUILD libwebp-1.2.2.ebuild 1867 BLAKE2B 2be96d10ebcf59b92a46a36c0019299774ce384863afc5b44ba4e17b147107b6016c26ac601c4199b9fecaccd6153227de7351c4097167caa8e064fc4f43077a SHA512 1f1294a3e58144d743159447f800ea8301b89bc3f1fe392b422e777f6386806467c1a86504160d9926a03ac98eebbed1a1b5f9028d5cd3052d303fa89c3043f2
-EBUILD libwebp-1.2.3.ebuild 1978 BLAKE2B 6642edb627058721992e5858fc0e82c5eb33fb16cfc54bbf19ac58beabd5933f56565cb5495f7c9fec9588a802111131bcaf34db4d2874a9a7f2c84e66f3f8fc SHA512 9e0ff1cd2628fcab4ceeefbea771c60563c5fc43d9baff06977b35903cc40430b78e2d36d25d1d0546116ef6d6d9614b2cc824409a484431ceffe64fdc08a512
+EBUILD libwebp-1.2.3-r1.ebuild 1978 BLAKE2B 6642edb627058721992e5858fc0e82c5eb33fb16cfc54bbf19ac58beabd5933f56565cb5495f7c9fec9588a802111131bcaf34db4d2874a9a7f2c84e66f3f8fc SHA512 9e0ff1cd2628fcab4ceeefbea771c60563c5fc43d9baff06977b35903cc40430b78e2d36d25d1d0546116ef6d6d9614b2cc824409a484431ceffe64fdc08a512
 MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800
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
index 32347bc9d186..32347bc9d186 100644
--- a/media-libs/libwebp/libwebp-1.2.3.ebuild
+++ b/media-libs/libwebp/libwebp-1.2.3-r1.ebuild