From 882667e6ad699cdd5b873f68b9cb96221d49e80a Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 13 Apr 2020 19:07:20 -0400 Subject: [PATCH] libwebp: Allow building with libjpeg-turbo. --- media-libs/libwebp/libwebp-1.1.0.recipe | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/media-libs/libwebp/libwebp-1.1.0.recipe b/media-libs/libwebp/libwebp-1.1.0.recipe index 6dac789f6..85c541ae8 100644 --- a/media-libs/libwebp/libwebp-1.1.0.recipe +++ b/media-libs/libwebp/libwebp-1.1.0.recipe @@ -64,15 +64,11 @@ PROVIDES_devel=" REQUIRES_devel=" libwebp$secondaryArchSuffix == $portVersion base " -CONFLICTS_devel=" - libwebp5${secondaryArchSuffix}_devel - libwebp6${secondaryArchSuffix}_devel - " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libgif$secondaryArchSuffix - devel:libjpeg$secondaryArchSuffix >= 9 + devel:libjpeg$secondaryArchSuffix devel:libpng16$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libz$secondaryArchSuffix