From owner-svn-ports-all@freebsd.org Sat Nov 30 20:04:41 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AB6E61B5BB0; Sat, 30 Nov 2019 20:04:41 +0000 (UTC) (envelope-from rene@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 47QMm9496Vz4QLW; Sat, 30 Nov 2019 20:04:41 +0000 (UTC) (envelope-from rene@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 53E6438A0; Sat, 30 Nov 2019 20:04:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAUK4f7w048360; Sat, 30 Nov 2019 20:04:41 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAUK4eLd048349; Sat, 30 Nov 2019 20:04:40 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201911302004.xAUK4eLd048349@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 30 Nov 2019 20:04:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518723 - in head/multimedia/webcamd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/multimedia/webcamd: . files X-SVN-Commit-Revision: 518723 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Nov 2019 20:04:41 -0000 Author: rene Date: Sat Nov 30 20:04:40 2019 New Revision: 518723 URL: https://svnweb.freebsd.org/changeset/ports/518723 Log: multimedia/webcamd: complete modernization - drop legacy CUSE4BSD support - bump PORTREVISION Reported by: jbeich Approved by: maintainer (hselasky, upfront) Modified: head/multimedia/webcamd/Makefile head/multimedia/webcamd/files/webcamd.in head/multimedia/webcamd/pkg-descr head/multimedia/webcamd/pkg-message Modified: head/multimedia/webcamd/Makefile ============================================================================== --- head/multimedia/webcamd/Makefile Sat Nov 30 17:43:06 2019 (r518722) +++ head/multimedia/webcamd/Makefile Sat Nov 30 20:04:40 2019 (r518723) @@ -3,6 +3,7 @@ PORTNAME= webcamd PORTVERSION= 5.3.7.1 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.selasky.org/hans_petter/distfiles/ \ http://home.selasky.org/distfiles/ @@ -16,33 +17,19 @@ BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l LIB_DEPENDS= libv4l1.so:multimedia/libv4l USES= pkgconfig tar:bzip2 uidfix -MAKE_ARGS= LIBDIR="${LOCALBASE}/lib" +MAKE_ARGS= LIBDIR="${LOCALBASE}/lib" HAVE_CUSE="YES" USE_RC_SUBR= webcamd SUB_FILES= webcamd.conf -USE_LDCONFIG= yes -OPTIONS_DEFINE= COMPAT32 CUSE DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM +OPTIONS_DEFINE= COMPAT32 DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM OPTIONS_DEFAULT=DVB HAL INPUT RADIO WEBCAM -.if exists(/usr/lib/libcuse.so) -OPTIONS_DEFAULT+= CUSE -.else -OPTIONS_EXCLUDE+= CUSE -.endif - COMPAT32_DESC= Enable 32-bit compatibility support COMPAT32_MAKE_ARGS= HAVE_COMPAT32="YES" .if exists(/usr/lib32/libcuse.so) OPTIONS_DEFAULT+= COMPAT32 .endif - -CUSE_DESC= Use cuse(3) over multimedia/cuse4bsd-kmod -CUSE_MAKE_ARGS= HAVE_CUSE="YES" -CUSE_SUB_LIST= LIBCUSE="" -CUSE_BUILD_DEPENDS_OFF= cuse4bsd-kmod>=0.1.24:multimedia/cuse4bsd-kmod -CUSE_LIB_DEPENDS_OFF= libcuse4bsd.so:multimedia/cuse4bsd-kmod -CUSE_SUB_LIST_OFF= LIBCUSE="${LOCALBASE}/lib/libcuse4bsd.so" HAL_DESC= Build with HAL and DBUS support HAL_LIB_DEPENDS+= libhal.so:sysutils/hal Modified: head/multimedia/webcamd/files/webcamd.in ============================================================================== --- head/multimedia/webcamd/files/webcamd.in Sat Nov 30 17:43:06 2019 (r518722) +++ head/multimedia/webcamd/files/webcamd.in Sat Nov 30 20:04:40 2019 (r518723) @@ -109,7 +109,7 @@ status_cmd="${name}_status" webcamd() { # When running early we need to pre-load some libraries - env LD_PRELOAD=%%LIBHAL%%%%LIBCUSE%% %%PREFIX%%/sbin/webcamd $* + env LD_PRELOAD=%%LIBHAL%% %%PREFIX%%/sbin/webcamd $* } webcamd_pids() Modified: head/multimedia/webcamd/pkg-descr ============================================================================== --- head/multimedia/webcamd/pkg-descr Sat Nov 30 17:43:06 2019 (r518722) +++ head/multimedia/webcamd/pkg-descr Sat Nov 30 20:04:40 2019 (r518723) @@ -1,8 +1,8 @@ Webcamd is a daemon that enables use of hundreds of different USB -based webcam and DVB USB devices under the FreeBSD-8/9 operating +based webcam and DVB USB devices under the FreeBSD operating system. The webcam daemon is basically an application which is a port of Linux USB device drivers into userspace on FreeBSD. The daemon -currently depends on libc, pthreads, libusb and the CUSE4BSD kernel +currently depends on libc, pthreads, libusb and the CUSE kernel module. WWW: http://www.selasky.org/hans_petter/video4bsd/ Modified: head/multimedia/webcamd/pkg-message ============================================================================== --- head/multimedia/webcamd/pkg-message Sat Nov 30 17:43:06 2019 (r518722) +++ head/multimedia/webcamd/pkg-message Sat Nov 30 20:04:40 2019 (r518723) @@ -4,14 +4,13 @@ 1) webcamd requires the cuse(3) kernel module. Please load this dependency by doing: - # part of default kernel build # kldload cuse or by adding cuse_load="YES" -to your /boot/loader.conf. +to your /boot/loader.conf 2) add webcamd_enable="YES"