From owner-svn-ports-head@freebsd.org Mon Feb 8 09:42:55 2021 Return-Path: Delivered-To: svn-ports-head@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 3E6C852BCCF; Mon, 8 Feb 2021 09:42:55 +0000 (UTC) (envelope-from bapt@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZ1KW1GfJz3C8w; Mon, 8 Feb 2021 09:42:55 +0000 (UTC) (envelope-from bapt@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 1D02F1560F; Mon, 8 Feb 2021 09:42:55 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1189gs4T009295; Mon, 8 Feb 2021 09:42:54 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1189gsFY009293; Mon, 8 Feb 2021 09:42:54 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202102080942.1189gsFY009293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 8 Feb 2021 09:42:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564686 - in head/multimedia/webcamd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/multimedia/webcamd: . files X-SVN-Commit-Revision: 564686 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 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: Mon, 08 Feb 2021 09:42:55 -0000 Author: bapt Date: Mon Feb 8 09:42:54 2021 New Revision: 564686 URL: https://svnweb.freebsd.org/changeset/ports/564686 Log: Drop dependency on HAL Webcamd does not need hal itself, it only pushes information into it. Given hal is not used anymore anywhere in freebsd, it is time to drop the support for it. Approved by: hselasky (maintainer) Modified: head/multimedia/webcamd/Makefile head/multimedia/webcamd/files/webcamd.in Modified: head/multimedia/webcamd/Makefile ============================================================================== --- head/multimedia/webcamd/Makefile Mon Feb 8 09:27:49 2021 (r564685) +++ head/multimedia/webcamd/Makefile Mon Feb 8 09:42:54 2021 (r564686) @@ -3,6 +3,7 @@ PORTNAME= webcamd DISTVERSION= 5.10.6.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= hselasky@FreeBSD.org @@ -23,8 +24,8 @@ GH_PROJECT= ${PORTNAME} GH_TAGNAME= v${DISTVERSION} GH_TUPLE= torvalds:linux:v5.10-rc6:linux -OPTIONS_DEFINE= DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM -OPTIONS_DEFAULT=DVB HAL INPUT RADIO WEBCAM +OPTIONS_DEFINE= DEBUG VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM +OPTIONS_DEFAULT=DVB INPUT RADIO WEBCAM # # 32-bit compatibility support is mostly useful for @@ -35,13 +36,6 @@ OPTIONS_DEFAULT_amd64= COMPAT32 COMPAT32_DESC= Enable 32-bit compatibility support COMPAT32_MAKE_ARGS= HAVE_COMPAT32="YES" - -HAL_DESC= Build with HAL and DBUS support -HAL_LIB_DEPENDS+= libhal.so:sysutils/hal -HAL_LIB_DEPENDS+= libdbus-1.so:devel/dbus -HAL_MAKE_ARGS= HAVE_HAL="YES" -HAL_SUB_LIST= LIBHAL="${LOCALBASE}/lib/libhal.so:${LOCALBASE}/lib/libdbus-1.so:" -HAL_SUB_LIST_OFF= LIBHAL="" DEBUG_MAKE_ARGS= HAVE_DEBUG="YES" Modified: head/multimedia/webcamd/files/webcamd.in ============================================================================== --- head/multimedia/webcamd/files/webcamd.in Mon Feb 8 09:27:49 2021 (r564685) +++ head/multimedia/webcamd/files/webcamd.in Mon Feb 8 09:42:54 2021 (r564686) @@ -98,18 +98,12 @@ load_rc_config $name devd_device=${2} devd_interface=${3-0} -command=webcamd +command=%%PREFIX%%/sbin/webcamd command_args="-B -U ${webcamd_user} -G ${webcamd_group}" start_cmd="${name}_start" stop_cmd="${name}_stop" status_cmd="${name}_status" - -webcamd() -{ - # When running early we need to pre-load some libraries - env LD_PRELOAD=%%LIBHAL%% %%PREFIX%%/sbin/webcamd $* -} webcamd_pids() {