diff options
Diffstat (limited to 'multimedia/mlt')
| -rw-r--r-- | multimedia/mlt/mlt.SlackBuild | 6 | ||||
| -rw-r--r-- | multimedia/mlt/mlt.info | 6 | ||||
| -rw-r--r-- | multimedia/mlt/qt5-5.7.patch | 27 |
3 files changed, 5 insertions, 34 deletions
diff --git a/multimedia/mlt/mlt.SlackBuild b/multimedia/mlt/mlt.SlackBuild index e17e410bcf..f3d75a2073 100644 --- a/multimedia/mlt/mlt.SlackBuild +++ b/multimedia/mlt/mlt.SlackBuild @@ -50,9 +50,10 @@ # 22-OCT-2016 add qt5 support, bug fixes/addenda (Larry Hajali) # 29-JAN-2017 version update # 16-APR-2017 Compiling with vdpau is no longer supported ffmpeg-3.x +# 08-AUG-2018 verion update, remove qt5 patch PRGNAM=mlt -VERSION=${VERSION:-6.4.1} +VERSION=${VERSION:-6.10.0} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} @@ -118,9 +119,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix building against qt >= 5.7. -patch -p1 < $CWD/qt5-5.7.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/mlt/mlt.info b/multimedia/mlt/mlt.info index bee1f631c4..ca765a3be9 100644 --- a/multimedia/mlt/mlt.info +++ b/multimedia/mlt/mlt.info @@ -1,8 +1,8 @@ PRGNAM="mlt" -VERSION="6.4.1" +VERSION="6.10.0" HOMEPAGE="https://mltframework.org/" -DOWNLOAD="https://downloads.sourceforge.net/mlt/mlt-6.4.1.tar.gz" -MD5SUM="bfa7b4009be616d6f858393a88fbbb32" +DOWNLOAD="https://downloads.sourceforge.net/mlt/mlt-6.10.0.tar.gz" +MD5SUM="28a6f40ea76c167b6bb9d8baf985c4c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg libdv libquicktime" diff --git a/multimedia/mlt/qt5-5.7.patch b/multimedia/mlt/qt5-5.7.patch deleted file mode 100644 index 69706ccbc0..0000000000 --- a/multimedia/mlt/qt5-5.7.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 053204f4a243559644af2c47ae9895810685cb5a Mon Sep 17 00:00:00 2001 -From: Dan Dennedy <dan@dennedy.org> -Date: Sun, 8 Jan 2017 10:22:33 -0800 -Subject: [PATCH] Only use --std=c++11 CXXFLAG for g++. - -The addition of --std=c++11 breaks build on my OS X 10.8 build agent, -which uses clang version "Apple LLVM version 8.0.0 (clang-800.0.42.1)" ---- - src/modules/qt/Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/modules/qt/Makefile b/src/modules/qt/Makefile -index e7b55ae..d88e519 100644 ---- a/src/modules/qt/Makefile -+++ b/src/modules/qt/Makefile -@@ -39,7 +39,11 @@ ifneq ($(targetos), MinGW) - endif - endif - - CXXFLAGS := $(QTCXXFLAGS) $(CXXFLAGS) $(CFLAGS) $(EXIFCXXFLAGS) $(KDECXXFLAGS) -Wno-deprecated -+ -+ifneq (, $(shell $(CXX) --version | grep -is gcc)) -+ CXXFLAGS += --std=c++11 -+endif - - LDFLAGS += $(QTLIBS) $(EXIFLIBS) $(KDELIBS) - |