git: ad94b3a9f215 - main - multimedia/webcamd: Update to last commit, set maintainer

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Tue, 02 Jun 2026 23:14:01 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ad94b3a9f215c003f593c57ae3c779186400ddd4

commit ad94b3a9f215c003f593c57ae3c779186400ddd4
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-06-02 23:08:01 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-06-02 23:08:01 +0000

    multimedia/webcamd: Update to last commit, set maintainer
    
    Commit log:
    https://github.com/hselasky/webcamd/compare/v5.17.1.2...5e085e4
    
    - Allow starting with -c for loopback virtual camera.
    - Update to last commit (2 small commits).
    - Fix warnings from portclippy.
    - Parametrize webcamd with ${PORTNAME}.
    - Split long lines.
    
    PR:             295677
    Sponsored by:   UNIS Labs
    Co-authored-by: Nicolas Goy <me@kuon.ch>
---
 multimedia/webcamd/Makefile         | 92 +++++++++++++++++--------------------
 multimedia/webcamd/distinfo         |  6 ++-
 multimedia/webcamd/files/webcamd.in |  2 +-
 3 files changed, 47 insertions(+), 53 deletions(-)

diff --git a/multimedia/webcamd/Makefile b/multimedia/webcamd/Makefile
index ac8b34e9b870..16c497184f5e 100644
--- a/multimedia/webcamd/Makefile
+++ b/multimedia/webcamd/Makefile
@@ -1,10 +1,14 @@
 PORTNAME=	webcamd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.17.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 
-MAINTAINER=	ports@FreeBSD.org
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+PATCHFILES=	75ec0e3c4171664a0c3798e7331c217828d84b6b.patch:-p1 \
+		5e085e420fe9599a8e77e549cd116a50c753f77b.patch:-p1
+
+MAINTAINER=	me@kuon.ch
 COMMENT=	Port of Linux USB webcam and DVB drivers into userspace
 WWW=		https://github.com/hselasky/webcamd
 
@@ -13,77 +17,63 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
 
 USES=		pkgconfig tar:bzip2 uidfix
-MAKE_ARGS=	LIBDIR="${LOCALBASE}/lib" HAVE_CUSE="YES"
-USE_RC_SUBR=	webcamd
-SUB_FILES=	webcamd.conf
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	hselasky
-GH_PROJECT=	${PORTNAME}
 GH_TUPLE=	torvalds:linux:v5.17-rc1:linux/media_tree \
 		swills:v4l2loopback:8ab6a12:v4l2loopback/contrib/v4l2loopback
-
-OPTIONS_DEFINE=	DEBUG VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM V4L2LOOPBACK
-OPTIONS_DEFAULT=DVB INPUT RADIO WEBCAM V4L2LOOPBACK
-
+USE_RC_SUBR=	${PORTNAME}
+MAKE_ARGS=	HAVE_CUSE="YES" \
+		HAVE_MAN="YES" \
+		LIBDIR="${LOCALBASE}/lib" \
+		MANDIR=${PREFIX}/share/man/man \
+		PTHREAD_LIBS="-lpthread"
+SUB_FILES=	${PORTNAME}.conf
+
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+
+OPTIONS_DEFINE=		DEBUG DVB INPUT KEYBOARD MOUSE RADIO V4L2LOOPBACK \
+			VT_CLIENT VT_SERVER WEBCAM
+OPTIONS_DEFAULT=	DVB INPUT RADIO V4L2LOOPBACK WEBCAM
 #
 # 32-bit compatibility support is mostly useful for
 # platforms using 32-bit applications:
 #
-OPTIONS_DEFINE_amd64=		COMPAT32
-OPTIONS_DEFAULT_amd64=		COMPAT32
+OPTIONS_DEFINE_amd64=	COMPAT32
+OPTIONS_DEFAULT_amd64=	COMPAT32
+
+COMPAT32_DESC=		Enable 32-bit compatibility support
+DVB_DESC=		Build with USB DVB support (DVB-X, analog TV, ...)
+INPUT_DESC=		Build with USB input support (tablet, joystick, HID, IR, ...)
+KEYBOARD_DESC=		Build with USB keyboard support
+MOUSE_DESC=		Build with USB mouse support
+RADIO_DESC=		Build with USB radio support
+V4L2LOOPBACK_DESC=	Build with V4L2 loopback support
+VT_CLIENT_DESC=		Build with vTuner client support
+VT_SERVER_DESC=		Build with vTuner server support
+WEBCAM_DESC=		Build with USB webcam support (UVC, gspca, ...)
 
-COMPAT32_DESC=	Enable 32-bit compatibility support
 COMPAT32_MAKE_ARGS=	HAVE_COMPAT32="YES"
-
 DEBUG_MAKE_ARGS=	HAVE_DEBUG="YES"
-
-VT_CLIENT_DESC=	Build with vTuner client support
-VT_CLIENT_MAKE_ARGS=	HAVE_VTUNER_CLIENT="YES"
-
-VT_SERVER_DESC=	Build with vTuner server support
-VT_SERVER_MAKE_ARGS=	HAVE_VTUNER_SERVER="YES"
-
-DVB_DESC=	Build with USB DVB support (DVB-X, analog TV, ...)
 DVB_MAKE_ARGS=		HAVE_DVB_DRV="YES"
-
-INPUT_DESC=	Build with USB input support (tablet, joystick, HID, IR, ...)
 INPUT_MAKE_ARGS=	HAVE_INPUT_DRV="YES"
-
-KEYBOARD_DESC=	Build with USB keyboard support
 KEYBOARD_MAKE_ARGS=	HAVE_KEYBOARD_DRV="YES"
-
-MOUSE_DESC=	Build with USB mouse support
 MOUSE_MAKE_ARGS=	HAVE_MOUSE_DRV="YES"
-
-RADIO_DESC=	Build with USB radio support
 RADIO_MAKE_ARGS=	HAVE_RADIO_DRV="YES"
-
-WEBCAM_DESC=	Build with USB webcam support (UVC, gspca, ...)
-WEBCAM_MAKE_ARGS=	HAVE_WEBCAM_DRV="YES"
-
-V4L2LOOPBACK_DESC=	Build with V4L2 loopback support
 V4L2LOOPBACK_MAKE_ARGS=	HAVE_V4L2LOOPBACK_DRV="YES"
+VT_CLIENT_MAKE_ARGS=	HAVE_VTUNER_CLIENT="YES"
+VT_SERVER_MAKE_ARGS=	HAVE_VTUNER_SERVER="YES"
+WEBCAM_MAKE_ARGS=	HAVE_WEBCAM_DRV="YES"
 
-USERS=		webcamd
-GROUPS=		webcamd
-
-MAKE_ARGS+=	HAVE_MAN="YES"
-MAKE_ARGS+=	MANDIR=${PREFIX}/share/man/man
-MAKE_ARGS+=	PTHREAD_LIBS="-lpthread"
-
-WEBCAMDDIR=	${WRKDIR}/webcamd-${DISTVERSION}
-LINUXDIR=	${WRKDIR}/linux-*
+post-patch:
+	@(cd ${WRKSRC}/patches && ${SH} ./do_patch.sh)
 
 do-configure:
-	${MAKE} -C${WEBCAMDDIR}/tools/linux_make
-	${MAKE} ${MAKE_ARGS} configure -C${WEBCAMDDIR}
-
-post-patch:
-	@(cd ${WEBCAMDDIR}/patches && ${SH} ./do_patch.sh)
+	${MAKE} -C${WRKSRC}/tools/linux_make
+	${MAKE} ${MAKE_ARGS} configure -C${WRKSRC}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
-	${INSTALL_DATA} "${WRKDIR}/webcamd.conf" ${STAGEDIR}${PREFIX}/etc/devd
+	${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.conf" ${STAGEDIR}${PREFIX}/etc/devd
 
 .include <bsd.port.mk>
diff --git a/multimedia/webcamd/distinfo b/multimedia/webcamd/distinfo
index 42a688adcf84..de6f4ae629b8 100644
--- a/multimedia/webcamd/distinfo
+++ b/multimedia/webcamd/distinfo
@@ -1,7 +1,11 @@
-TIMESTAMP = 1657731286
+TIMESTAMP = 1780424242
 SHA256 (hselasky-webcamd-v5.17.1.2_GH0.tar.gz) = 430c14a0d480c275d0a5bec3fcea1db63802376faba6dba9a3b1c1b72237476c
 SIZE (hselasky-webcamd-v5.17.1.2_GH0.tar.gz) = 273204
 SHA256 (torvalds-linux-v5.17-rc1_GH0.tar.gz) = 9269b46a87c16941871f81057c8b82c913869eb86037b92c0bd4d5b9aa69dece
 SIZE (torvalds-linux-v5.17-rc1_GH0.tar.gz) = 201780465
 SHA256 (swills-v4l2loopback-8ab6a12_GH0.tar.gz) = b8f478ed3b5c06b963958808cb8ffae12a43a5459d9335b51bbc03165c3d169d
 SIZE (swills-v4l2loopback-8ab6a12_GH0.tar.gz) = 64530
+SHA256 (75ec0e3c4171664a0c3798e7331c217828d84b6b.patch) = 9bdb9516a0a4e77ca097009509ad32e48c91a89d7b098bf57066dbf4700e6533
+SIZE (75ec0e3c4171664a0c3798e7331c217828d84b6b.patch) = 616
+SHA256 (5e085e420fe9599a8e77e549cd116a50c753f77b.patch) = 27e133581a7c84497f74b1d0e22b97aec37b02534836a49d2fd6879b5a95b56f
+SIZE (5e085e420fe9599a8e77e549cd116a50c753f77b.patch) = 915
diff --git a/multimedia/webcamd/files/webcamd.in b/multimedia/webcamd/files/webcamd.in
index 30dd72850047..52f3d4599589 100644
--- a/multimedia/webcamd/files/webcamd.in
+++ b/multimedia/webcamd/files/webcamd.in
@@ -190,7 +190,7 @@ webcamd_start_instances()
     fi
 
     # check if valid flags are present
-    if [ ! "$(webcamd_grep_instance_flags '-d|-D|-N|-S')" ]; then
+    if [ ! "$(webcamd_grep_instance_flags '-c|-d|-D|-N|-S')" ]; then
       continue
     fi