diff options
| author |   Eric Hameleers <alien@slackware.com> | 2017-03-19 21:06:40 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2017-03-19 21:06:40 +0100 |
| commit | 60bf248ad0c31c8bdb95b5d6d6b0c7adb0fafaac (patch) | |
| tree | b2771797e777a72c99a554e6daef658717bcb09b /deps/mlt/patches | |
| parent | 7912a391b5cb6f00d30e9fdea957e5be71d156b0 (diff) | |
| download | ktown-60bf248ad0c31c8bdb95b5d6d6b0c7adb0fafaac.tar.gz ktown-60bf248ad0c31c8bdb95b5d6d6b0c7adb0fafaac.tar.xz | |
deps: updated for KDE 5_17.03
Six packages have been added in order to compile the KDE packages libkface,
digikam and kdenlive:
- dvdauthor
- frei0r
- lensfun
- mlt
- opencv
- vid.stab
Furthermore I (re-)added some sources that I intend to use in the
'testing' branch of ktown. These Slackware originals were slightly modified
and need to be compiled against wayland (also in need of recompilation are
libxkbcommon and qt5 but those sources are already included):
- elogind
- mesa
- xorg-server
Diffstat (limited to 'deps/mlt/patches')
| -rw-r--r-- | deps/mlt/patches/mlt_qt5.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/deps/mlt/patches/mlt_qt5.patch b/deps/mlt/patches/mlt_qt5.patch new file mode 100644 index 0000000..69706cc --- /dev/null +++ b/deps/mlt/patches/mlt_qt5.patch @@ -0,0 +1,27 @@ +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) + |