diff options
author | Eric Hameleers <alien@slackware.com> | 2018-04-15 23:28:33 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-04-15 23:28:33 +0200 |
commit | 3af8ea384ba5899bb6c70fbdd47ae877a04b4321 (patch) | |
tree | 40cfb344835a29c969a1d3f641a89cd067505de3 /deps/mlt/mlt.SlackBuild | |
parent | d14838969031c9413c36700b945950f223237c74 (diff) | |
download | ktown-3af8ea384ba5899bb6c70fbdd47ae877a04b4321.tar.gz ktown-3af8ea384ba5899bb6c70fbdd47ae877a04b4321.tar.xz |
Update mlt and qt5
A newer mlt was required by kdenlive.
And a new version of Qt 5.9 is always a good thing.
Diffstat (limited to '')
-rwxr-xr-x | deps/mlt/mlt.SlackBuild | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/deps/mlt/mlt.SlackBuild b/deps/mlt/mlt.SlackBuild index 6608b94..b478645 100755 --- a/deps/mlt/mlt.SlackBuild +++ b/deps/mlt/mlt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017,2018 Eric Hameleers, Eindhoven, NL # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -25,8 +25,8 @@ PKGNAM=mlt -VERSION=${VERSION:-6.4.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-6.6.0} +BUILD=${BUILD:-1} PYTHONSITEPKG=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") @@ -37,7 +37,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + 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: *) ARCH=$(uname -m) ;; @@ -45,8 +45,8 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -75,15 +75,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 -# Fix compilation against Qt >= 5.7 (error "Qt requires C++11 support"): -cat $CWD/patches/mlt_qt5.patch | patch -p1 --verbose || exit 1 - -# Fix compilation against glibc 2.26: -cat $CWD/patches/mlt_glibc226.patch | patch -p1 --verbose || exit 1 - -# Prevent kdenlive from crashing on exit: -cat $CWD/patches/mlt_repository_close.patch | patch -p1 --verbose || exit 1 - # Fix bogus permissions: chown -R root:root . find . \ |