Re: git: 0bb81f221ee7 - 2023Q4 - multimedia/fswebcam: Command line tool for webcams

In reply to: Fernando_Apesteguía : "Re: git: 0bb81f221ee7 - 2023Q4 - multimedia/fswebcam: Command line tool for webcams"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: <acm_at_freebsd.org>
Date: Tue, 28 Nov 2023 16:52:08 UTC
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 remove fswebcam entry from Makefile. I think we could leave this commit so



Greetings





---- El mar, 28 nov 2023 11:43:35 -0500, Fernando Apesteguía <fernando.apesteguia@gmail.com> escribió ----



On Tue, Nov 28, 2023 at 5:40 PM Jose Alonso Cardenas Marquez <mailto:acm@freebsd.org> wrote:

The branch 2023Q4 has been updated by acm:
 
 URL: https://cgit.FreeBSD.org/ports/commit/?id=0bb81f221ee7f5cfc169b7b1550352cbc37461e0
 
 commit 0bb81f221ee7f5cfc169b7b1550352cbc37461e0
 Author:     Guido Falsi <mailto:madpilot@FreeBSD.org>
 AuthorDate: 2023-11-03 19:14:57 +0000
 Commit:     Jose Alonso Cardenas Marquez <mailto:acm@FreeBSD.org>
 CommitDate: 2023-11-28 16:31:58 +0000



Hi there,



Why are we committing a new port to a quarterly branch? 

Those are supposed to be for security and critical bug fixes.



Cheers.

 


    multimedia/fswebcam: Command line tool for webcams
 
     fswebcam 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.
 
     Works fine with webcams supported by multimedia/webcamd.
 
     (cherry picked from commit 7d637bf4782a4ac613492bd6ed16a8b49d68a721)
 ---
  multimedia/fswebcam/Makefile                | 24 ++++++++++++++++++++++++
  multimedia/fswebcam/distinfo                |  3 +++
  multimedia/fswebcam/files/patch-Makefile.in | 13 +++++++++++++
  multimedia/fswebcam/files/patch-videodev.h  | 13 +++++++++++++
  multimedia/fswebcam/files/patch-videodev2.h | 12 ++++++++++++
  multimedia/fswebcam/pkg-descr               |  6 ++++++
  6 files changed, 71 insertions(+)
 
 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=      fswebcam
 +PORTVERSION=   20200725
 +CATEGORIES=    multimedia
 +
 +MAINTAINER=    mailto:madpilot@FreeBSD.org
 +COMMENT=       Small and simple webcam software for *nix
 +WWW=           https://www.sanslogic.co.uk/fswebcam/
 +
 +LICENSE=       GPLv2
 +LICENSE_FILE=  ${WRKSRC}/LICENSE
 +
 +BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat
 +LIB_DEPENDS=   libgd.so:graphics/gd \
 +               libv4l2.so:multimedia/libv4l
 +
 +USES=          localbase:ldflags
 +USE_GITHUB=    yes
 +GH_ACCOUNT=    fsphil
 +GNU_CONFIGURE= yes
 +
 +PLIST_FILES=   bin/fswebcam \
 +               man/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 = 1698870800
 +SHA256 (fsphil-fswebcam-20200725_GH0.tar.gz) = d5439b2bf49bb634100d7e42ed9854f84bfd355c1d40bc3d4d81593eeadd8aee
 +SIZE (fsphil-fswebcam-20200725_GH0.tar.gz) = 119399
 diff --git a/multimedia/fswebcam/files/patch-Makefile.in b/multimedia/fswebcam/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   2020-07-25 18:25:51 UTC
 ++++ Makefile.in
 +@@ -22,8 +22,8 @@ install: all
 + install: all
 +       mkdir -p ${DESTDIR}${bindir}
 +       mkdir -p ${DESTDIR}${mandir}/man1
 +-      install -m 755 fswebcam ${DESTDIR}${bindir}
 +-      install -m 644 fswebcam.1.gz ${DESTDIR}${mandir}/man1
 ++      ${BSD_INSTALL_PROGRAM} fswebcam ${DESTDIR}${bindir}
 ++      ${BSD_INSTALL_MAN} fswebcam.1.gz ${DESTDIR}${mandir}/man1
 + 
 + fswebcam: $(OBJS)
 +       $(CC) -o fswebcam $(OBJS) $(LDFLAGS)
 diff --git a/multimedia/fswebcam/files/patch-videodev.h b/multimedia/fswebcam/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    2020-07-25 18:25:51 UTC
 ++++ videodev.h
 +@@ -12,8 +12,9 @@
 + #ifndef __LINUX_VIDEODEV_H
 + #define __LINUX_VIDEODEV_H
 + 
 ++#include <infiniband/types.h>
 + #include <linux/types.h>
 +-#include <linux/ioctl.h>
 ++/* #include <linux/ioctl.h> */
 + #include <linux/videodev2.h>
 + 
 + 
 diff --git a/multimedia/fswebcam/files/patch-videodev2.h b/multimedia/fswebcam/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   2020-07-25 18:25:51 UTC
 ++++ videodev2.h
 +@@ -59,7 +59,8 @@
 + 
 + #include <sys/time.h>
 + 
 +-#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.