diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2019-03-30 19:20:13 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2019-03-30 19:20:13 +0000 |
| commit | 4b24fb171f3e40343c4c54d89fd2452959161f91 (patch) | |
| tree | bb4c7632c1a2cd964dbda140311deac7275bea78 /multimedia/webcamoid | |
| parent | 7acd3513b2173ad69eda72d1d3a67fe9a6c810df (diff) | |
| download | ports-4b24fb171f3e40343c4c54d89fd2452959161f91.tar.gz ports-4b24fb171f3e40343c4c54d89fd2452959161f91.zip | |
multimedia/webcamoid: Update 8.5.0 -> 8.6.1
Reported by: portscout
Notes
Notes:
svn path=/head/; revision=497330
Diffstat (limited to 'multimedia/webcamoid')
| -rw-r--r-- | multimedia/webcamoid/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/webcamoid/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp | 11 | ||||
| -rw-r--r-- | multimedia/webcamoid/pkg-plist | 5 |
4 files changed, 12 insertions, 13 deletions
diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile index dc354824318c..2402dcde110c 100644 --- a/multimedia/webcamoid/Makefile +++ b/multimedia/webcamoid/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= webcamoid -DISTVERSION= 8.5.0 +DISTVERSION= 8.6.1 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -26,6 +26,7 @@ USE_QT= concurrent core declarative gui multimedia network opengl quickcontrols 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 diff --git a/multimedia/webcamoid/distinfo b/multimedia/webcamoid/distinfo index fce8ba30c369..1c880c7a6326 100644 --- a/multimedia/webcamoid/distinfo +++ b/multimedia/webcamoid/distinfo @@ -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 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 159abdce49ad..5b304f8eab9a 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,4 +1,4 @@ ---- 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; @@ -31,7 +31,7 @@ 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) { @@ -41,11 +41,8 @@ +#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 diff --git a/multimedia/webcamoid/pkg-plist b/multimedia/webcamoid/pkg-plist index 9691490e79ea..2c7a9511ebf2 100644 --- a/multimedia/webcamoid/pkg-plist +++ b/multimedia/webcamoid/pkg-plist @@ -78,10 +78,11 @@ 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 |