Merge Begasus' fixed libwebp recipe.

Had to do it manually, there were conflicts. Closes #1879.
This commit is contained in:
Augustin Cavalier
2017-12-10 15:30:23 -05:00
parent ce55a5a91b
commit 1fbe447ecc

View File

@@ -11,7 +11,7 @@ channels."
HOMEPAGE="https://developers.google.com/speed/webp"
COPYRIGHT="2011 Google Inc."
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
SOURCE_URI="http://downloads.webmproject.org/releases/webp/libwebp-$portVersion.tar.gz"
CHECKSUM_SHA256="06503c782d9f151baa325591c3579c68ed700ffc62d4f5a32feead0ff017d8ab"
@@ -28,7 +28,6 @@ PROVIDES="
cmd:dwebp$secondaryArchSuffix
cmd:gif2webp$secondaryArchSuffix
cmd:img2webp$secondaryArchSuffix
cmd:vwebp$secondaryArchSuffix
cmd:webpmux$secondaryArchSuffix
cmd:webpinfo$secondaryArchSuffix
"
@@ -36,10 +35,7 @@ REQUIRES="
haiku$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libglu$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libSDL$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -63,10 +59,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libjpeg$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libglu$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libSDL$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 5
devel:libz$secondaryArchSuffix
"
@@ -85,7 +78,6 @@ defineDebugInfoPackage libwebp$secondaryArchSuffix \
$binDir/dwebp \
$binDir/gif2webp \
$binDir/img2webp \
$binDir/vwebp \
$binDir/webpmux \
$binDir/webpinfo \
$libDir/libwebp.so.7.0.1 \