mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
multimedia/webcamoid: Update 8.6.1 -> 8.7.0
Reported by: portscout
This commit is contained in:
Yuri Victorovich
parent
dc8aae9fed
commit
f634cbf6ee
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=514031
@ -1,8 +1,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= webcamoid
|
||||
DISTVERSION= 8.6.1
|
||||
PORTREVISION= 4
|
||||
DISTVERSION= 8.7.0
|
||||
CATEGORIES= multimedia
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
@ -18,7 +17,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
|
||||
libpulse.so:audio/pulseaudio \
|
||||
libv4l2.so:multimedia/libv4l
|
||||
|
||||
USES= compiler:c++11-lang gl gnome pkgconfig qmake qt:5
|
||||
USES= compiler:c++11-lang gl gnome pkgconfig qmake qt:5 xorg
|
||||
USE_GITHUB= yes
|
||||
USE_GNOME= glib20
|
||||
USE_GSTREAMER1= yes
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1553971501
|
||||
SHA256 (webcamoid-webcamoid-8.6.1_GH0.tar.gz) = 58c07ef6bf5acf676f7a794e4b3c96a8f73d4a17153505f06161e57c0e31ae7b
|
||||
SIZE (webcamoid-webcamoid-8.6.1_GH0.tar.gz) = 8768333
|
||||
TIMESTAMP = 1570507973
|
||||
SHA256 (webcamoid-webcamoid-8.7.0_GH0.tar.gz) = 6fb9c55b574f06700802f10a5c20105c6c53ba4da43d842d1580bcefe7e9dbe6
|
||||
SIZE (webcamoid-webcamoid-8.7.0_GH0.tar.gz) = 8900394
|
||||
|
||||
@ -1,26 +1,18 @@
|
||||
--- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2019-03-01 19:22:43 UTC
|
||||
--- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2019-09-30 15:37:45 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):
|
||||
@@ -237,18 +237,22 @@ 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);
|
||||
&QFileSystemWatcher::directoryChanged,
|
||||
[this] () {
|
||||
this->d->updateDevices();
|
||||
});
|
||||
+#endif
|
||||
|
||||
this->updateDevices();
|
||||
this->d->updateDevices();
|
||||
}
|
||||
|
||||
CaptureV4L2::~CaptureV4L2()
|
||||
@ -31,18 +23,18 @@
|
||||
delete this->d;
|
||||
}
|
||||
|
||||
@@ -1301,11 +1307,13 @@ void CaptureV4L2::updateDevices()
|
||||
this->d->m_devicesCaps = devicesCaps;
|
||||
@@ -1145,11 +1149,13 @@ void CaptureV4L2Private::updateDevices()
|
||||
this->m_devicesCaps = devicesCaps;
|
||||
|
||||
if (this->d->m_devices != devices) {
|
||||
if (this->m_devices != devices) {
|
||||
+#if !defined(FREEBSD_BUG224011_VIDEO0)
|
||||
if (!this->d->m_devices.isEmpty())
|
||||
this->d->m_fsWatcher->removePaths(this->d->m_devices);
|
||||
if (!this->m_devices.isEmpty())
|
||||
this->m_fsWatcher->removePaths(this->m_devices);
|
||||
+#endif
|
||||
|
||||
this->d->m_devices = devices;
|
||||
this->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);
|
||||
if (!this->m_devices.isEmpty())
|
||||
this->m_fsWatcher->addPaths(this->m_devices);
|
||||
#endif
|
||||
|
||||
@ -3,7 +3,6 @@ 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
|
||||
@ -44,7 +43,6 @@ 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
|
||||
@ -61,25 +59,25 @@ 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/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/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.6
|
||||
lib/libavkys.so.8.6.1
|
||||
lib/libavkys.so.8.7
|
||||
lib/libavkys.so.8.7.0
|
||||
%%QT_QMLDIR%%/AkQml/libAkQml.so
|
||||
%%QT_QMLDIR%%/AkQml/qmldir
|
||||
man/man1/webcamoid.1.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user