5 files changed, 94 insertions, 41 deletions

diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile
index 749b1b4ad6b3..6ce169120093 100644
--- a/multimedia/webcamoid/Makefile
+++ b/multimedia/webcamoid/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	webcamoid
-DISTVERSION=	8.8.0
-PORTREVISION=	2
+DISTVERSION=	9.0.0-204
+DISTVERSIONSUFFIX=	-g2b708bfb0
 CATEGORIES=	multimedia
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,15 +14,19 @@ 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 \
+		libpipewire-0.3.so:multimedia/pipewire \
+		libportaudio.so:audio/portaudio \
 		libpulse.so:audio/pulseaudio \
 		libv4l2.so:multimedia/libv4l
 
-USES=		compiler:c++11-lang gl gnome gstreamer pkgconfig qmake qt:5 xorg
+USES=		cmake compiler:c++11-lang desktop-file-utils gl gnome gstreamer pkgconfig qt:5 sdl xorg
 USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_GL=		gl
-USE_QT=		concurrent core declarative gui multimedia network opengl quickcontrols2 svg widgets xml \
-		buildtools:build quickcontrols:run
+USE_QT=		concurrent core dbus declarative gui multimedia network opengl quickcontrols2 svg widgets xml \
+		buildtools:build qmake:build quickcontrols:run
+USE_SDL=	sdl2
+USE_LDCONFIG=	yes
 
 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} \
diff --git a/multimedia/webcamoid/distinfo b/multimedia/webcamoid/distinfo
index 0f4ce892e472..471420444e99 100644
--- a/multimedia/webcamoid/distinfo
+++ b/multimedia/webcamoid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613620488
-SHA256 (webcamoid-webcamoid-8.8.0_GH0.tar.gz) = 77ed77cbaf57180247485646b81af30edcc89ee545bc241c23d8bd648464bf15
-SIZE (webcamoid-webcamoid-8.8.0_GH0.tar.gz) = 8887888
+TIMESTAMP = 1681405066
+SHA256 (webcamoid-webcamoid-9.0.0-204-g2b708bfb0_GH0.tar.gz) = 45b5e48a61fbd42e91c642a92af7ecea3f0e5dc801a2abcb10c330eba97d33d8
+SIZE (webcamoid-webcamoid-9.0.0-204-g2b708bfb0_GH0.tar.gz) = 9280268
diff --git a/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp b/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_capture_v4l2sys_src_capturev4l2.cpp
index 3324daf47569..05041581c5a7 100644
--- a/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_v4l2sys_src_capturev4l2.cpp
+++ b/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_capture_v4l2sys_src_capturev4l2.cpp
@@ -1,6 +1,6 @@
---- libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp.orig	2021-02-15 15:25:23 UTC
-+++ libAvKys/Plugins/VideoCapture/src/v4l2sys/src/capturev4l2.cpp
-@@ -727,6 +727,7 @@ void CaptureV4L2::reset()
+--- libAvKys/Plugins/VideoCapture/src/capture/v4l2sys/src/capturev4l2.cpp.orig	2023-04-04 08:06:27 UTC
++++ libAvKys/Plugins/VideoCapture/src/capture/v4l2sys/src/capturev4l2.cpp
+@@ -910,6 +910,7 @@ void CaptureV4L2::reset()
  CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *self):
      self(self)
  {
@@ -8,7 +8,7 @@
      this->m_fsWatcher = new QFileSystemWatcher({"/dev"}, self);
      QObject::connect(this->m_fsWatcher,
                       &QFileSystemWatcher::directoryChanged,
-@@ -734,12 +735,15 @@ CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *se
+@@ -917,12 +918,15 @@ CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *se
                       [this] () {
          this->updateDevices();
      });
@@ -23,8 +23,8 @@
 +#endif
  }
  
- QVariantList CaptureV4L2Private::capsFps(int fd,
-@@ -1385,11 +1389,13 @@ void CaptureV4L2Private::updateDevices()
+ int CaptureV4L2Private::planesCount(const v4l2_format &format) const
+@@ -1765,11 +1769,13 @@ void CaptureV4L2Private::updateDevices()
      this->m_devicesCaps = devicesCaps;
  
      if (this->m_devices != devices) {
diff --git a/multimedia/webcamoid/files/patch-libAvKys_Plugins_VirtualCamera_src_v4l2lb_src_vcamv4l2lb.cpp b/multimedia/webcamoid/files/patch-libAvKys_Plugins_VirtualCamera_src_v4l2lb_src_vcamv4l2lb.cpp
new file mode 100644
index 000000000000..67a9a1edf9ff
--- /dev/null
+++ b/multimedia/webcamoid/files/patch-libAvKys_Plugins_VirtualCamera_src_v4l2lb_src_vcamv4l2lb.cpp
@@ -0,0 +1,41 @@
+--- libAvKys/Plugins/VirtualCamera/src/v4l2lb/src/vcamv4l2lb.cpp.orig	2023-04-04 08:08:44 UTC
++++ libAvKys/Plugins/VirtualCamera/src/v4l2lb/src/vcamv4l2lb.cpp
+@@ -1283,6 +1283,7 @@ VCamV4L2LoopBackPrivate::VCamV4L2LoopBackPrivate(VCamV
+     self(self)
+ {
+     this->initDefaultFormats();
++#if !defined(FREEBSD_BUG224011_VIDEO0)
+     this->m_fsWatcher = new QFileSystemWatcher({"/dev"}, self);
+     QObject::connect(this->m_fsWatcher,
+                      &QFileSystemWatcher::directoryChanged,
+@@ -1290,12 +1291,15 @@ VCamV4L2LoopBackPrivate::VCamV4L2LoopBackPrivate(VCamV
+                      [this] () {
+         this->updateDevices();
+     });
++#endif
+     this->updateDevices();
+ }
+ 
+ VCamV4L2LoopBackPrivate::~VCamV4L2LoopBackPrivate()
+ {
++#if !defined(FREEBSD_BUG224011_VIDEO0)
+     delete this->m_fsWatcher;
++#endif
+ }
+ 
+ int VCamV4L2LoopBackPrivate::xioctl(int fd, ulong request, void *arg) const
+@@ -2351,11 +2355,13 @@ void VCamV4L2LoopBackPrivate::updateDevices()
+     this->m_devicesFormats = devicesFormats;
+ 
+     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
diff --git a/multimedia/webcamoid/pkg-plist b/multimedia/webcamoid/pkg-plist
index 6f4a4e3202c3..f682ea1c76a4 100644
--- a/multimedia/webcamoid/pkg-plist
+++ b/multimedia/webcamoid/pkg-plist
@@ -1,7 +1,14 @@
 bin/webcamoid
-lib/avkys/libACapsConvert.so
+lib/avkys/libAdjustHSL.so
 lib/avkys/libAging.so
+lib/avkys/libAnalogTV.so
+lib/avkys/libAspectRatio.so
 lib/avkys/libAudioDevice.so
+lib/avkys/libAudioDevice_alsa.so
+lib/avkys/libAudioDevice_jack.so
+lib/avkys/libAudioDevice_portaudio.so
+lib/avkys/libAudioDevice_pulseaudio.so
+lib/avkys/libAudioDevice_sdl.so
 lib/avkys/libAudioGen.so
 lib/avkys/libBlur.so
 lib/avkys/libCartoon.so
@@ -12,10 +19,13 @@ lib/avkys/libColorFilter.so
 lib/avkys/libColorReplace.so
 lib/avkys/libColorTap.so
 lib/avkys/libColorTransform.so
+lib/avkys/libContrast.so
 lib/avkys/libConvolve.so
 lib/avkys/libDelayGrab.so
 lib/avkys/libDenoise.so
 lib/avkys/libDesktopCapture.so
+lib/avkys/libDesktopCapture_pipewire.so
+lib/avkys/libDesktopCapture_qtscreen.so
 lib/avkys/libDice.so
 lib/avkys/libDistort.so
 lib/avkys/libDizzy.so
@@ -23,64 +33,60 @@ lib/avkys/libEdge.so
 lib/avkys/libEmboss.so
 lib/avkys/libEqualize.so
 lib/avkys/libFaceDetect.so
+lib/avkys/libFaceTrack.so
 lib/avkys/libFalseColor.so
 lib/avkys/libFire.so
+lib/avkys/libFlip.so
 lib/avkys/libFrameOverlap.so
+lib/avkys/libGamma.so
 lib/avkys/libGrayScale.so
 lib/avkys/libHalftone.so
 lib/avkys/libHypnotic.so
+lib/avkys/libImageSrc.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/libMultiSink_ffmpeg.so
+lib/avkys/libMultiSink_gstreamer.so
 lib/avkys/libMultiSrc.so
-lib/avkys/libMultiplex.so
+lib/avkys/libMultiSrc_ffmpeg.so
+lib/avkys/libMultiSrc_gstreamer.so
 lib/avkys/libNervous.so
 lib/avkys/libNormalize.so
 lib/avkys/libOilPaint.so
+lib/avkys/libOpacity.so
+lib/avkys/libOtsu.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/libRotate.so
+lib/avkys/libSaturated.so
 lib/avkys/libScanLines.so
-lib/avkys/libScroll.so
 lib/avkys/libShagadelic.so
+lib/avkys/libSwapRB.so
 lib/avkys/libSwirl.so
 lib/avkys/libTemperature.so
 lib/avkys/libVideoCapture.so
+lib/avkys/libVideoCapture_ffmpeg.so
+lib/avkys/libVideoCapture_gstreamer.so
+lib/avkys/libVideoCapture_v4l2sys.so
+lib/avkys/libVideoCapture_v4lutils.so
 lib/avkys/libVignette.so
 lib/avkys/libVirtualCamera.so
+lib/avkys/libVirtualCamera_akvcam.so
+lib/avkys/libVirtualCamera_v4l2lb.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/avkys/libZoom.so
 lib/libavkys.so
-lib/libavkys.so.8
-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
+lib/libavkys.so.9
+lib/libavkys.so.9.1.0
 share/applications/webcamoid.desktop
 share/icons/hicolor/128x128/apps/webcamoid.png
 share/icons/hicolor/16x16/apps/webcamoid.png
@@ -91,3 +97,5 @@ 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
+share/man/man1/webcamoid.1.gz
+share/metainfo/io.github.webcamoid.Webcamoid.metainfo.xml