diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-12-30 13:03:43 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-12-30 13:03:43 +0000 |
| commit | 7ee0e7e05b507b8f5d67129acff8421ec7e57310 (patch) | |
| tree | 54d41fcba95acbfb06d34094ab7104fee5aa75d8 /mkvtoolnix/build | |
| parent | 755daaab62fc62b224f324cde7f9d0a31ef40603 (diff) | |
| download | asb-7ee0e7e05b507b8f5d67129acff8421ec7e57310.tar.gz asb-7ee0e7e05b507b8f5d67129acff8421ec7e57310.tar.xz | |
mkvtoolnix: update to 41.0.0
Diffstat (limited to 'mkvtoolnix/build')
| -rwxr-xr-x | mkvtoolnix/build/mkvtoolnix.SlackBuild | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/mkvtoolnix/build/mkvtoolnix.SlackBuild b/mkvtoolnix/build/mkvtoolnix.SlackBuild index fdde51d0..8c7ab61b 100755 --- a/mkvtoolnix/build/mkvtoolnix.SlackBuild +++ b/mkvtoolnix/build/mkvtoolnix.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2009, 2011, 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2011, 2015, 2016, 2017, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -28,7 +28,7 @@ # For: mkvtoolnix # Descr: Matroska container manipulation utilities # URL: http://www.bunkus.org/videotools/mkvtoolnix/ -# Needs: libinput,libxkbcommon,qt5,qt5-webkit +# Needs: cmark,libinput,libxkbcommon,qt5 # Changelog: # 2.8.0-1: 14/May/2009 by Eric Hameleers <alien@slackware.com> # * Initial build. @@ -53,6 +53,8 @@ # a dependency since the Qt GUI is the only left. # 13.0.0-1: 17/jul/2017 by Eric Hameleers <alien@slackware.com> # * Update for Slackware 14.2 and -current. +# 41.0.0-1: 30/dec/2019 by Eric Hameleers <alien@slackware.com> +# * Update for Slackware 14.2 and -current. # # Run 'sh mkvtoolnix.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -63,12 +65,12 @@ # Set initial variables: PRGNAM=mkvtoolnix -VERSION=${VERSION:-13.0.0} +VERSION=${VERSION:-41.0.0} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} +NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} -DOCS="AUTHORS COPYING* ChangeLog NEWS README TODO" +DOCS="AUTHORS COPYING* ChangeLog NEWS* README*" # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) @@ -87,16 +89,17 @@ SRCURL="http://www.bunkus.org/videotools/${PRGNAM}/sources/${PRGNAM}-${VERSION}. # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - 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=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" @@ -175,6 +178,7 @@ LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ + --disable-update-check \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ |