Date: Tue, 28 Nov 2023 11:52:08 -0500 From: acm@freebsd.org To: =?UTF-8?Q?=22Fernando_Apestegu=C3=ADa=22?= <fernando.apesteguia@gmail.com> Cc: "ports-committers" <ports-committers@freebsd.org>, "dev-commits-ports-all" <dev-commits-ports-all@freebsd.org>, "dev-commits-ports-branches" <dev-commits-ports-branches@freebsd.org> Subject: Re: git: 0bb81f221ee7 - 2023Q4 - multimedia/fswebcam: Command line tool for webcams Message-ID: <18c16d8622a.cbe3d4a0201203.574622578868663124@freebsd.org> In-Reply-To: <CAGwOe2bKwa=jXNKbRV2RqYcjxtF7_JRDD3SRj=ntUKvK5PzZFw@mail.gmail.com> References: <202311281632.3ASGWhNH027118@gitrepo.freebsd.org> <CAGwOe2bKwa=jXNKbRV2RqYcjxtF7_JRDD3SRj=ntUKvK5PzZFw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_658861_701769948.1701190328875 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable It was my fault. I thought it would solve a issue with index at quarterly (= fswebcam entry in multimedia/Makefile). It does but the best would have rem= ove fswebcam entry from Makefile. I think we could leave this commit so Greetings ---- El mar, 28 nov 2023 11:43:35 -0500, Fernando Apestegu=C3=ADa <fernando= .apesteguia@gmail.com> escribi=C3=B3 ---- On Tue, Nov 28, 2023 at 5:40=E2=80=AFPM Jose Alonso Cardenas Marquez <mailt= o:acm@freebsd.org> wrote: The branch 2023Q4 has been updated by acm: =20 URL: https://cgit.FreeBSD.org/ports/commit/?id=3D0bb81f221ee7f5cfc169b7b15= 50352cbc37461e0 =20 commit 0bb81f221ee7f5cfc169b7b1550352cbc37461e0 Author:=C2=A0 =C2=A0 =C2=A0Guido Falsi <mailto:madpilot@FreeBSD.org> AuthorDate: 2023-11-03 19:14:57 +0000 Commit:=C2=A0 =C2=A0 =C2=A0Jose Alonso Cardenas Marquez <mailto:acm@FreeBS= D.org> CommitDate: 2023-11-28 16:31:58 +0000 Hi there, Why are we committing a new port to a quarterly branch?=C2=A0 Those are supposed to be for security and critical bug fixes. Cheers. =C2=A0 =C2=A0 =C2=A0 multimedia/fswebcam: Command line tool for webcams =20 =C2=A0 =C2=A0 fswebcam captures images from a V4L1/V4L2 compatible device = or file, =C2=A0 =C2=A0 averages them to reduce noise and draws a caption using the = GD =C2=A0 =C2=A0 Graphics Library which also handles compressing the image to= PNG =C2=A0 =C2=A0 or JPEG. =20 =C2=A0 =C2=A0 Works fine with webcams supported by multimedia/webcamd. =20 =C2=A0 =C2=A0 (cherry picked from commit 7d637bf4782a4ac613492bd6ed16a8b49= d68a721) --- =C2=A0multimedia/fswebcam/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 24 ++++++++++++++++++++++++ =C2=A0multimedia/fswebcam/distinfo=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 |=C2=A0 3 +++ =C2=A0multimedia/fswebcam/files/patch-Makefile.in | 13 +++++++++++++ =C2=A0multimedia/fswebcam/files/patch-videodev.h=C2=A0 | 13 +++++++++++++ =C2=A0multimedia/fswebcam/files/patch-videodev2.h | 12 ++++++++++++ =C2=A0multimedia/fswebcam/pkg-descr=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0|=C2=A0 6 ++++++ =C2=A06 files changed, 71 insertions(+) =20 diff --git a/multimedia/fswebcam/Makefile b/multimedia/fswebcam/Makefile new file mode 100644 index 000000000000..ca640e247620 --- /dev/null +++ b/multimedia/fswebcam/Makefile @@ -0,0 +1,24 @@ +PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 fswebcam +PORTVERSION=3D=C2=A0 =C2=A020200725 +CATEGORIES=3D=C2=A0 =C2=A0 multimedia + +MAINTAINER=3D=C2=A0 =C2=A0 mailto:madpilot@FreeBSD.org +COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Small and simple webcam software for= *nix +WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0https://www.sanslogic.co.u= k/fswebcam/ + +LICENSE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0GPLv2 +LICENSE_FILE=3D=C2=A0 ${WRKSRC}/LICENSE + +BUILD_DEPENDS=3D v4l_compat>0:multimedia/v4l_compat +LIB_DEPENDS=3D=C2=A0 =C2=A0libgd.so:graphics/gd \ +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libv4l2.so:multime= dia/libv4l + +USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 localbase:ldflags +USE_GITHUB=3D=C2=A0 =C2=A0 yes +GH_ACCOUNT=3D=C2=A0 =C2=A0 fsphil +GNU_CONFIGURE=3D yes + +PLIST_FILES=3D=C2=A0 =C2=A0bin/fswebcam \ +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0man/man1/fswebcam.= 1.gz + +.include <http://bsd.port.mk> diff --git a/multimedia/fswebcam/distinfo b/multimedia/fswebcam/distinfo new file mode 100644 index 000000000000..5a26bdceae0e --- /dev/null +++ b/multimedia/fswebcam/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP =3D 1698870800 +SHA256 (fsphil-fswebcam-20200725_GH0.tar.gz) =3D d5439b2bf49bb634100d7e42= ed9854f84bfd355c1d40bc3d4d81593eeadd8aee +SIZE (fsphil-fswebcam-20200725_GH0.tar.gz) =3D 119399 diff --git a/multimedia/fswebcam/files/patch-Makefile.in b/multimedia/fswe= bcam/files/patch-Makefile.in new file mode 100644 index 000000000000..3d02b9496e1a --- /dev/null +++ b/multimedia/fswebcam/files/patch-Makefile.in @@ -0,0 +1,13 @@ +--- Makefile.in.orig=C2=A0 =C2=A02020-07-25 18:25:51 UTC ++++ Makefile.in +@@ -22,8 +22,8 @@ install: all + install: all +=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p ${DESTDIR}${bindir} +=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p ${DESTDIR}${mandir}/man1 +-=C2=A0 =C2=A0 =C2=A0 install -m 755 fswebcam ${DESTDIR}${bindir} +-=C2=A0 =C2=A0 =C2=A0 install -m 644 fswebcam.1.gz ${DESTDIR}${mandir}/ma= n1 ++=C2=A0 =C2=A0 =C2=A0 ${BSD_INSTALL_PROGRAM} fswebcam ${DESTDIR}${bindir} ++=C2=A0 =C2=A0 =C2=A0 ${BSD_INSTALL_MAN} fswebcam.1.gz ${DESTDIR}${mandir= }/man1 +=20 + fswebcam: $(OBJS) +=C2=A0 =C2=A0 =C2=A0 =C2=A0$(CC) -o fswebcam $(OBJS) $(LDFLAGS) diff --git a/multimedia/fswebcam/files/patch-videodev.h b/multimedia/fsweb= cam/files/patch-videodev.h new file mode 100644 index 000000000000..129210db5651 --- /dev/null +++ b/multimedia/fswebcam/files/patch-videodev.h @@ -0,0 +1,13 @@ +--- videodev.h.orig=C2=A0 =C2=A0 2020-07-25 18:25:51 UTC ++++ videodev.h +@@ -12,8 +12,9 @@ + #ifndef __LINUX_VIDEODEV_H + #define __LINUX_VIDEODEV_H +=20 ++#include <infiniband/types.h> + #include <linux/types.h> +-#include <linux/ioctl.h> ++/* #include <linux/ioctl.h> */ + #include <linux/videodev2.h> +=20 +=20 diff --git a/multimedia/fswebcam/files/patch-videodev2.h b/multimedia/fswe= bcam/files/patch-videodev2.h new file mode 100644 index 000000000000..e0b7aeb5eb84 --- /dev/null +++ b/multimedia/fswebcam/files/patch-videodev2.h @@ -0,0 +1,12 @@ +--- videodev2.h.orig=C2=A0 =C2=A02020-07-25 18:25:51 UTC ++++ videodev2.h +@@ -59,7 +59,8 @@ +=20 + #include <sys/time.h> +=20 +-#include <linux/ioctl.h> ++/* #include <linux/ioctl.h> */ ++#include <infiniband/types.h> + #include <linux/types.h> + #include <linux/v4l2-common.h> + #include <linux/v4l2-controls.h> diff --git a/multimedia/fswebcam/pkg-descr b/multimedia/fswebcam/pkg-descr new file mode 100644 index 000000000000..f89dd7c57286 --- /dev/null +++ b/multimedia/fswebcam/pkg-descr @@ -0,0 +1,6 @@ +fswebcam is a neat and simple webcam app. It captures images from +a V4L1/V4L2 compatible device or file, averages them to reduce noise +and draws a caption using the GD Graphics Library which also handles +compressing the image to PNG or JPEG. The resulting image is saved +to a file or sent to stdio where it can be piped to something like +ncftpput or scp. ------=_Part_658861_701769948.1701190328875 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>= <meta content=3D"text/html;charset=3DUTF-8" http-equiv=3D"Content-Type"></h= ead><body ><div style=3D"font-family: Verdana, Arial, Helvetica, sans-serif= ; font-size: 10pt;"><div>It was my fault. I thought it would solve a issue = with index at quarterly (fswebcam entry in multimedia/Makefile). It does bu= t the best would have remove fswebcam entry from Makefile. I think we could= leave this commit so<br></div><div><br></div><div>Greetings<br></div><div>= <br></div><div><br></div><div class=3D"zmail_extra" data-zbluepencil-ignore= =3D"true"><div id=3D"Zm-_Id_-Sgn1">---- El mar, 28 nov 2023 11:43:35 -0500,= <b>Fernando Apestegu=C3=ADa <fernando.apesteguia@gmail.com></b> escr= ibi=C3=B3 ----<br></div><div><br></div><blockquote id=3D"blockquote_zmail" = style=3D"margin: 0px;"><div><div dir=3D"ltr"><div class=3D"x_1993820631gmai= l_quote"><div dir=3D"ltr" class=3D"x_1993820631gmail_attr">On Tue, Nov 28, = 2023 at 5:40=E2=80=AFPM Jose Alonso Cardenas Marquez <<a href=3D"mailto:= acm@freebsd.org" target=3D"_blank">acm@freebsd.org</a>> wrote:<br></div>= <blockquote class=3D"x_1993820631gmail_quote" style=3D"margin : 0px 0px 0p= x 0.8ex; border-left : 1px solid rgb(204,204,204); padding-left : 1ex;">T= he branch 2023Q4 has been updated by acm:<br> <br> URL: <a href=3D"https://= cgit.FreeBSD.org/ports/commit/?id=3D0bb81f221ee7f5cfc169b7b1550352cbc37461e= 0" target=3D"_blank">https://cgit.FreeBSD.org/ports/commit/?id=3D0bb81f221e= e7f5cfc169b7b1550352cbc37461e0</a><br> <br> commit 0bb81f221ee7f5cfc169b7b1= 550352cbc37461e0<br> Author: Guido Falsi <<a href=3D"= mailto:madpilot@FreeBSD.org" target=3D"_blank">madpilot@FreeBSD.org</a>>= <br> AuthorDate: 2023-11-03 19:14:57 +0000<br> Commit: J= ose Alonso Cardenas Marquez <<a href=3D"mailto:acm@FreeBSD.org" target= =3D"_blank">acm@FreeBSD.org</a>><br> CommitDate: 2023-11-28 16:31:58 +00= 00<br></blockquote><div><br></div><div>Hi there,<br></div><div><br></div><d= iv>Why are we committing a new port to a quarterly branch? <br></div><= div>Those are supposed to be for security and critical bug fixes.<br></div>= <div><br></div><div>Cheers.<br></div><div> <br></div><blockquote class= =3D"x_1993820631gmail_quote" style=3D"margin : 0px 0px 0px 0.8ex; border-l= eft : 1px solid rgb(204,204,204); padding-left : 1ex;"><br> = multimedia/fswebcam: Command line tool for webcams<br> <br> f= swebcam captures images from a V4L1/V4L2 compatible device or file,<br> &nb= sp; averages them to reduce noise and draws a caption using the GD<b= r> Graphics Library which also handles compressing the image = to PNG<br> or JPEG.<br> <br> Works fine with we= bcams supported by multimedia/webcamd.<br> <br> (cherry picke= d from commit 7d637bf4782a4ac613492bd6ed16a8b49d68a721)<br> ---<br> m= ultimedia/fswebcam/Makefile = | 24 ++++++++++++++++++++++++<br> multimedia/fswebcam/distinf= o | 3 +++<br> = multimedia/fswebcam/files/patch-Makefile.in | 13 +++++++++++++<br> &n= bsp;multimedia/fswebcam/files/patch-videodev.h | 13 +++++++++++++<br>= multimedia/fswebcam/files/patch-videodev2.h | 12 ++++++++++++<br> &n= bsp;multimedia/fswebcam/pkg-descr = | 6 ++++++<br> 6 files changed, 71 insertions(+)<b= r> <br> diff --git a/multimedia/fswebcam/Makefile b/multimedia/fswebcam/Mak= efile<br> new file mode 100644<br> index 000000000000..ca640e247620<br> ---= /dev/null<br> +++ b/multimedia/fswebcam/Makefile<br> @@ -0,0 +1,24 @@<br> = +PORTNAME=3D fswebcam<br> +PORTVERSION=3D 2= 0200725<br> +CATEGORIES=3D multimedia<br> +<br> +MAINTAINER=3D= <a href=3D"mailto:madpilot@FreeBSD.org" target=3D"_blank">mad= pilot@FreeBSD.org</a><br> +COMMENT=3D Small and s= imple webcam software for *nix<br> +WWW=3D  = ; <a href=3D"https://www.sanslogic.co.uk/fswebcam/" target=3D"_blank"= >https://www.sanslogic.co.uk/fswebcam/</a><br> +<br> +LICENSE=3D &nbs= p; GPLv2<br> +LICENSE_FILE=3D ${WRKSRC}/LICENSE<br> +<br= > +BUILD_DEPENDS=3D v4l_compat>0:multimedia/v4l_compat<br> +LIB_DEPENDS= =3D libgd.so:graphics/gd \<br> + &nb= sp; libv4l2.so:multimedia/libv4l<br> +<br> +USES=3D&nbs= p; localbase:ldflags<br> +USE_GITHUB=3D &= nbsp; yes<br> +GH_ACCOUNT=3D fsphil<br> +GNU_CONFIGURE=3D yes<= br> +<br> +PLIST_FILES=3D bin/fswebcam \<br> + &nb= sp; man/man1/fswebcam.1.gz<br> +<br> +.in= clude <<a href=3D"http://bsd.port.mk" target=3D"_blank">bsd.port.mk</a>&= gt;<br> diff --git a/multimedia/fswebcam/distinfo b/multimedia/fswebcam/dis= tinfo<br> new file mode 100644<br> index 000000000000..5a26bdceae0e<br> ---= /dev/null<br> +++ b/multimedia/fswebcam/distinfo<br> @@ -0,0 +1,3 @@<br> += TIMESTAMP =3D 1698870800<br> +SHA256 (fsphil-fswebcam-20200725_GH0.tar.gz) = =3D d5439b2bf49bb634100d7e42ed9854f84bfd355c1d40bc3d4d81593eeadd8aee<br> +S= IZE (fsphil-fswebcam-20200725_GH0.tar.gz) =3D 119399<br> diff --git a/multi= media/fswebcam/files/patch-Makefile.in b/multimedia/fswebcam/files/patch-Ma= kefile.in<br> new file mode 100644<br> index 000000000000..3d02b9496e1a<br>= --- /dev/null<br> +++ b/multimedia/fswebcam/files/patch-Makefile.in<br> @@= -0,0 +1,13 @@<br> +--- Makefile.in.orig 2020-07-25 18:25:51 UT= C<br> ++++ Makefile.in<br> +@@ -22,8 +22,8 @@ install: all<br> + install: a= ll<br> + mkdir -p ${DESTDIR}${bindir}<br> + = mkdir -p ${DESTDIR}${mandir}/man1<br> +- = install -m 755 fswebcam ${DESTDIR}${bindir}<br> +- &nbs= p; install -m 644 fswebcam.1.gz ${DESTDIR}${mandir}/man1<br> ++  = ; ${BSD_INSTALL_PROGRAM} fswebcam ${DESTDIR}${bindir}<br> ++ &= nbsp; ${BSD_INSTALL_MAN} fswebcam.1.gz ${DESTDIR}${mandir}/man1<br> = + <br> + fswebcam: $(OBJS)<br> + $(CC) -o fswebca= m $(OBJS) $(LDFLAGS)<br> diff --git a/multimedia/fswebcam/files/patch-video= dev.h b/multimedia/fswebcam/files/patch-videodev.h<br> new file mode 100644= <br> index 000000000000..129210db5651<br> --- /dev/null<br> +++ b/multimedi= a/fswebcam/files/patch-videodev.h<br> @@ -0,0 +1,13 @@<br> +--- videodev.h.= orig 2020-07-25 18:25:51 UTC<br> ++++ videodev.h<br> +@@ -12,8= +12,9 @@<br> + #ifndef __LINUX_VIDEODEV_H<br> + #define __LINUX_VIDEODEV_H= <br> + <br> ++#include <infiniband/types.h><br> + #include <linux/= types.h><br> +-#include <linux/ioctl.h><br> ++/* #include <linu= x/ioctl.h> */<br> + #include <linux/videodev2.h><br> + <br> + <br>= diff --git a/multimedia/fswebcam/files/patch-videodev2.h b/multimedia/fswe= bcam/files/patch-videodev2.h<br> new file mode 100644<br> index 00000000000= 0..e0b7aeb5eb84<br> --- /dev/null<br> +++ b/multimedia/fswebcam/files/patch= -videodev2.h<br> @@ -0,0 +1,12 @@<br> +--- videodev2.h.orig 202= 0-07-25 18:25:51 UTC<br> ++++ videodev2.h<br> +@@ -59,7 +59,8 @@<br> + <br>= + #include <sys/time.h><br> + <br> +-#include <linux/ioctl.h><= br> ++/* #include <linux/ioctl.h> */<br> ++#include <infiniband/ty= pes.h><br> + #include <linux/types.h><br> + #include <linux/v4l= 2-common.h><br> + #include <linux/v4l2-controls.h><br> diff --git = a/multimedia/fswebcam/pkg-descr b/multimedia/fswebcam/pkg-descr<br> new fil= e mode 100644<br> index 000000000000..f89dd7c57286<br> --- /dev/null<br> ++= + b/multimedia/fswebcam/pkg-descr<br> @@ -0,0 +1,6 @@<br> +fswebcam is a ne= at and simple webcam app. It captures images from<br> +a V4L1/V4L2 compatib= le device or file, averages them to reduce noise<br> +and draws a caption u= sing the GD Graphics Library which also handles<br> +compressing the image = to PNG or JPEG. The resulting image is saved<br> +to a file or sent to stdi= o where it can be piped to something like<br> +ncftpput or scp.<br></blockq= uote></div></div></div></blockquote></div><div><br></div></div><br></body><= /html> ------=_Part_658861_701769948.1701190328875--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18c16d8622a.cbe3d4a0201203.574622578868663124>