Page MenuHomeFreeBSD
Files F160805807

D13512.id36731.diff
No OneTemporary
Actions

D13512.id36731.diff
View Options

Index: head/multimedia/webcamoid/Makefile
===================================================================
--- head/multimedia/webcamoid/Makefile
+++ head/multimedia/webcamoid/Makefile
@@ -2,6 +2,7 @@
PORTNAME= webcamoid
DISTVERSION= 8.1.0
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -26,5 +27,11 @@
MAKE_ENV= NOOSS=1 # NOOSS is because the OSS module attempts to use kevent on OSS devices, which is broken in the base
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>
Index: head/multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp
===================================================================
--- head/multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp
+++ head/multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp
@@ -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();
-

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 29, 2:03 AM (21 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34448802
Default Alt Text
D13512.id36731.diff (1 KB)

Event Timeline