From owner-svn-ports-head@freebsd.org Wed Mar 6 22:30:51 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 421C81529A74; Wed, 6 Mar 2019 22:30:51 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D3D1F745FE; Wed, 6 Mar 2019 22:30:50 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BA55AA021; Wed, 6 Mar 2019 22:30:50 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x26MUokk039528; Wed, 6 Mar 2019 22:30:50 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x26MUo8W039525; Wed, 6 Mar 2019 22:30:50 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201903062230.x26MUo8W039525@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Wed, 6 Mar 2019 22:30:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494857 - in head/multimedia/webcamoid: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/multimedia/webcamoid: . files X-SVN-Commit-Revision: 494857 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D3D1F745FE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Mar 2019 22:30:51 -0000 Author: yuri Date: Wed Mar 6 22:30:49 2019 New Revision: 494857 URL: https://svnweb.freebsd.org/changeset/ports/494857 Log: multimedia/webcamoid: Update 8.1.0 -> 8.5.0 Reported by: portscout Deleted: head/multimedia/webcamoid/files/patch-ffmpeg4 Modified: head/multimedia/webcamoid/Makefile head/multimedia/webcamoid/distinfo head/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp head/multimedia/webcamoid/pkg-plist Modified: head/multimedia/webcamoid/Makefile ============================================================================== --- head/multimedia/webcamoid/Makefile Wed Mar 6 22:29:32 2019 (r494856) +++ head/multimedia/webcamoid/Makefile Wed Mar 6 22:30:49 2019 (r494857) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= webcamoid -DISTVERSION= 8.1.0 -PORTREVISION= 9 +DISTVERSION= 8.5.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -18,19 +17,16 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libpulse.so:audio/pulseaudio \ libv4l2.so:multimedia/libv4l -USES= pkgconfig qmake qt:5 +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 svg widgets buildtools_build quickcontrols_run +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} \ MANDIR=${PREFIX}/man - -# Workaround for the crash when built with clang that the upstream author says is a bug in clang -USE_GCC= yes # Workaround for Bug#224137: devel/qt5-qmake: Doesn't use the right compiler in case USE_GCC is selected BINARY_ALIAS= g++=${CXX} Modified: head/multimedia/webcamoid/distinfo ============================================================================== --- head/multimedia/webcamoid/distinfo Wed Mar 6 22:29:32 2019 (r494856) +++ head/multimedia/webcamoid/distinfo Wed Mar 6 22:30:49 2019 (r494857) @@ -1,3 +1,3 @@ -TIMESTAMP = 1512092375 -SHA256 (webcamoid-webcamoid-8.1.0_GH0.tar.gz) = 2e51731c36a86a4b3e323c11000a04b7ce06b5d228519676f4070e44e2a62947 -SIZE (webcamoid-webcamoid-8.1.0_GH0.tar.gz) = 10062681 +TIMESTAMP = 1551890419 +SHA256 (webcamoid-webcamoid-8.5.0_GH0.tar.gz) = b45ac278cd7e487031052fe4fd61a2de23a2d7ee10a76c80459be127abdcaec2 +SIZE (webcamoid-webcamoid-8.5.0_GH0.tar.gz) = 8697016 Modified: 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 Wed Mar 6 22:29:32 2019 (r494856) +++ head/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp Wed Mar 6 22:30:49 2019 (r494857) @@ -1,53 +1,51 @@ ---- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2017-10-09 06:45:30 UTC +--- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig 2019-03-06 17:26:33 UTC +++ libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp -@@ -60,12 +60,15 @@ inline IoMethodMap initIoMethodMap() +@@ -162,10 +162,13 @@ class CaptureV4L2Private + const QVariantMap &map2) const; + }; - Q_GLOBAL_STATIC_WITH_ARGS(IoMethodMap, ioMethodToStr, (initIoMethodMap())) - +#define FREEBSD_BUG224011_VIDEO0 + CaptureV4L2::CaptureV4L2(QObject *parent): Capture(parent) { - this->m_id = -1; - this->m_ioMethod = IoMethodUnknown; - this->m_nBuffers = 32; + this->d = new CaptureV4L2Private(this); +#if !defined(FREEBSD_BUG224011_VIDEO0) - this->m_fsWatcher = new QFileSystemWatcher({"/dev"}, this); + this->d->m_fsWatcher = new QFileSystemWatcher({"/dev"}, this); - QObject::connect(this->m_fsWatcher, -@@ -76,13 +79,15 @@ CaptureV4L2::CaptureV4L2(QObject *parent + 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->m_fsWatcher; + delete this->d->m_fsWatcher; +#endif + delete this->d; } - QStringList CaptureV4L2::webcams() const -@@ -1176,13 +1181,16 @@ void CaptureV4L2::updateDevices() - this->m_cameraControls = cameraControls; +@@ -1302,13 +1308,17 @@ void CaptureV4L2::updateDevices() + this->d->m_devicesCaps = devicesCaps; - if (this->m_devices != devices) { + if (this->d->m_devices != devices) { +#if !defined(FREEBSD_BUG224011_VIDEO0) - if (!this->m_devices.isEmpty()) - this->m_fsWatcher->removePaths(this->m_devices); -- + if (!this->d->m_devices.isEmpty()) + this->d->m_fsWatcher->removePaths(this->d->m_devices); +#endif - this->m_devices = devices; + this->d->m_devices = devices; + +#if !defined(FREEBSD_BUG224011_VIDEO0) - if (!this->m_devices.isEmpty()) - this->m_fsWatcher->addPaths(this->m_devices); + if (!this->d->m_devices.isEmpty()) + this->d->m_fsWatcher->addPaths(this->d->m_devices); +#endif - emit this->webcamsChanged(this->m_devices); + emit this->webcamsChanged(this->d->m_devices); } Modified: head/multimedia/webcamoid/pkg-plist ============================================================================== --- head/multimedia/webcamoid/pkg-plist Wed Mar 6 22:29:32 2019 (r494856) +++ head/multimedia/webcamoid/pkg-plist Wed Mar 6 22:30:49 2019 (r494857) @@ -61,6 +61,7 @@ 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 @@ -75,17 +76,12 @@ 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/avkys/submodules/VirtualCamera/libffmpeg.so -lib/avkys/submodules/VirtualCamera/libgstreamer.so -lib/avkys/submodules/VirtualCamera/libv4l2sys.so -lib/avkys/submodules/VirtualCamera/libv4lutils.so lib/libavkys.so lib/libavkys.so.8 -lib/libavkys.so.8.1 -lib/libavkys.so.8.1.0 +lib/libavkys.so.8.5 +lib/libavkys.so.8.5.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