[Bf-blender-cvs] [fc0df1ffb4d] master: Revert "install_deps.sh: fix ffmpeg package installation on Arch"
Campbell Barton
noreply at git.blender.org
Wed Jan 22 15:43:09 CET 2020
Commit: fc0df1ffb4d37f3b86a3bf890e383a5b11c266a8
Author: Campbell Barton
Date: Thu Jan 23 01:28:18 2020 +1100
Branches: master
https://developer.blender.org/rBfc0df1ffb4d37f3b86a3bf890e383a5b11c266a8
Revert "install_deps.sh: fix ffmpeg package installation on Arch"
This reverts commit 3cb212602cacc186800c82febc86f5c68c1f92fb.
The root cause was IFS being set incorrectly.
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 8bb011f1d20..64cff825b10 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -993,13 +993,6 @@ download() {
fi
}
-string_trim() {
- local var="$*"
- var="${var#"${var%%[![:space:]]*}"}" # Leading.
- var="${var%"${var##*[![:space:]]}"}" # Trailing.
- echo -n "$var"
-}
-
# Return 0 if $1 = $2 (i.e. 1.01.0 = 1.1, but 1.1.1 != 1.1), else 1.
# $1 and $2 should be version numbers made of numbers only.
version_eq() {
@@ -4760,8 +4753,6 @@ print_info_ffmpeglink() {
_packages="$_packages $OPENJPEG_DEV"
fi
- _packages="$(string_trim $_packages)"
-
if [ "$DISTRO" = "DEB" ]; then
print_info_ffmpeglink_DEB
elif [ "$DISTRO" = "RPM" ]; then
More information about the Bf-blender-cvs
mailing list