diff options
| author | MCApollo <34170230+MCApollo@users.noreply.github.com> | 2019-04-04 01:31:28 +0000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-04-09 23:20:37 -1000 |
| commit | 8751b370bf2f0cc566f49a3140fe7f632fb3bb0a (patch) | |
| tree | ce19332c8fdf9d192718526892cc5cce9f741c48 | |
| parent | ad2f093ac7ff0e4920c172aeb64de433260a1c10 (diff) | |
Fixed if statement and pkg-config for ffmpeg.
| -rw-r--r-- | data/libvpx/toolchain.diff | 2 | ||||
| -rwxr-xr-x | util/pkg-config.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/data/libvpx/toolchain.diff b/data/libvpx/toolchain.diff index 8f60f97f5..5c25ba44d 100644 --- a/data/libvpx/toolchain.diff +++ b/data/libvpx/toolchain.diff @@ -63,7 +63,7 @@ diff -ur libvpx-1.8.0/build/make/configure.sh libvpx-1.8.0+iPhone/build/make/con - tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') - tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') - tgt_cc=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') -+ if [ "$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print NF}')" == "4" ]; then ++ if [ "$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print NF}')" = "4" ]; then + tgt_isa=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $1}') + tgt_flavor=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $2}') + tgt_os=$(echo ${toolchain} | awk 'BEGIN{FS="-"}{print $3}') diff --git a/util/pkg-config.sh b/util/pkg-config.sh index c1dc486c1..94edf7d95 100755 --- a/util/pkg-config.sh +++ b/util/pkg-config.sh @@ -8,6 +8,10 @@ declare -a pkgs unset dbpf while [[ $# -ne 0 ]]; do case "$1" in + (--version) + echo "0.29.1" + exit 0 + ;; (--atleast-pkgconfig-version) exec pkg-config "$1" "$2" ;; |