diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2017-12-18 22:24:12 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2017-12-18 22:24:12 +0000 |
| commit | 594d6b95bb9b9e3987334c7187c96f88cc29188a (patch) | |
| tree | b885cc9211c2fde7fb2435b6560fbd946b70b781 | |
| parent | graphics/sxiv: Update to 24 (diff) | |
multimedia/webcamoid: Unbreaking clang-built app with USE_GCC=6.0+
Approved by: adamw (mentor)
Differential Revision: https://reviews.freebsd.org/D13512
| -rw-r--r-- | multimedia/webcamoid/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp | 21 |
2 files changed, 7 insertions, 21 deletions
diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile index 25dfc715a80e..c6b6c6d38e00 100644 --- a/multimedia/webcamoid/Makefile +++ b/multimedia/webcamoid/Makefile @@ -2,6 +2,7 @@ PORTNAME= webcamoid DISTVERSION= 8.1.0 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -27,4 +28,10 @@ MAKE_ENV= NOOSS=1 # NOOSS is because the OSS module attempts to use kevent on OS QMAKE_ARGS= INSTALLQMLDIR=${QT_QMLDIR} \ MANDIR=${PREFIX}/man +# Workaround for the crash when built with clang that the upstream author says is a bug in clang +USE_GCC= 6.0+ + +# Workaround for Bug#224137: devel/qt5-qmake: Doesn't use the right compiler in case USE_GCC is selected +BINARY_ALIAS= g++=${CXX} + .include <bsd.port.mk> diff --git a/multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp b/multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp deleted file mode 100644 index 9350bc438111..000000000000 --- a/multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- libAvKys/Plugins/MultiSrc/src/multisrcelement.cpp.orig 2017-10-09 06:45:30 UTC -+++ libAvKys/Plugins/MultiSrc/src/multisrcelement.cpp -@@ -201,9 +201,15 @@ void MultiSrcElement::codecLibUpdated(co - auto state = this->state(); - this->setState(AkElement::ElementStateNull); - -- auto media = this->m_mediaSource->media(); -- auto loop = this->m_mediaSource->loop(); -- auto showLog = this->m_mediaSource->showLog(); -+ // crashes with these lines: https://github.com/webcamoid/webcamoid/issues/100 -+ // auto media = this->m_mediaSource->media(); -+ // auto loop = this->m_mediaSource->loop(); -+ // auto showLog = this->m_mediaSource->showLog(); -+ -+ // workaround for the crash -+ QString media; -+ bool loop = true; -+ bool showLog = true; - - this->m_mutexLib.lock(); - |