install_deps: Tweak rBbc9c9631a46f, libwebp is not only a dependency from ffmpeg.
This commit is contained in:
parent
b6eb7dae59
commit
043555c78f
@ -4004,6 +4004,7 @@ install_DEB() {
|
|||||||
WEBP_DEV="libwebp-dev"
|
WEBP_DEV="libwebp-dev"
|
||||||
check_package_DEB $WEBP_DEV
|
check_package_DEB $WEBP_DEV
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
|
install_packages_DEB $WEBP_DEV
|
||||||
WEBP_USE=true
|
WEBP_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -4435,9 +4436,6 @@ install_DEB() {
|
|||||||
if [ "$VPX_USE" = true ]; then
|
if [ "$VPX_USE" = true ]; then
|
||||||
_packages="$_packages $VPX_DEV"
|
_packages="$_packages $VPX_DEV"
|
||||||
fi
|
fi
|
||||||
if [ "$WEBP_USE" = true ]; then
|
|
||||||
_packages="$_packages $WEBP_DEV"
|
|
||||||
fi
|
|
||||||
if [ "$OPUS_USE" = true ]; then
|
if [ "$OPUS_USE" = true ]; then
|
||||||
_packages="$_packages $OPUS_DEV"
|
_packages="$_packages $OPUS_DEV"
|
||||||
fi
|
fi
|
||||||
@ -4722,6 +4720,7 @@ install_RPM() {
|
|||||||
WEBP_DEV="libwebp-devel"
|
WEBP_DEV="libwebp-devel"
|
||||||
check_package_RPM $WEBP_DEV
|
check_package_RPM $WEBP_DEV
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
|
install_packages_RPM $WEBP_DEV
|
||||||
WEBP_USE=true
|
WEBP_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -5124,9 +5123,6 @@ install_RPM() {
|
|||||||
if [ "$VPX_USE" = true ]; then
|
if [ "$VPX_USE" = true ]; then
|
||||||
_packages="$_packages $VPX_DEV"
|
_packages="$_packages $VPX_DEV"
|
||||||
fi
|
fi
|
||||||
if [ "$WEBP_USE" = true ]; then
|
|
||||||
_packages="$_packages $WEBP_DEV"
|
|
||||||
fi
|
|
||||||
if [ "$OPUS_USE" = true ]; then
|
if [ "$OPUS_USE" = true ]; then
|
||||||
_packages="$_packages $OPUS_DEV"
|
_packages="$_packages $OPUS_DEV"
|
||||||
fi
|
fi
|
||||||
@ -5300,6 +5296,7 @@ install_ARCH() {
|
|||||||
WEBP_DEV="libwebp"
|
WEBP_DEV="libwebp"
|
||||||
check_package_ARCH $WEBP_DEV
|
check_package_ARCH $WEBP_DEV
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
|
install_packages_ARCH $WEBP_DEV
|
||||||
WEBP_USE=true
|
WEBP_USE=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -5704,16 +5701,12 @@ install_ARCH() {
|
|||||||
if [ "$VPX_USE" = true ]; then
|
if [ "$VPX_USE" = true ]; then
|
||||||
_packages="$_packages $VPX_DEV"
|
_packages="$_packages $VPX_DEV"
|
||||||
fi
|
fi
|
||||||
if [ "$WEBP_USE" = true ]; then
|
|
||||||
_packages="$_packages $WEBP_DEV"
|
|
||||||
fi
|
|
||||||
if [ "$OPUS_USE" = true ]; then
|
if [ "$OPUS_USE" = true ]; then
|
||||||
_packages="$_packages $OPUS_DEV"
|
_packages="$_packages $OPUS_DEV"
|
||||||
fi
|
fi
|
||||||
if [ "$MP3LAME_USE" = true ]; then
|
if [ "$MP3LAME_USE" = true ]; then
|
||||||
_packages="$_packages $MP3LAME_DEV"
|
_packages="$_packages $MP3LAME_DEV"
|
||||||
fi
|
fi
|
||||||
install_packages_ARCH $_packages
|
|
||||||
|
|
||||||
compile_FFmpeg
|
compile_FFmpeg
|
||||||
fi
|
fi
|
||||||
@ -5961,6 +5954,12 @@ print_info() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$WEBP_USE" = true ]; then
|
||||||
|
_1="-D WITH_IMAGE_WEBP=ON"
|
||||||
|
PRINT " $_1"
|
||||||
|
_buildargs="$_buildargs $_1"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -d $INST/openexr ]; then
|
if [ -d $INST/openexr ]; then
|
||||||
_1="-D OPENEXR_ROOT_DIR=$INST/openexr"
|
_1="-D OPENEXR_ROOT_DIR=$INST/openexr"
|
||||||
PRINT " $_1"
|
PRINT " $_1"
|
||||||
|
Loading…
Reference in New Issue
Block a user