diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-04-11 15:51:37 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-04-11 15:52:26 +0300 |
| commit | 043555c78f40207c98b69c2ec287de71078c8778 (patch) | |
| tree | 2280a278cc5ecf046e8f74648d4e75054d12c372 /build_files | |
| parent | b6eb7dae59aa3150abba467b1f12517c5bac8246 (diff) | |
install_deps: Tweak rBbc9c9631a46f, libwebp is not only a dependency from ffmpeg.
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 8018ac8ff1a..ecf5d215333 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -4004,6 +4004,7 @@ install_DEB() { WEBP_DEV="libwebp-dev" check_package_DEB $WEBP_DEV if [ $? -eq 0 ]; then + install_packages_DEB $WEBP_DEV WEBP_USE=true fi @@ -4435,9 +4436,6 @@ install_DEB() { if [ "$VPX_USE" = true ]; then _packages="$_packages $VPX_DEV" fi - if [ "$WEBP_USE" = true ]; then - _packages="$_packages $WEBP_DEV" - fi if [ "$OPUS_USE" = true ]; then _packages="$_packages $OPUS_DEV" fi @@ -4722,6 +4720,7 @@ install_RPM() { WEBP_DEV="libwebp-devel" check_package_RPM $WEBP_DEV if [ $? -eq 0 ]; then + install_packages_RPM $WEBP_DEV WEBP_USE=true fi @@ -5124,9 +5123,6 @@ install_RPM() { if [ "$VPX_USE" = true ]; then _packages="$_packages $VPX_DEV" fi - if [ "$WEBP_USE" = true ]; then - _packages="$_packages $WEBP_DEV" - fi if [ "$OPUS_USE" = true ]; then _packages="$_packages $OPUS_DEV" fi @@ -5300,6 +5296,7 @@ install_ARCH() { WEBP_DEV="libwebp" check_package_ARCH $WEBP_DEV if [ $? -eq 0 ]; then + install_packages_ARCH $WEBP_DEV WEBP_USE=true fi @@ -5704,16 +5701,12 @@ install_ARCH() { if [ "$VPX_USE" = true ]; then _packages="$_packages $VPX_DEV" fi - if [ "$WEBP_USE" = true ]; then - _packages="$_packages $WEBP_DEV" - fi if [ "$OPUS_USE" = true ]; then _packages="$_packages $OPUS_DEV" fi if [ "$MP3LAME_USE" = true ]; then _packages="$_packages $MP3LAME_DEV" fi - install_packages_ARCH $_packages compile_FFmpeg fi @@ -5961,6 +5954,12 @@ print_info() { fi fi + if [ "$WEBP_USE" = true ]; then + _1="-D WITH_IMAGE_WEBP=ON" + PRINT " $_1" + _buildargs="$_buildargs $_1" + fi + if [ -d $INST/openexr ]; then _1="-D OPENEXR_ROOT_DIR=$INST/openexr" PRINT " $_1" |