Date: Mon, 26 Jan 2026 02:25:32 +0000 From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Eric Camachat <eric@camachat.org> Subject: git: 88cbd0fef1d3 - main - multimedia/webcamoid: update 9=?utf-8?Q?=2E1.1 =E2=86=92?= 9.3.0 Message-ID: <6976d09c.211ec.651c1947@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=88cbd0fef1d3ad3271c5d4f5924844b4df827fdc commit 88cbd0fef1d3ad3271c5d4f5924844b4df827fdc Author: Eric Camachat <eric@camachat.org> AuthorDate: 2026-01-25 23:14:22 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2026-01-26 02:25:26 +0000 multimedia/webcamoid: update 9.1.1 → 9.3.0 PR: 291987 --- multimedia/webcamoid/Makefile | 31 ++-- multimedia/webcamoid/distinfo | 6 +- ...coders_svtav1_src_videoencodersvtav1element.cpp | 22 +++ ...Capture_src_capture_v4l2sys_src_capturev4l2.cpp | 8 +- ...ins_VirtualCamera_src_v4l2lb_src_vcamv4l2lb.cpp | 8 +- multimedia/webcamoid/pkg-plist | 201 +++++++++++---------- 6 files changed, 156 insertions(+), 120 deletions(-) diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile index 24ff8f13933d..c50f5e06d12a 100644 --- a/multimedia/webcamoid/Makefile +++ b/multimedia/webcamoid/Makefile @@ -1,6 +1,5 @@ PORTNAME= webcamoid -DISTVERSION= 9.1.1 -PORTREVISION= 2 +DISTVERSION= 9.3.0 CATEGORIES= multimedia MAINTAINER= yuri@FreeBSD.org @@ -11,38 +10,34 @@ WWW= https://webcamoid.github.io \ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= Does not build with ffmpeg > 6 - BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -LIB_DEPENDS= libasound.so:audio/alsa-lib \ +LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 \ + libaom.so:multimedia/aom \ + libasound.so:audio/alsa-lib \ libavcodec.so:multimedia/ffmpeg \ libjack.so:audio/jack \ + libopus.so:audio/opus \ libpipewire-0.3.so:multimedia/pipewire \ libportaudio.so:audio/portaudio \ libpulse.so:audio/pulseaudio \ libuvc.so:multimedia/libuvc \ libv4l2.so:multimedia/libv4l \ - libvlc.so:multimedia/vlc + libvlc.so:multimedia/vlc \ + libvorbisenc.so:audio/libvorbis \ + libvpx.so:multimedia/libvpx \ + libx264.so:multimedia/libx264 -USES= cmake compiler:c++11-lang desktop-file-utils gl gnome gstreamer pkgconfig qt:5 sdl xorg +USES= cmake compiler:c++11-lang desktop-file-utils gl gnome gstreamer pkgconfig qt:6 sdl xorg USE_GITHUB= yes USE_GNOME= glib20 USE_GL= gl -USE_QT= concurrent core dbus declarative gui multimedia network opengl quickcontrols2 svg widgets xml \ - buildtools:build qmake:build quickcontrols:run +USE_QT= base declarative multimedia svg USE_SDL= sdl2 +USE_X11= x11 xext xfixes xrandr 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} \ LIBDIR=${PREFIX}/lib \ MANDIR=${PREFIX}/man -.include <bsd.port.pre.mk> - -.if ${CHOSEN_COMPILER_TYPE} == gcc -# Workaround for Bug#224137: devel/qt5-qmake: Doesn't use the right compiler in case USE_GCC is selected -BINARY_ALIAS= g++=${CXX} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/webcamoid/distinfo b/multimedia/webcamoid/distinfo index bc1bce1db448..666cfa46b020 100644 --- a/multimedia/webcamoid/distinfo +++ b/multimedia/webcamoid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686979739 -SHA256 (webcamoid-webcamoid-9.1.1_GH0.tar.gz) = 70209d5ff5f3d00b71376171a73a4ce610ecee5e050edca658c484c0cb508e74 -SIZE (webcamoid-webcamoid-9.1.1_GH0.tar.gz) = 9288681 +TIMESTAMP = 1766807597 +SHA256 (webcamoid-webcamoid-9.3.0_GH0.tar.gz) = 5f9fefb305f4309283d06daae663f16ca47a67c0c640fd3031a3e88738fe6879 +SIZE (webcamoid-webcamoid-9.3.0_GH0.tar.gz) = 9666604 diff --git a/multimedia/webcamoid/files/patch-libAvKys_Plugins_Codecs_Video_Encoders_svtav1_src_videoencodersvtav1element.cpp b/multimedia/webcamoid/files/patch-libAvKys_Plugins_Codecs_Video_Encoders_svtav1_src_videoencodersvtav1element.cpp new file mode 100644 index 000000000000..05de407b5eff --- /dev/null +++ b/multimedia/webcamoid/files/patch-libAvKys_Plugins_Codecs_Video_Encoders_svtav1_src_videoencodersvtav1element.cpp @@ -0,0 +1,22 @@ +--- libAvKys/Plugins/Codecs/Video/Encoders/svtav1/src/videoencodersvtav1element.cpp.orig 2025-07-29 01:36:55 UTC ++++ libAvKys/Plugins/Codecs/Video/Encoders/svtav1/src/videoencodersvtav1element.cpp +@@ -344,7 +344,9 @@ bool VideoEncoderSvtAv1ElementPrivate::init() + + configs.enc_mode = uint8_t(qBound(0, self->optionValue("speed").toInt(), 9)); + configs.tune = uint8_t(self->optionValue("tuneContent").toUInt()); ++#if !SVT_AV1_CHECK_VERSION(2, 0, 0) + configs.target_socket = -1; ++#endif + + #if SVT_AV1_CHECK_VERSION(3, 0, 0) + configs.level_of_parallelism = QThread::idealThreadCount(); +@@ -353,7 +355,9 @@ bool VideoEncoderSvtAv1ElementPrivate::init() + #endif + + configs.rate_control_mode = SVT_AV1_RC_MODE_CBR; ++#if !SVT_AV1_CHECK_VERSION(4, 0, 0) + configs.pred_structure = SVT_AV1_PRED_LOW_DELAY_B; // Otherwise CBR won't work ++#endif + configs.target_bit_rate = self->bitrate(); + configs.profile = eqFormat->profile; + configs.color_primaries = EB_CICP_CP_UNSPECIFIED; diff --git a/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_capture_v4l2sys_src_capturev4l2.cpp b/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_capture_v4l2sys_src_capturev4l2.cpp index 05041581c5a7..30e96089df3a 100644 --- a/multimedia/webcamoid/files/patch-libAvKys_Plugins_VideoCapture_src_capture_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/capture/v4l2sys/src/capturev4l2.cpp.orig 2023-04-04 08:06:27 UTC +--- libAvKys/Plugins/VideoCapture/src/capture/v4l2sys/src/capturev4l2.cpp.orig 2025-07-29 01:36:55 UTC +++ libAvKys/Plugins/VideoCapture/src/capture/v4l2sys/src/capturev4l2.cpp -@@ -910,6 +910,7 @@ void CaptureV4L2::reset() +@@ -941,6 +941,7 @@ CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *se CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *self): self(self) { @@ -8,7 +8,7 @@ this->m_fsWatcher = new QFileSystemWatcher({"/dev"}, self); QObject::connect(this->m_fsWatcher, &QFileSystemWatcher::directoryChanged, -@@ -917,12 +918,15 @@ CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *se +@@ -948,12 +949,15 @@ CaptureV4L2Private::CaptureV4L2Private(CaptureV4L2 *se [this] () { this->updateDevices(); }); @@ -24,7 +24,7 @@ } int CaptureV4L2Private::planesCount(const v4l2_format &format) const -@@ -1765,11 +1769,13 @@ void CaptureV4L2Private::updateDevices() +@@ -1809,11 +1813,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 index 67a9a1edf9ff..e956242f1a87 100644 --- 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 @@ -1,6 +1,6 @@ ---- libAvKys/Plugins/VirtualCamera/src/v4l2lb/src/vcamv4l2lb.cpp.orig 2023-04-04 08:08:44 UTC +--- libAvKys/Plugins/VirtualCamera/src/v4l2lb/src/vcamv4l2lb.cpp.orig 2025-07-29 01:36:55 UTC +++ libAvKys/Plugins/VirtualCamera/src/v4l2lb/src/vcamv4l2lb.cpp -@@ -1283,6 +1283,7 @@ VCamV4L2LoopBackPrivate::VCamV4L2LoopBackPrivate(VCamV +@@ -1449,6 +1449,7 @@ VCamV4L2LoopBackPrivate::VCamV4L2LoopBackPrivate(VCamV self(self) { this->initDefaultFormats(); @@ -8,7 +8,7 @@ this->m_fsWatcher = new QFileSystemWatcher({"/dev"}, self); QObject::connect(this->m_fsWatcher, &QFileSystemWatcher::directoryChanged, -@@ -1290,12 +1291,15 @@ VCamV4L2LoopBackPrivate::VCamV4L2LoopBackPrivate(VCamV +@@ -1456,12 +1457,15 @@ VCamV4L2LoopBackPrivate::VCamV4L2LoopBackPrivate(VCamV [this] () { this->updateDevices(); }); @@ -24,7 +24,7 @@ } int VCamV4L2LoopBackPrivate::xioctl(int fd, ulong request, void *arg) const -@@ -2351,11 +2355,13 @@ void VCamV4L2LoopBackPrivate::updateDevices() +@@ -2511,11 +2515,13 @@ void VCamV4L2LoopBackPrivate::updateDevices() this->m_devicesFormats = devicesFormats; if (this->m_devices != devices) { diff --git a/multimedia/webcamoid/pkg-plist b/multimedia/webcamoid/pkg-plist index 7ab79e3c1d84..d7908742cc54 100644 --- a/multimedia/webcamoid/pkg-plist +++ b/multimedia/webcamoid/pkg-plist @@ -1,97 +1,116 @@ bin/webcamoid -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 -lib/avkys/libChangeHSL.so -lib/avkys/libCharify.so -lib/avkys/libCinema.so -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/libCrop.so -lib/avkys/libDelayGrab.so -lib/avkys/libDenoise.so -lib/avkys/libDesktopCapture.so -lib/avkys/libDesktopCapture_ffmpeg.so -lib/avkys/libDesktopCapture_pipewire.so -lib/avkys/libDesktopCapture_qtscreen.so -lib/avkys/libDice.so -lib/avkys/libDistort.so -lib/avkys/libDizzy.so -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/libMultiSrc_ffmpeg.so -lib/avkys/libMultiSrc_gstreamer.so -lib/avkys/libMultiSrc_vlc.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/libQuark.so -lib/avkys/libRadioactive.so -lib/avkys/libRipple.so -lib/avkys/libRotate.so -lib/avkys/libSaturated.so -lib/avkys/libScanLines.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_libuvc.so -lib/avkys/libVideoCapture_qtcamera.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/libZoom.so lib/libavkys.so lib/libavkys.so.9 -lib/libavkys.so.9.1.1 +lib/libavkys.so.9.3.0 +lib/qt/plugins/avkys/libAdjustHSL.so +lib/qt/plugins/avkys/libAging.so +lib/qt/plugins/avkys/libAnalogTV.so +lib/qt/plugins/avkys/libAspectRatio.so +lib/qt/plugins/avkys/libAudioDevice.so +lib/qt/plugins/avkys/libAudioDevice_alsa.so +lib/qt/plugins/avkys/libAudioDevice_jack.so +lib/qt/plugins/avkys/libAudioDevice_pipewire.so +lib/qt/plugins/avkys/libAudioDevice_portaudio.so +lib/qt/plugins/avkys/libAudioDevice_pulseaudio.so +lib/qt/plugins/avkys/libAudioDevice_qtaudio.so +lib/qt/plugins/avkys/libAudioDevice_sdl.so +lib/qt/plugins/avkys/libAudioEncoder_ffmpeg.so +lib/qt/plugins/avkys/libAudioEncoder_opus.so +lib/qt/plugins/avkys/libAudioEncoder_vorbis.so +lib/qt/plugins/avkys/libAudioGen.so +lib/qt/plugins/avkys/libBlur.so +lib/qt/plugins/avkys/libCartoon.so +lib/qt/plugins/avkys/libChangeHSL.so +lib/qt/plugins/avkys/libCharify.so +lib/qt/plugins/avkys/libCinema.so +lib/qt/plugins/avkys/libColorFilter.so +lib/qt/plugins/avkys/libColorKey.so +lib/qt/plugins/avkys/libColorReplace.so +lib/qt/plugins/avkys/libColorTap.so +lib/qt/plugins/avkys/libColorTransform.so +lib/qt/plugins/avkys/libContrast.so +lib/qt/plugins/avkys/libConvolve.so +lib/qt/plugins/avkys/libCrop.so +lib/qt/plugins/avkys/libDelayGrab.so +lib/qt/plugins/avkys/libDenoise.so +lib/qt/plugins/avkys/libDesktopCapture.so +lib/qt/plugins/avkys/libDesktopCapture_ffmpeg.so +lib/qt/plugins/avkys/libDesktopCapture_pipewire.so +lib/qt/plugins/avkys/libDesktopCapture_qtscreen.so +lib/qt/plugins/avkys/libDesktopCapture_xlib.so +lib/qt/plugins/avkys/libDice.so +lib/qt/plugins/avkys/libDistort.so +lib/qt/plugins/avkys/libDizzy.so +lib/qt/plugins/avkys/libEdge.so +lib/qt/plugins/avkys/libEmboss.so +lib/qt/plugins/avkys/libEqualize.so +lib/qt/plugins/avkys/libFaceDetect.so +lib/qt/plugins/avkys/libFaceTrack.so +lib/qt/plugins/avkys/libFalseColor.so +lib/qt/plugins/avkys/libFillAudioGaps.so +lib/qt/plugins/avkys/libFire.so +lib/qt/plugins/avkys/libFlip.so +lib/qt/plugins/avkys/libFpsControl.so +lib/qt/plugins/avkys/libFrameOverlap.so +lib/qt/plugins/avkys/libGamma.so +lib/qt/plugins/avkys/libGrayScale.so +lib/qt/plugins/avkys/libHalftone.so +lib/qt/plugins/avkys/libHypnotic.so +lib/qt/plugins/avkys/libImageSrc.so +lib/qt/plugins/avkys/libImplode.so +lib/qt/plugins/avkys/libInvert.so +lib/qt/plugins/avkys/libLife.so +lib/qt/plugins/avkys/libMatrix.so +lib/qt/plugins/avkys/libMatrixTransform.so +lib/qt/plugins/avkys/libMultiSrc.so +lib/qt/plugins/avkys/libMultiSrc_ffmpeg.so +lib/qt/plugins/avkys/libMultiSrc_gstreamer.so +lib/qt/plugins/avkys/libMultiSrc_vlc.so +lib/qt/plugins/avkys/libNervous.so +lib/qt/plugins/avkys/libNormalize.so +lib/qt/plugins/avkys/libOilPaint.so +lib/qt/plugins/avkys/libOpacity.so +lib/qt/plugins/avkys/libOtsu.so +lib/qt/plugins/avkys/libPacketSync.so +lib/qt/plugins/avkys/libPhotocopy.so +lib/qt/plugins/avkys/libPixelate.so +lib/qt/plugins/avkys/libQuark.so +lib/qt/plugins/avkys/libRadioactive.so +lib/qt/plugins/avkys/libRipple.so +lib/qt/plugins/avkys/libRotate.so +lib/qt/plugins/avkys/libSaturated.so +lib/qt/plugins/avkys/libScanLines.so +lib/qt/plugins/avkys/libShagadelic.so +lib/qt/plugins/avkys/libSimdCore_avx.so +lib/qt/plugins/avkys/libSimdCore_avx2.so +lib/qt/plugins/avkys/libSimdCore_mmx.so +lib/qt/plugins/avkys/libSimdCore_sse.so +lib/qt/plugins/avkys/libSimdCore_sse2.so +lib/qt/plugins/avkys/libSimdCore_sse4_1.so +lib/qt/plugins/avkys/libSwapRB.so +lib/qt/plugins/avkys/libSwirl.so +lib/qt/plugins/avkys/libTemperature.so +lib/qt/plugins/avkys/libVideoCapture.so +lib/qt/plugins/avkys/libVideoCapture_ffmpeg.so +lib/qt/plugins/avkys/libVideoCapture_gstreamer.so +lib/qt/plugins/avkys/libVideoCapture_libuvc.so +lib/qt/plugins/avkys/libVideoCapture_pipewire.so +lib/qt/plugins/avkys/libVideoCapture_qtcamera.so +lib/qt/plugins/avkys/libVideoCapture_v4l2sys.so +lib/qt/plugins/avkys/libVideoCapture_v4lutils.so +lib/qt/plugins/avkys/libVideoEncoder_av1.so +lib/qt/plugins/avkys/libVideoEncoder_ffmpeg.so +lib/qt/plugins/avkys/libVideoEncoder_svtav1.so +lib/qt/plugins/avkys/libVideoEncoder_vpx.so +lib/qt/plugins/avkys/libVideoEncoder_x264.so +lib/qt/plugins/avkys/libVideoMuxer_ffmpeg.so +lib/qt/plugins/avkys/libVignette.so +lib/qt/plugins/avkys/libVirtualCamera.so +lib/qt/plugins/avkys/libVirtualCamera_v4l2lb.so +lib/qt/plugins/avkys/libWarhol.so +lib/qt/plugins/avkys/libWarp.so +lib/qt/plugins/avkys/libWave.so +lib/qt/plugins/avkys/libZoom.so share/applications/webcamoid.desktop share/icons/hicolor/128x128/apps/webcamoid.png share/icons/hicolor/16x16/apps/webcamoid.pnghome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6976d09c.211ec.651c1947>
