Index: head/multimedia/webcamoid/Makefile =================================================================== --- head/multimedia/webcamoid/Makefile (revision 565887) +++ head/multimedia/webcamoid/Makefile (revision 565888) @@ -1,40 +1,40 @@ # $FreeBSD$ PORTNAME= webcamoid -DISTVERSION= 8.7.1 +DISTVERSION= 8.8.0 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= compiler:c++11-lang gl gnome pkgconfig qmake qt:5 xorg 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 quickcontrols_run 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 .include .if ${CHOSEN_COMPILER_TYPE} == gcc # Workaround for Bug#224137: devel/qt5-qmake: Doesn't use the right compiler in case USE_GCC is selected BINARY_ALIAS= g++=${CXX} .endif .include Index: head/multimedia/webcamoid/distinfo =================================================================== --- head/multimedia/webcamoid/distinfo (revision 565887) +++ head/multimedia/webcamoid/distinfo (revision 565888) @@ -1,3 +1,3 @@ -TIMESTAMP = 1572240823 -SHA256 (webcamoid-webcamoid-8.7.1_GH0.tar.gz) = e0c033b0421e3ee626456fcc6e7c39d322be646a96a53352f74c3b5dc5fd5435 -SIZE (webcamoid-webcamoid-8.7.1_GH0.tar.gz) = 8900338 +TIMESTAMP = 1613620488 +SHA256 (webcamoid-webcamoid-8.8.0_GH0.tar.gz) = 77ed77cbaf57180247485646b81af30edcc89ee545bc241c23d8bd648464bf15 +SIZE (webcamoid-webcamoid-8.8.0_GH0.tar.gz) = 8887888 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 565887) +++ head/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp (revision 565888) @@ -1,40 +1,41 @@ ---- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2019-09-30 15:37:45 UTC +--- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2021-02-15 15:25:23 UTC +++ libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp -@@ -237,18 +237,22 @@ CaptureV4L2::CaptureV4L2(QObject *parent): - Capture(parent) +@@ -727,6 +727,7 @@ void CaptureV4L2::reset() + CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *self): + self(self) { - this->d = new CaptureV4L2Private(this); +#if !defined(FREEBSD_BUG224011_VIDEO0) - this->d->m_fsWatcher = new QFileSystemWatcher({"/dev"}, this); - QObject::connect(this->d->m_fsWatcher, + this->m_fsWatcher = new QFileSystemWatcher({"/dev"}, self); + QObject::connect(this->m_fsWatcher, &QFileSystemWatcher::directoryChanged, +@@ -734,12 +735,15 @@ CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *se [this] () { - this->d->updateDevices(); - }); + this->updateDevices(); + }); +#endif - this->d->updateDevices(); + this->updateDevices(); } - CaptureV4L2::~CaptureV4L2() + CaptureV4L2Private::~CaptureV4L2Private() { +#if !defined(FREEBSD_BUG224011_VIDEO0) - delete this->d->m_fsWatcher; + delete this->m_fsWatcher; +#endif - delete this->d; } -@@ -1145,11 +1149,13 @@ void CaptureV4L2Private::updateDevices() + QVariantList CaptureV4L2Private::capsFps(int fd, +@@ -1385,11 +1389,13 @@ void CaptureV4L2Private::updateDevices() this->m_devicesCaps = devicesCaps; if (this->m_devices != devices) { +#if !defined(FREEBSD_BUG224011_VIDEO0) if (!this->m_devices.isEmpty()) this->m_fsWatcher->removePaths(this->m_devices); +#endif this->m_devices = devices; -#ifndef Q_OS_BSD4 +#if !defined(FREEBSD_BUG224011_VIDEO0) if (!this->m_devices.isEmpty()) this->m_fsWatcher->addPaths(this->m_devices); #endif Index: head/multimedia/webcamoid/pkg-plist =================================================================== --- head/multimedia/webcamoid/pkg-plist (revision 565887) +++ head/multimedia/webcamoid/pkg-plist (revision 565888) @@ -1,93 +1,93 @@ bin/webcamoid lib/avkys/libACapsConvert.so lib/avkys/libAging.so lib/avkys/libAudioDevice.so lib/avkys/libAudioGen.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/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/libgeneric.so lib/avkys/submodules/ACapsConvert/libgstreamer.so lib/avkys/submodules/AudioDevice/libalsa.so lib/avkys/submodules/AudioDevice/libjack.so lib/avkys/submodules/AudioDevice/libpulseaudio.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/libgeneric.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.7 -lib/libavkys.so.8.7.1 +lib/libavkys.so.8.8 +lib/libavkys.so.8.8.0 %%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