diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-05-14 06:26:40 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-14 06:26:40 +0000 |
| commit | 26cac87c90b2dc89471f653b6fde59c6ed04136b (patch) | |
| tree | ae38070f0aaef527244ef1a7305f29e16da567d6 /ffmpeg | |
| parent | 908108d1865c559318ca3c0bfadda4108a17fcd0 (diff) | |
| download | asb-26cac87c90b2dc89471f653b6fde59c6ed04136b.tar.gz asb-26cac87c90b2dc89471f653b6fde59c6ed04136b.tar.xz | |
ffmpeg: rebuilt for slackware-current
Diffstat (limited to 'ffmpeg')
| -rwxr-xr-x | ffmpeg/build/ffmpeg.SlackBuild | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild index 438711f1..c10ad727 100755 --- a/ffmpeg/build/ffmpeg.SlackBuild +++ b/ffmpeg/build/ffmpeg.SlackBuild @@ -175,6 +175,8 @@ # * Updated. # 3.4.2-1: 12/feb/2018 by Eric Hameleers <alien@slackware.com> # * Updated. +# 3.4.2-2: 14/may/2018 by Eric Hameleers <alien@slackware.com> +# * Rebuilt for slackware-current. # # Run 'sh ffmpeg.SlackBuild' to build a Slackware package. # The package (.txz) plus descriptive .txt file are created in /tmp . @@ -185,8 +187,8 @@ PRGNAM=ffmpeg VERSION=${VERSION:-3.4.2} -BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +BUILD=${BUILD:-2} +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} TAG=${TAG:-"alien"} # -- PATENT ALERT! -- @@ -524,15 +526,14 @@ fi ## # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi case "$ARCH" in |