From owner-svn-ports-all@freebsd.org Fri Apr 17 14:26:44 2020 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 19B442BB2EB; Fri, 17 Apr 2020 14:26:44 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [IPv6:2a01:4f8:c17:6c4b::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 493dh36jqkz40Vh; Fri, 17 Apr 2020 14:26:43 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2020.home.selasky.org (unknown [62.141.129.235]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id BCA782601E2; Fri, 17 Apr 2020 16:26:41 +0200 (CEST) Subject: Re: svn commit: r531911 - in head/multimedia: libv4l libv4l/files v4l-utils v4l_compat To: Baptiste Daroussin , Kyle Evans Cc: ports-committers , svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <202004170834.03H8YoK4060398@repo.freebsd.org> <20200417141708.cro6emqruriiuu3x@ivaldir.net> From: Hans Petter Selasky Message-ID: <4c30b9c7-401a-2905-6b4f-1f7ae86671ee@selasky.org> Date: Fri, 17 Apr 2020 16:25:20 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200417141708.cro6emqruriiuu3x@ivaldir.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 493dh36jqkz40Vh X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] 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: Fri, 17 Apr 2020 14:26:44 -0000 On 2020-04-17 16:17, Baptiste Daroussin wrote: > On Fri, Apr 17, 2020 at 09:15:30AM -0500, Kyle Evans wrote: >> On Fri, Apr 17, 2020 at 3:34 AM Hans Petter Selasky >> wrote: >>> >>> Author: hselasky >>> Date: Fri Apr 17 08:34:50 2020 >>> New Revision: 531911 >>> URL: https://svnweb.freebsd.org/changeset/ports/531911 >>> >>> Log: >>> Upgrade v4l_compat, libv4l and v4l-utils to v1.18.0. >>> >>> The most important change is that up-to-date V4L header files are now >>> sourced from the webcamd distribution tarball. >>> >>> Refer to the ChangeLog file in the v4l-utils tarball for a comprehensive >>> list of changes. >>> >>> PR: 245501 >>> Approved by: pi (implicit) >>> >>> [... snip ...] >>> +# Remove old FreeBSD include files (to be removed upstream) >>> + @${RM} -r ${WRKDIR}/v4l-utils-${PORTVERSION}/contrib/freebsd/include/* >>> +# Apply webcamd patches first >>> + @(cd ${WRKDIR}/webcamd-${WEBCAMDVERSION}/patches && ${SH} ./do_patch.sh) >>> +# Patch Makefiles to use GNU-sed >>> + @${FIND} ${WRKDIR}/v4l-utils-${PORTVERSION} -type f \( -iname "Makefile*" \) | \ >>> ${XARGS} -n 10 ${REINPLACE_CMD} \ >>> - -e 's|linux/types.h|sys/types.h|g; s|__user||g; \ >>> - s|__u8|uint8_t|g; s|__s8|int8_t|g; \ >>> - s|__u16|uint16_t|g; s|__s16|int16_t|g; \ >>> - s|__u32|uint32_t|g; s|__s32|int32_t|g; \ >>> - s|__u64|uint64_t|g; s|__s64|int64_t|g' >>> -.if ${PORTNAME} == v4l_compat >>> -.for patch in ${HEADER_PATCHES} >>> - @cd ${WRKDIR}/linux && ${PATCH} -p2 < ${FILESDIR}/${patch} >>> -.endfor >>> -.endif >>> + -e 's|^\([[:space:]]*\)sed |\1${LOCALBASE}/bin/gsed |' >> >> Hi, >> >> Based on the pattern you used here, I suspect this could instead be a >> BINARY_ALIAS instead to obviate the need to do/maintain these >> replacements. >> >> BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed > > Or its simpler version: BINARY_ALIAS sed=gsed :D > Good idea. I'll fix! --HPS