Date: Fri, 17 Apr 2020 09:15:30 -0500 From: Kyle Evans <kevans@freebsd.org> To: Hans Petter Selasky <hselasky@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: <CACNAnaF-EHU1tYW=UBW-w--iHLAmUis6rbEGbY8Re0T%2BOmhhog@mail.gmail.com> In-Reply-To: <202004170834.03H8YoK4060398@repo.freebsd.org> References: <202004170834.03H8YoK4060398@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 This will put it before base sed in PATH. Thanks! Kyle Evans
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaF-EHU1tYW=UBW-w--iHLAmUis6rbEGbY8Re0T%2BOmhhog>