Index: head/multimedia/webcamoid/Makefile =================================================================== --- head/multimedia/webcamoid/Makefile (revision 497329) +++ head/multimedia/webcamoid/Makefile (revision 497330) @@ -1,34 +1,35 @@ # $FreeBSD$ PORTNAME= webcamoid -DISTVERSION= 8.5.0 +DISTVERSION= 8.6.1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org COMMENT= Full featured webcam suite LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libasound.so:audio/alsa-lib \ libavcodec.so:multimedia/ffmpeg \ libjack.so:audio/jack \ libpulse.so:audio/pulseaudio \ libv4l2.so:multimedia/libv4l USES= gl gnome pkgconfig qmake qt:5 USE_GITHUB= yes USE_GNOME= glib20 USE_GSTREAMER1= yes USE_GL= gl USE_QT= concurrent core declarative gui multimedia network opengl quickcontrols2 svg widgets xml buildtools_build 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} \ + LIBDIR=${PREFIX}/lib \ MANDIR=${PREFIX}/man # Workaround for Bug#224137: devel/qt5-qmake: Doesn't use the right compiler in case USE_GCC is selected BINARY_ALIAS= g++=${CXX} .include Index: head/multimedia/webcamoid/distinfo =================================================================== --- head/multimedia/webcamoid/distinfo (revision 497329) +++ head/multimedia/webcamoid/distinfo (revision 497330) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551890419 -SHA256 (webcamoid-webcamoid-8.5.0_GH0.tar.gz) = b45ac278cd7e487031052fe4fd61a2de23a2d7ee10a76c80459be127abdcaec2 -SIZE (webcamoid-webcamoid-8.5.0_GH0.tar.gz) = 8697016 +TIMESTAMP = 1553971501 +SHA256 (webcamoid-webcamoid-8.6.1_GH0.tar.gz) = 58c07ef6bf5acf676f7a794e4b3c96a8f73d4a17153505f06161e57c0e31ae7b +SIZE (webcamoid-webcamoid-8.6.1_GH0.tar.gz) = 8768333 Index: head/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp =================================================================== --- head/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp (revision 497329) +++ head/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp (revision 497330) @@ -1,51 +1,48 @@ ---- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2019-03-06 17:26:33 UTC +--- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2019-03-01 19:22:43 UTC +++ libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp @@ -162,10 +162,13 @@ class CaptureV4L2Private const QVariantMap &map2) const; }; +#define FREEBSD_BUG224011_VIDEO0 + CaptureV4L2::CaptureV4L2(QObject *parent): Capture(parent) { this->d = new CaptureV4L2Private(this); +#if !defined(FREEBSD_BUG224011_VIDEO0) this->d->m_fsWatcher = new QFileSystemWatcher({"/dev"}, this); QObject::connect(this->d->m_fsWatcher, @@ -176,13 +179,16 @@ CaptureV4L2::CaptureV4L2(QObject *parent &QFileSystemWatcher::fileChanged, this, &CaptureV4L2::onFileChanged); +#endif this->updateDevices(); } CaptureV4L2::~CaptureV4L2() { +#if !defined(FREEBSD_BUG224011_VIDEO0) delete this->d->m_fsWatcher; +#endif delete this->d; } -@@ -1302,13 +1308,17 @@ void CaptureV4L2::updateDevices() +@@ -1301,11 +1307,13 @@ void CaptureV4L2::updateDevices() this->d->m_devicesCaps = devicesCaps; if (this->d->m_devices != devices) { +#if !defined(FREEBSD_BUG224011_VIDEO0) if (!this->d->m_devices.isEmpty()) this->d->m_fsWatcher->removePaths(this->d->m_devices); +#endif this->d->m_devices = devices; - +-#ifndef Q_OS_BSD4 +#if !defined(FREEBSD_BUG224011_VIDEO0) if (!this->d->m_devices.isEmpty()) this->d->m_fsWatcher->addPaths(this->d->m_devices); -+#endif - - emit this->webcamsChanged(this->d->m_devices); - } + #endif Index: head/multimedia/webcamoid/pkg-plist =================================================================== --- head/multimedia/webcamoid/pkg-plist (revision 497329) +++ head/multimedia/webcamoid/pkg-plist (revision 497330) @@ -1,94 +1,95 @@ bin/webcamoid lib/avkys/libACapsConvert.so lib/avkys/libAging.so lib/avkys/libAudioDevice.so lib/avkys/libAudioGen.so lib/avkys/libBin.so lib/avkys/libBlur.so lib/avkys/libCartoon.so lib/avkys/libChangeHSL.so lib/avkys/libCharify.so lib/avkys/libCinema.so lib/avkys/libColorFilter.so lib/avkys/libColorReplace.so lib/avkys/libColorTap.so lib/avkys/libColorTransform.so lib/avkys/libConvolve.so lib/avkys/libDelayGrab.so lib/avkys/libDenoise.so lib/avkys/libDesktopCapture.so lib/avkys/libDice.so lib/avkys/libDistort.so lib/avkys/libDizzy.so lib/avkys/libEdge.so lib/avkys/libEmboss.so lib/avkys/libEqualize.so lib/avkys/libFaceDetect.so lib/avkys/libFalseColor.so lib/avkys/libFire.so lib/avkys/libFrameOverlap.so lib/avkys/libGrayScale.so lib/avkys/libHalftone.so lib/avkys/libHypnotic.so lib/avkys/libImplode.so lib/avkys/libInvert.so lib/avkys/libLife.so lib/avkys/libMatrix.so lib/avkys/libMatrixTransform.so lib/avkys/libMultiSink.so lib/avkys/libMultiSrc.so lib/avkys/libMultiplex.so lib/avkys/libNervous.so lib/avkys/libNormalize.so lib/avkys/libOilPaint.so lib/avkys/libPhotocopy.so lib/avkys/libPixelate.so lib/avkys/libPrimariesColors.so lib/avkys/libProbe.so lib/avkys/libQuark.so lib/avkys/libRadioactive.so lib/avkys/libRipple.so lib/avkys/libScanLines.so lib/avkys/libScroll.so lib/avkys/libShagadelic.so lib/avkys/libSwirl.so lib/avkys/libTemperature.so lib/avkys/libVideoCapture.so lib/avkys/libVignette.so lib/avkys/libVirtualCamera.so lib/avkys/libWarhol.so lib/avkys/libWarp.so lib/avkys/libWave.so lib/avkys/submodules/ACapsConvert/libffmpegav.so lib/avkys/submodules/ACapsConvert/libffmpegsw.so lib/avkys/submodules/ACapsConvert/libgstreamer.so lib/avkys/submodules/AudioDevice/libalsa.so lib/avkys/submodules/AudioDevice/libjack.so lib/avkys/submodules/AudioDevice/liboss.so lib/avkys/submodules/AudioDevice/libpulseaudio.so lib/avkys/submodules/AudioDevice/libqtaudio.so lib/avkys/submodules/DesktopCapture/libqtscreen.so lib/avkys/submodules/MultiSink/libffmpeg.so lib/avkys/submodules/MultiSink/libgstreamer.so lib/avkys/submodules/MultiSrc/libffmpeg.so lib/avkys/submodules/MultiSrc/libgstreamer.so lib/avkys/submodules/VideoCapture/libffmpeg.so lib/avkys/submodules/VideoCapture/libgstreamer.so lib/avkys/submodules/VideoCapture/libv4l2sys.so lib/avkys/submodules/VideoCapture/libv4lutils.so lib/libavkys.so lib/libavkys.so.8 -lib/libavkys.so.8.5 -lib/libavkys.so.8.5.0 +lib/libavkys.so.8.6 +lib/libavkys.so.8.6.1 %%QT_QMLDIR%%/AkQml/libAkQml.so %%QT_QMLDIR%%/AkQml/qmldir +man/man1/webcamoid.1.gz share/applications/webcamoid.desktop share/icons/hicolor/128x128/apps/webcamoid.png share/icons/hicolor/16x16/apps/webcamoid.png share/icons/hicolor/22x22/apps/webcamoid.png share/icons/hicolor/256x256/apps/webcamoid.png share/icons/hicolor/32x32/apps/webcamoid.png share/icons/hicolor/48x48/apps/webcamoid.png share/icons/hicolor/64x64/apps/webcamoid.png share/icons/hicolor/8x8/apps/webcamoid.png share/icons/hicolor/scalable/apps/webcamoid.svg