Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Apr 2020 16:25:20 +0200
From:      Hans Petter Selasky <hps@selasky.org>
To:        Baptiste Daroussin <bapt@FreeBSD.org>, Kyle Evans <kevans@freebsd.org>
Cc:        ports-committers <ports-committers@freebsd.org>, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r531911 - in head/multimedia: libv4l libv4l/files v4l-utils v4l_compat
Message-ID:  <4c30b9c7-401a-2905-6b4f-1f7ae86671ee@selasky.org>
In-Reply-To: <20200417141708.cro6emqruriiuu3x@ivaldir.net>
References:  <202004170834.03H8YoK4060398@repo.freebsd.org> <CACNAnaF-EHU1tYW=UBW-w--iHLAmUis6rbEGbY8Re0T%2BOmhhog@mail.gmail.com> <20200417141708.cro6emqruriiuu3x@ivaldir.net>

next in thread | previous in thread | raw e-mail | index | archive | help
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
>> <hselasky@freebsd.org> 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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4c30b9c7-401a-2905-6b4f-1f7ae86671ee>