Page MenuHomeFreeBSD
Files F163357690

D13512.id36654.diff
No OneTemporary
Actions

D13512.id36654.diff
View Options

Index: multimedia/webcamoid/Makefile
===================================================================
--- multimedia/webcamoid/Makefile
+++ multimedia/webcamoid/Makefile
@@ -2,6 +2,7 @@
PORTNAME= webcamoid
DISTVERSION= 8.1.0
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -27,4 +28,14 @@
QMAKE_ARGS= INSTALLQMLDIR=${QT_QMLDIR} \
MANDIR=${PREFIX}/man
+# Workaround for the crash when built with clang that the upstream author says is the 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
+CONFIGURE_ENV+= PATH=${PATH}
+
+pre-configure:
+ @${MKDIR} ${WRKDIR}/.bin
+ @${LN} -s ${LOCALBASE}/bin/${CXX} ${WRKDIR}/.bin/g++ # catch the g++ command that qmake erroneously runs instead of ${CXX}
+
.include <bsd.port.mk>
Index: multimedia/webcamoid/files/patch-libAvKys_Plugins_MultiSrc_src_multisrcelement.cpp
===================================================================
--- 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();
-

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 11:41 AM (10 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35400783
Default Alt Text
D13512.id36654.diff (1 KB)

Event Timeline