fswebcam: Complete the packaging of fswebcam

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri Sep 14 14:12:50 2018 +0200
Changeset:	3ec3a37b70cfd6b401fa70c9815223b31c181600

Modified Files:
	fswebcam/DESCR
	fswebcam/Makefile
	fswebcam/PLIST
	fswebcam/distinfo
Added Files:
	fswebcam/patches/patch-Makefile.in
	fswebcam/patches/patch-videodev2.h

Log Message:
fswebcam: Complete the packaging of fswebcam

At least on NetBSD previously it was failing due several Linux-isms.

These were addressed via patches/patch-videodev2.h stealing part
of <sys/videoio.h> for __{s,u}{32,64} types and a patch in OpenBSD
ports for the __le32 definition.

graphics/gdk-pixbuf2 seems not needed so avoid to include its bl3.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3ec3a37b70cfd6b401fa70c9815223b31c181600

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fswebcam/DESCR                     |  7 +++++++
 fswebcam/Makefile                  | 12 ++++++------
 fswebcam/PLIST                     |  2 ++
 fswebcam/distinfo                  |  3 +++
 fswebcam/patches/patch-Makefile.in | 22 ++++++++++++++++++++++
 fswebcam/patches/patch-videodev2.h | 29 +++++++++++++++++++++++++++++
 6 files changed, 69 insertions(+), 6 deletions(-)

diffs:
diff --git a/fswebcam/DESCR b/fswebcam/DESCR
index e69de29bb2..9654c2b46b 100644
--- a/fswebcam/DESCR
+++ b/fswebcam/DESCR
@@ -0,0 +1,7 @@
+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.
diff --git a/fswebcam/Makefile b/fswebcam/Makefile
index 4711a92dc0..560acd4b8e 100644
--- a/fswebcam/Makefile
+++ b/fswebcam/Makefile
@@ -2,16 +2,16 @@
 
 DISTNAME=	fswebcam-20140113
 CATEGORIES=	graphics www
-MASTER_SITES=	http://www.firestorm.cx/fswebcam/files/
+MASTER_SITES=	https://www.sanslogic.co.uk/fswebcam/files/
 
 MAINTAINER=	catskillmarina%gmail.com@localhost
-HOMEPAGE=	http://www.firestorm.cx/fswebcam/files/
+HOMEPAGE=	https://www.sanslogic.co.uk/fswebcam/
 COMMENT=	Pulls single images off of webcams without graphic bloat
-#LICENSE=	# TODO: (see mk/license.mk)
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 
-.include "../../mk/bsd.pkg.mk"
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+CONFIGURE_ARGS+=	--disable-v4l1
 
+.include "../../graphics/gd/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/fswebcam/PLIST b/fswebcam/PLIST
index 48d96a5493..ed941bec4f 100644
--- a/fswebcam/PLIST
+++ b/fswebcam/PLIST
@@ -1 +1,3 @@
 @comment $NetBSD$
+bin/fswebcam
+man/man1/fswebcam.1
diff --git a/fswebcam/distinfo b/fswebcam/distinfo
index 59a0ed8c51..4aaf019fb2 100644
--- a/fswebcam/distinfo
+++ b/fswebcam/distinfo
@@ -2,4 +2,7 @@ $NetBSD$
 
 SHA1 (fswebcam-20140113.tar.gz) = 8140e275be75304bdd408500e73c007333bafa81
 RMD160 (fswebcam-20140113.tar.gz) = 559932a176eaf4d1b2af14b88030d0edeb75a4cc
+SHA512 (fswebcam-20140113.tar.gz) = 5d10d74f8ef705c6dc31f1781ca6af178e3aa3c64c625cbac1158c48ffdd9cbfc613ad6c08b69edee8297a099be08a844fb3ecbf21733124cd8b6163190af5db
 Size (fswebcam-20140113.tar.gz) = 113226 bytes
+SHA1 (patch-Makefile.in) = 220d06a01d260f3027fe792ef4077c88626da3af
+SHA1 (patch-videodev2.h) = e13ef80d4daad0750fd4727235aa3231245a3818
diff --git a/fswebcam/patches/patch-Makefile.in b/fswebcam/patches/patch-Makefile.in
new file mode 100644
index 0000000000..77b469cf8c
--- /dev/null
+++ b/fswebcam/patches/patch-Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Do not compress man pages.
+
+--- Makefile.in.orig	2014-01-13 19:15:06.000000000 +0000
++++ Makefile.in
+@@ -17,13 +17,13 @@ OBJS  = fswebcam.o log.o effects.o parse
+ OBJS += dec_rgb.o dec_yuv.o dec_grey.o dec_bayer.o dec_jpeg.o dec_png.o
+ OBJS += dec_s561.o
+ 
+-all: fswebcam fswebcam.1.gz
++all: fswebcam
+ 
+ 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
++	install -m 644 fswebcam.1 ${DESTDIR}${mandir}/man1
+ 
+ fswebcam: $(OBJS)
+ 	$(CC) -o fswebcam $(OBJS) $(LDFLAGS)
diff --git a/fswebcam/patches/patch-videodev2.h b/fswebcam/patches/patch-videodev2.h
new file mode 100644
index 0000000000..9f36ed2dbc
--- /dev/null
+++ b/fswebcam/patches/patch-videodev2.h
@@ -0,0 +1,29 @@
+$NetBSD$
+
+Avoid possible Linux-isms.
+
+In part inspired from <sys/videoio.h> and OpenBSD port trying to
+be less intrusive as possible though.
+
+--- videodev2.h.orig	2014-01-13 18:47:15.000000000 +0000
++++ videodev2.h
+@@ -58,8 +58,17 @@
+ 
+ #include <sys/time.h>
+ 
+-#include <linux/ioctl.h>
+-#include <linux/types.h>
++#define __u64	uint64_t
++#define __u32	uint32_t
++#define __u16	uint16_t
++#define __u8	uint8_t
++#define __s64	int64_t
++#define __s32	int32_t
++#define __s16	int16_t
++#define __s8	int8_t
++#define __le32	uint32_t
++
++#include <stdint.h>
+ 
+ /*
+  * Common stuff for both V4L1 and V4L2