diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2021-02-18 04:33:34 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2021-02-18 04:33:34 +0000 |
| commit | a4c15f33dcc30606d8cbc6e73d603d7d508d5283 (patch) | |
| tree | aabb2e67e3b49102335101fd6567ffcf7e5cb88c /multimedia/webcamoid | |
| parent | 102abd859bd19c60c5f951d876235813cc7279e5 (diff) | |
| download | ports-a4c15f33dcc30606d8cbc6e73d603d7d508d5283.tar.gz ports-a4c15f33dcc30606d8cbc6e73d603d7d508d5283.zip | |
Notes
Diffstat (limited to 'multimedia/webcamoid')
| -rw-r--r-- | multimedia/webcamoid/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/webcamoid/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp | 27 | ||||
| -rw-r--r-- | multimedia/webcamoid/pkg-plist | 4 |
4 files changed, 20 insertions, 19 deletions
diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile index 1905472d04dc..2dbf3cc4c49a 100644 --- a/multimedia/webcamoid/Makefile +++ b/multimedia/webcamoid/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= webcamoid -DISTVERSION= 8.7.1 +DISTVERSION= 8.8.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org diff --git a/multimedia/webcamoid/distinfo b/multimedia/webcamoid/distinfo index d9837556151d..0f4ce892e472 100644 --- a/multimedia/webcamoid/distinfo +++ b/multimedia/webcamoid/distinfo @@ -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 diff --git a/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp b/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp index 7c0cbc74e8a6..3324daf47569 100644 --- a/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp +++ b/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp @@ -1,29 +1,30 @@ ---- 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) { diff --git a/multimedia/webcamoid/pkg-plist b/multimedia/webcamoid/pkg-plist index 5e47d6a1d8f4..6f4a4e3202c3 100644 --- a/multimedia/webcamoid/pkg-plist +++ b/multimedia/webcamoid/pkg-plist @@ -76,8 +76,8 @@ 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 |