xvidcap: Update to 1.1.7

Unknown changes. This is a very old release and the NEWS file is empty.

19 files changed, 276 insertions, 442 deletions

diff --git a/x11/Makefile b/x11/Makefile
index fc992693a80..c1369de29c4 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.885 2020/03/31 23:08:28 gutteridge Exp $
+# $NetBSD: Makefile,v 1.886 2020/04/23 14:31:11 nia Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -670,7 +670,6 @@ SUBDIR+=	xtrans
 SUBDIR+=	xtruss
 SUBDIR+=	xvattr
 SUBDIR+=	xvidcap
-SUBDIR+=	xvidcap-gtk2
 SUBDIR+=	xvidtune
 SUBDIR+=	xview
 SUBDIR+=	xview-clients
diff --git a/x11/xvidcap-gtk2/DESCR b/x11/xvidcap-gtk2/DESCR
deleted file mode 100644
index 31e9ddcb11b..00000000000
--- a/x11/xvidcap-gtk2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-gvidcap is a tool (like Lotus ScreenCam and Camtasia) that captures
-movement on a selected area of an X11 screen to files. Frame output
-formats include: XWD, PPM, PNG, MNG, JPEG and MPEG.
-
-This is the GTK2 version of xvidcap.
diff --git a/x11/xvidcap-gtk2/Makefile b/x11/xvidcap-gtk2/Makefile
deleted file mode 100644
index cd9ea3b251b..00000000000
--- a/x11/xvidcap-gtk2/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2020/03/10 22:11:24 wiz Exp $
-#
-
-.include "../../x11/xvidcap/Makefile.common"
-
-PKGNAME=		${DISTNAME:S/-/-gtk2-/}
-PKGREVISION=		44
-COMMENT=		Capture X display to individual frames or MPEG video (GTK2 version)
-
-CONFLICTS+=		xvidcap<1.1.3nb3
-
-CONFIGURE_ARGS+=	--with-gtk2
-USE_TOOLS+=		pkg-config
-LDFLAGS.DragonFly=	-lXt -lX11
-LDFLAGS.Linux+=		-lXt -lX11
-
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap-gtk2/PLIST b/x11/xvidcap-gtk2/PLIST
deleted file mode 100644
index f2d1a52ed8b..00000000000
--- a/x11/xvidcap-gtk2/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:19 joerg Exp $
-bin/gvidcap
-man/man1/gvidcap.1
-share/doc/xvidcap-gtk2-${PKGVERSION}/AUTHORS
-share/doc/xvidcap-gtk2-${PKGVERSION}/ChangeLog
-share/doc/xvidcap-gtk2-${PKGVERSION}/INSTALL
-share/doc/xvidcap-gtk2-${PKGVERSION}/NEWS
-share/doc/xvidcap-gtk2-${PKGVERSION}/README
-share/doc/xvidcap-gtk2-${PKGVERSION}/TODO
diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index a9c734715e2..08ce7b0a5de 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,13 +1,58 @@
-# $NetBSD: Makefile,v 1.31 2018/02/26 08:19:32 adam Exp $
+# $NetBSD: Makefile,v 1.32 2020/04/23 14:31:12 nia Exp $
 
-.include "Makefile.common"
+DISTNAME=	xvidcap-1.1.7
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xvidcap/}
 
-PKGREVISION=		22
-COMMENT=		Capture X display to individual frames or MPEG video
+MAINTAINER=	reed@reedmedia.net
+HOMEPAGE=	http://xvidcap.sourceforge.net/
+COMMENT=	Capture X display to individual frames or MPEG video
+LICENSE=	gnu-gpl-v3
 
-CONFIGURE_ARGS+=	--without-gtk2
-LDFLAGS.DragonFly=	-lXt -lX11
+GNU_CONFIGURE=	yes
 
-.include "../../x11/libXext/buildlink3.mk"
+USE_TOOLS+=	gmake perl pkg-config
+USE_TOOLS+=	intltool msgfmt msgmerge xgettext
 
+REPLACE_SH+=	ppm2mpeg.sh
+
+# Don't require gnome-doc-utils
+CONFIGURE_ENV+=	ac_cv_path_SK_CONFIG=no
+CONFIGURE_ENV+=	ac_cv_path_XML2PO=no
+
+# Breaks recording in current X servers
+# https://sourceforge.net/p/xvidcap/bugs/77/
+CONFIGURE_ENV+=	ac_cv_func_shmat=no
+
+.include "../../mk/oss.buildlink3.mk"
+.if ${OSS_TYPE} != "none"
+LDFLAGS+=		-lossaudio
+SUBST_CLASSES+=		oss
+SUBST_STAGE.oss=	pre-configure
+SUBST_MESSAGE.oss=	Correcting the path to the OSS device.
+SUBST_FILES.oss+=	src/app_data.c
+SUBST_SED.oss+=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+SUBST_CLASSES+=		sr
+SUBST_STAGE.sr=		pre-configure
+SUBST_MESSAGE.sr=	Setting a nicer default audio sample rate.
+SUBST_FILES.sr+=	src/app_data.c
+SUBST_SED.sr+=		-e "s|sndrate = 44100|sndrate = 48000|g"
+.  endif
+.endif
+
+CONFIGURE_ARGS+=	--with-forced-embedded-ffmpeg
+
+.include "options.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common
deleted file mode 100644
index 84070d29c50..00000000000
--- a/x11/xvidcap/Makefile.common
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile.common,v 1.12 2020/01/26 05:26:29 rillig Exp $
-#
-# used by x11/xvidcap/Makefile
-# used by x11/xvidcap-gtk2/Makefile
-
-DISTNAME=		xvidcap-1.1.3
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xvidcap/}
-
-MAINTAINER=		reed@reedmedia.net
-HOMEPAGE=		http://xvidcap.sourceforge.net/
-
-PATCHDIR=		${.CURDIR}/../../x11/xvidcap/patches
-DISTINFO_FILE=		${.CURDIR}/../../x11/xvidcap/distinfo
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--without-forced-embedded-ffmpeg
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/xvidcap/PLIST b/x11/xvidcap/PLIST
index 3c23c6ca71d..fd84d87d3aa 100644
--- a/x11/xvidcap/PLIST
+++ b/x11/xvidcap/PLIST
@@ -1,10 +1,155 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:25:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/04/23 14:31:12 nia Exp $
 bin/xvidcap
+man/de/man1/xvidcap-dbus-client.1
+man/de/man1/xvidcap.1
+man/es/man1/xvidcap.1
+man/it/man1/xvidcap.1
+man/man1/xvidcap-dbus-client.1
 man/man1/xvidcap.1
-share/doc/xvidcap_${PKGVERSION}/AUTHORS
-share/doc/xvidcap_${PKGVERSION}/ChangeLog
-share/doc/xvidcap_${PKGVERSION}/INSTALL
-share/doc/xvidcap_${PKGVERSION}/NEWS
-share/doc/xvidcap_${PKGVERSION}/README
-share/doc/xvidcap_${PKGVERSION}/TODO
-share/doc/xvidcap_${PKGVERSION}/XVidcap.ad
+share/applications/xvidcap.desktop
+share/dbus-1/services/net.jarre_de_the.Xvidcap.service
+share/doc/xvidcap/AUTHORS
+share/doc/xvidcap/COPYING
+share/doc/xvidcap/ChangeLog
+share/doc/xvidcap/README
+share/gnome/help/xvidcap/C/figures/back-button.png
+share/gnome/help/xvidcap/C/figures/edit-button.png
+share/gnome/help/xvidcap/C/figures/filename-button.png
+share/gnome/help/xvidcap/C/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/C/figures/fwd-button.png
+share/gnome/help/xvidcap/C/figures/lock-toggle.png
+share/gnome/help/xvidcap/C/figures/menu-about.png
+share/gnome/help/xvidcap/C/figures/menu-animate.png
+share/gnome/help/xvidcap/C/figures/menu-cont.png
+share/gnome/help/xvidcap/C/figures/menu-help.png
+share/gnome/help/xvidcap/C/figures/menu-make-video.png
+share/gnome/help/xvidcap/C/figures/menu-mf.png
+share/gnome/help/xvidcap/C/figures/menu-prefs.png
+share/gnome/help/xvidcap/C/figures/menu-quit.png
+share/gnome/help/xvidcap/C/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/C/figures/menu-sf.png
+share/gnome/help/xvidcap/C/figures/menu-show-frame.png
+share/gnome/help/xvidcap/C/figures/menu.png
+share/gnome/help/xvidcap/C/figures/pause-toggle.png
+share/gnome/help/xvidcap/C/figures/prefs-commands.png
+share/gnome/help/xvidcap/C/figures/prefs-general.png
+share/gnome/help/xvidcap/C/figures/prefs-mf.png
+share/gnome/help/xvidcap/C/figures/prefs-sf.png
+share/gnome/help/xvidcap/C/figures/record-toggle.png
+share/gnome/help/xvidcap/C/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/C/figures/results-dialog.png
+share/gnome/help/xvidcap/C/figures/selector-button.png
+share/gnome/help/xvidcap/C/figures/step-button.png
+share/gnome/help/xvidcap/C/figures/stop-toggle.png
+share/gnome/help/xvidcap/C/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/C/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/C/xvidcap.xml
+share/gnome/help/xvidcap/de/figures/back-button.png
+share/gnome/help/xvidcap/de/figures/edit-button.png
+share/gnome/help/xvidcap/de/figures/filename-button.png
+share/gnome/help/xvidcap/de/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/de/figures/fwd-button.png
+share/gnome/help/xvidcap/de/figures/lock-toggle.png
+share/gnome/help/xvidcap/de/figures/menu-about.png
+share/gnome/help/xvidcap/de/figures/menu-animate.png
+share/gnome/help/xvidcap/de/figures/menu-cont.png
+share/gnome/help/xvidcap/de/figures/menu-help.png
+share/gnome/help/xvidcap/de/figures/menu-make-video.png
+share/gnome/help/xvidcap/de/figures/menu-mf.png
+share/gnome/help/xvidcap/de/figures/menu-prefs.png
+share/gnome/help/xvidcap/de/figures/menu-quit.png
+share/gnome/help/xvidcap/de/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/de/figures/menu-sf.png
+share/gnome/help/xvidcap/de/figures/menu-show-frame.png
+share/gnome/help/xvidcap/de/figures/menu.png
+share/gnome/help/xvidcap/de/figures/pause-toggle.png
+share/gnome/help/xvidcap/de/figures/prefs-commands.png
+share/gnome/help/xvidcap/de/figures/prefs-general.png
+share/gnome/help/xvidcap/de/figures/prefs-mf.png
+share/gnome/help/xvidcap/de/figures/prefs-sf.png
+share/gnome/help/xvidcap/de/figures/record-toggle.png
+share/gnome/help/xvidcap/de/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/de/figures/results-dialog.png
+share/gnome/help/xvidcap/de/figures/selector-button.png
+share/gnome/help/xvidcap/de/figures/step-button.png
+share/gnome/help/xvidcap/de/figures/stop-toggle.png
+share/gnome/help/xvidcap/de/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/de/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/de/xvidcap.xml
+share/gnome/help/xvidcap/es/figures/back-button.png
+share/gnome/help/xvidcap/es/figures/edit-button.png
+share/gnome/help/xvidcap/es/figures/filename-button.png
+share/gnome/help/xvidcap/es/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/es/figures/fwd-button.png
+share/gnome/help/xvidcap/es/figures/lock-toggle.png
+share/gnome/help/xvidcap/es/figures/menu-about.png
+share/gnome/help/xvidcap/es/figures/menu-animate.png
+share/gnome/help/xvidcap/es/figures/menu-cont.png
+share/gnome/help/xvidcap/es/figures/menu-help.png
+share/gnome/help/xvidcap/es/figures/menu-make-video.png
+share/gnome/help/xvidcap/es/figures/menu-mf.png
+share/gnome/help/xvidcap/es/figures/menu-prefs.png
+share/gnome/help/xvidcap/es/figures/menu-quit.png
+share/gnome/help/xvidcap/es/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/es/figures/menu-sf.png
+share/gnome/help/xvidcap/es/figures/menu.png
+share/gnome/help/xvidcap/es/figures/pause-toggle.png
+share/gnome/help/xvidcap/es/figures/prefs-commands.png
+share/gnome/help/xvidcap/es/figures/prefs-general.png
+share/gnome/help/xvidcap/es/figures/prefs-mf.png
+share/gnome/help/xvidcap/es/figures/prefs-sf.png
+share/gnome/help/xvidcap/es/figures/record-toggle.png
+share/gnome/help/xvidcap/es/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/es/figures/results-dialog.png
+share/gnome/help/xvidcap/es/figures/selector-button.png
+share/gnome/help/xvidcap/es/figures/step-button.png
+share/gnome/help/xvidcap/es/figures/stop-toggle.png
+share/gnome/help/xvidcap/es/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/es/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/es/xvidcap.xml
+share/gnome/help/xvidcap/it/figures/back-button.png
+share/gnome/help/xvidcap/it/figures/edit-button.png
+share/gnome/help/xvidcap/it/figures/filename-button.png
+share/gnome/help/xvidcap/it/figures/frame-drop-meter.png
+share/gnome/help/xvidcap/it/figures/fwd-button.png
+share/gnome/help/xvidcap/it/figures/lock-toggle.png
+share/gnome/help/xvidcap/it/figures/menu-about.png
+share/gnome/help/xvidcap/it/figures/menu-animate.png
+share/gnome/help/xvidcap/it/figures/menu-cont.png
+share/gnome/help/xvidcap/it/figures/menu-help.png
+share/gnome/help/xvidcap/it/figures/menu-make-video.png
+share/gnome/help/xvidcap/it/figures/menu-mf.png
+share/gnome/help/xvidcap/it/figures/menu-prefs.png
+share/gnome/help/xvidcap/it/figures/menu-quit.png
+share/gnome/help/xvidcap/it/figures/menu-save-prefs.png
+share/gnome/help/xvidcap/it/figures/menu-sf.png
+share/gnome/help/xvidcap/it/figures/menu.png
+share/gnome/help/xvidcap/it/figures/pause-toggle.png
+share/gnome/help/xvidcap/it/figures/prefs-commands.png
+share/gnome/help/xvidcap/it/figures/prefs-general.png
+share/gnome/help/xvidcap/it/figures/prefs-mf.png
+share/gnome/help/xvidcap/it/figures/prefs-sf.png
+share/gnome/help/xvidcap/it/figures/record-toggle.png
+share/gnome/help/xvidcap/it/figures/results-dialog-ask.png
+share/gnome/help/xvidcap/it/figures/results-dialog.png
+share/gnome/help/xvidcap/it/figures/selector-button.png
+share/gnome/help/xvidcap/it/figures/step-button.png
+share/gnome/help/xvidcap/it/figures/stop-toggle.png
+share/gnome/help/xvidcap/it/figures/xvidcap-ctrl.png
+share/gnome/help/xvidcap/it/figures/xvidcap-main-ctrl.png
+share/gnome/help/xvidcap/it/figures/xvidcap-warning.png
+share/gnome/help/xvidcap/it/xvidcap.xml
+share/locale/de/LC_MESSAGES/xvidcap.mo
+share/locale/en/LC_MESSAGES/xvidcap.mo
+share/locale/es/LC_MESSAGES/xvidcap.mo
+share/locale/it/LC_MESSAGES/xvidcap.mo
+share/omf/xvidcap/xvidcap-C.omf
+share/omf/xvidcap/xvidcap-de.omf
+share/omf/xvidcap/xvidcap-es.omf
+share/omf/xvidcap/xvidcap-it.omf
+share/pixmaps/xvidcap.png
+share/xvidcap/glade/gnome-xvidcap.glade
+share/xvidcap/glade/xvidcap_logo.png
+share/xvidcap/ppm2mpeg.sh
+share/xvidcap/xvidcap.desktop
+share/xvidcap/xvidcap.png
diff --git a/x11/xvidcap/distinfo b/x11/xvidcap/distinfo
index 27f13f10b43..1181a220f21 100644
--- a/x11/xvidcap/distinfo
+++ b/x11/xvidcap/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 03:29:13 agc Exp $
+$NetBSD: distinfo,v 1.13 2020/04/23 14:31:12 nia Exp $
 
-SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
-RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
-SHA512 (xvidcap-1.1.3.tar.gz) = f43bbee7df6a06a61d5b04a32e13f38c1e2cf25a4b3a8572c7918b55a3138b9ad67759025fab9a20b9a5a673213f13b0248dadb7ccc89a280f344b31ede01850
-Size (xvidcap-1.1.3.tar.gz) = 1627036 bytes
-SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc
-SHA1 (patch-ab) = a1b379bbca8ca8dcbad4363b8d37897d56cf16d5
-SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
-SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = 2ebab45421ab2782d48067f7b63e010190111397
-SHA1 (patch-af) = 52a10e0c278c956a3de8b77b8f89c4e1f28c6838
-SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7
-SHA1 (patch-src_xtomng.c) = 474b082c94883fd367126e6835e91bfc856063b5
-SHA1 (patch-src_xtopng.c) = 5e4e8e7150ccb67e25a65ecf33e2900074fa1179
+SHA1 (xvidcap-1.1.7.tar.gz) = ccdf8ac85c76b202dbf46074df6b3844faf127d1
+RMD160 (xvidcap-1.1.7.tar.gz) = 782f0f8b4693bb3e96fdf06de71b2f6832b246e0
+SHA512 (xvidcap-1.1.7.tar.gz) = 9dc2e6751a0f9126dc81f24fca18430a57550b57eaad2e2cd782cc1a5274a7998b509b491d85db3a1302866583b48c36e65043608c453c0466fbbe3d1142bc42
+Size (xvidcap-1.1.7.tar.gz) = 4789924 bytes
+SHA1 (patch-configure) = 9a82ebbfd4fd6e7b1ad4567e346ce2c2860d1c9e
+SHA1 (patch-src_capture.c) = 1fc2f28c3a30a08eac799cb646d291472e99a10a
diff --git a/x11/xvidcap/patches/patch-aa b/x11/xvidcap/patches/patch-aa
deleted file mode 100644
index 342e69198bd..00000000000
--- a/x11/xvidcap/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/05/29 00:16:41 xtraeme Exp $
-
---- src/xt_control.c.orig	Sat Feb 14 12:48:14 2004
-+++ src/xt_control.c
-@@ -29,6 +29,7 @@
- #include <stdlib.h>
- #include <limits.h>		/* PATH_MAX */
- #include <ctype.h>		/* isdigit() */
-+#include <sys/time.h>
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
diff --git a/x11/xvidcap/patches/patch-ab b/x11/xvidcap/patches/patch-ab
deleted file mode 100644
index b6a80f01634..00000000000
--- a/x11/xvidcap/patches/patch-ab
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2012/10/26 20:13:42 joerg Exp $
-
---- src/capture.c.orig	2004-02-14 20:14:20.000000000 +0000
-+++ src/capture.c
-@@ -68,6 +68,9 @@
- #include "control.h"
- #include "main.h"
- 
-+#ifndef HAVE_FDATASYNC
-+#define fdatasync fsync
-+#endif
- 
- uint16_t mousePointerBlack[] = { 0, 49152, 40960, 36864, 34816, 33792, 33280, 33024, 32896, 32832,
- 33728, 37376, 43264, 51456, 1152, 1152, 576, 576, 448, 0 };
-@@ -369,7 +372,7 @@ TCbCaptureX11(XtPointer xtp, XtIntervalI
-             if (!fp) {
-                 perror(file);
-                 job->state = VC_STOP;
--                return;
-+                return FALSE;
-             }
-         }
-         if (job->state & VC_START) {
-@@ -503,7 +506,7 @@ TCbCaptureX11(XtPointer xtp, XtIntervalI
-                 job->state |= VC_START;
-                 job->state |= VC_REC;
-                 XVC_StartCapture(job);
--                return;
-+                return FALSE;
-             }
- 
-             if ( job->flags & FLG_NOGUI ) {
-@@ -572,7 +575,7 @@ TCbCaptureSHM(XtPointer xtp, XtIntervalI
-             if (!fp) {
-                 perror(file);
-                 job->state = VC_STOP;
--                return;
-+                return FALSE;
-             }
-         }
-         if (job->state & VC_START) {
-@@ -599,7 +602,7 @@ TCbCaptureSHM(XtPointer xtp, XtIntervalI
-                 job->area->height, job->area->x, job->area->y);
-                 job->state = VC_STOP;
-                 //                CbStop(NULL, NULL, NULL);
--                return;
-+                return FALSE;
-             }
-             shminfo.shmid = shmget(IPC_PRIVATE,
-             image->bytes_per_line * image->height, IPC_CREAT|0777);
-@@ -643,7 +646,7 @@ TCbCaptureSHM(XtPointer xtp, XtIntervalI
-             (*job->close) (fp);
-         else if (job->flags & FLG_SYNC) {
-             if (job->open == (void *(*)(char *, char*))fopen)
--                fdatasync(fileno(fp));
-+		 fdatasync(fileno((FILE *)fp));
-         }
-         
-         /* substract the time we needed for creating and saving
-@@ -724,7 +727,7 @@ TCbCaptureSHM(XtPointer xtp, XtIntervalI
-                 job->state |= VC_START;
-                 job->state |= VC_REC;
-                 XVC_StartCapture(job);
--                return;
-+                return FALSE;
-             }
-              
-             if ( job->flags & FLG_NOGUI ) {
diff --git a/x11/xvidcap/patches/patch-ac b/x11/xvidcap/patches/patch-ac
deleted file mode 100644
index bed795427cd..00000000000
--- a/x11/xvidcap/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/05/29 00:16:41 xtraeme Exp $
-
---- ffmpeg/Makefile.orig	2004-02-06 23:42:45.000000000 -0800
-+++ ffmpeg/Makefile
-@@ -136,10 +136,10 @@ installlib:
- dep:	depend
- 
- depend: .depend
--	make -C libavcodec depend
--	make -C libavformat depend
-+	$(MAKE) -C libavcodec depend
-+	$(MAKE) -C libavformat depend
- ifeq ($(BUILD_VHOOK),yes)
--	make -C vhook depend
-+	$(MAKE) -C vhook depend
- endif
- 
- .depend: $(SRCS)
diff --git a/x11/xvidcap/patches/patch-ad b/x11/xvidcap/patches/patch-ad
deleted file mode 100644
index f36455b4ce5..00000000000
--- a/x11/xvidcap/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/05/29 00:16:41 xtraeme Exp $
-
---- ffmpeg/configure.orig	2004-02-06 23:42:46.000000000 -0800
-+++ ffmpeg/configure
-@@ -25,7 +25,7 @@ cross_prefix=""
- cc="gcc"
- ar="ar"
- ranlib="ranlib"
--make="make"
-+make=${MAKE}
- strip="strip"
- cpu=`uname -m`
- tune="generic"
diff --git a/x11/xvidcap/patches/patch-ae b/x11/xvidcap/patches/patch-ae
deleted file mode 100644
index a10afec27f6..00000000000
--- a/x11/xvidcap/patches/patch-ae
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2009/07/07 17:38:09 joerg Exp $
-
---- src/Makefile.in.orig	2004-02-14 12:06:20.000000000 -0800
-+++ src/Makefile.in	2006-05-16 21:57:37.000000000 -0700
-@@ -177,7 +177,7 @@
- 
- AM_CFLAGS = @X_CFLAGS@ -DVERSION=\"@PACKAGE_VERSION@\"  $(am__append_1)
- 
--AM_LDFLAGS = @X_LIBS@ -lpthread $(am__append_2) $(am__append_3)
-+AM_LDFLAGS = @X_LIBS@ ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $(am__append_2) $(am__append_3)
- 
- 
- # specific xvidcap / gvidcap
-@@ -195,14 +195,15 @@
- @WITHGTK2_TRUE@gvidcap_LDFLAGS = $(AM_LDFLAGS) `pkg-config --libs gtk+-2.0`
- @WITHGTK2_TRUE@@WITHGT_TRUE@gvidcap_LDADD = ../gt/libgt.a
- 
--man1_MANS = ../man/xvidcap.man ../man/gvidcap.man
-+@WITHGTK2_TRUE@man1_MANS = ../man/gvidcap.man
-+@WITHGTK2_FALSE@man1_MANS = ../man/xvidcap.man
- 
- EXTRA_DIST = mkresfile.sh
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--@WITHGTK2_TRUE@bin_PROGRAMS = xvidcap$(EXEEXT) gvidcap$(EXEEXT)
-+@WITHGTK2_TRUE@bin_PROGRAMS =  gvidcap$(EXEEXT)
- @WITHGTK2_FALSE@bin_PROGRAMS = xvidcap$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
- 
-@@ -1800,10 +1801,12 @@
- 	uninstall-info-am uninstall-man uninstall-man1
- 
- 
-+@WITHGTK2_TRUE@docdir=${datadir}/doc/${PACKAGE_TARNAME}-gtk2-${PACKAGE_VERSION}
-+@WITHGTK2_FALSE@docdir=${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
- install-data-hook:
--	mkdir -p ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
--	./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
--	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
-+	mkdir -p ${DESTDIR}${docdir}
-+	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${DESTDIR}${docdir}
-+@WITHGTK2_FALSE@	./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${DESTDIR}${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
- 
- uninstall-hook:
- 	rm -rf ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
diff --git a/x11/xvidcap/patches/patch-af b/x11/xvidcap/patches/patch-af
deleted file mode 100644
index f595bb2a15f..00000000000
--- a/x11/xvidcap/patches/patch-af
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-af,v 1.3 2011/05/21 17:23:10 wiz Exp $
-
-Do not redeclare png functions.
-png_ptr's members are hidden now, so don't access them.
-XXX: this patch won't work if some bytes were already written,
-but why should they have been? Should be done better by upstream.
-
---- src/mngutil.c.orig	2004-02-14 10:55:36.000000000 +0000
-+++ src/mngutil.c
-@@ -30,13 +30,6 @@
- #include <png.h>
- #include "mngutil.h"
- 
--extern void png_write_data (png_structp png_ptr,
--				png_bytep data,png_size_t length);
--extern void png_save_uint_32 (png_bytep buf, png_uint_32 i);
--extern void png_save_uint_16 (png_bytep buf, png_uint_16 i);
--extern void png_write_chunk (png_structp png_ptr,
--				png_bytep chunk_name, png_bytep data, png_size_t length);
--
- png_byte mng_sig[8] = {138, 77, 78, 71, 13, 10, 26, 10};
- 
- /*
-@@ -45,9 +38,8 @@ png_byte mng_sig[8] = {138, 77, 78, 71, 
- void
- mng_write_sig (png_structp png_ptr)
- {
--	/* write the rest of the 8 byte signature */
--	png_write_data (png_ptr, &mng_sig[png_ptr->sig_bytes],
--		(png_size_t)8 - png_ptr->sig_bytes);
-+	/* write the 8 byte signature */
-+	png_write_chunk_data (png_ptr, mng_sig, 8);
- }
- 
- 
diff --git a/x11/xvidcap/patches/patch-ag b/x11/xvidcap/patches/patch-ag
deleted file mode 100644
index 3f27eafb5f9..00000000000
--- a/x11/xvidcap/patches/patch-ag
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/05/17 01:53:17 reed Exp $
-
---- src/xtoffmpeg.c.orig	2006-04-21 07:54:06.000000000 +0000
-+++ src/xtoffmpeg.c
-@@ -582,6 +582,7 @@ XImageToFFMPEG (FILE *fp, XImage *image,
-     AVFormatParameters fParams, *p_fParams = &fParams;  // video stream params
-     AVFormatParameters params, *ap = &params;           // audio stream params
-     AVImageFormat *image_format;
-+    AVPacket pkt;
-     int ret, err, i;
-     
-     #ifdef DEBUG
-@@ -1103,7 +1104,8 @@ XImageToFFMPEG (FILE *fp, XImage *image,
-     #endif /* DEBUG */
-     
-     /* encode the image */
--    out_size = avcodec_encode_video (c, outbuf, image_size, frame);
-+    av_init_packet(&pkt);
-+    pkt.size = avcodec_encode_video (c, outbuf, image_size, frame);
-     
- #ifdef HAVE_FFMPEG_AUDIO
-     if (job->flags & FLG_AUDIO_WANTED) {
-@@ -1117,7 +1119,13 @@ XImageToFFMPEG (FILE *fp, XImage *image,
-     }
- #endif // HAVE_FFMPEG_AUDIO
-     /* write frame to file */
--    av_write_frame (output_file, out_st->index, outbuf, out_size);
-+
-+    pkt.pts= c->coded_frame->pts;
-+    pkt.flags |= PKT_FLAG_KEY;
-+    pkt.stream_index= out_st->index;
-+    pkt.data= outbuf;
-+
-+    av_write_frame (output_file, &pkt);
- #ifdef HAVE_FFMPEG_AUDIO
-     /* release the mutex */
-     if (job->flags & FLG_AUDIO_WANTED) {
diff --git a/x11/xvidcap/patches/patch-configure b/x11/xvidcap/patches/patch-configure
new file mode 100644
index 00000000000..36ff49d0604
--- /dev/null
+++ b/x11/xvidcap/patches/patch-configure
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.1 2020/04/23 14:31:12 nia Exp $
+
+Don't pass invalid options to ffmpeg ./configure
+
+--- configure.orig	2008-07-09 07:28:25.000000000 +0000
++++ configure
+@@ -11273,14 +11273,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ test x$ac_cv_lib_mp3lame_lame_init = xyes && ac_my_ffmpeg_cfg_lib_switch="--enable-libmp3lame"
+-test x$ac_cv_lib_theora_theora_encode_init = xyes && ac_my_ffmpeg_cfg_lib_switch="${ac_my_ffmpeg_cfg_lib_switch} --enable-libogg --enable-libtheora"
++test x$ac_cv_lib_theora_theora_encode_init = xyes && ac_my_ffmpeg_cfg_lib_switch="${ac_my_ffmpeg_cfg_lib_switch} --enable-libtheora"
+ 
+ # if cache empty (not tested or failed) and want static avcodec (then it failed) ...
+ if ( `test \( \( x${ac_cv_lib_avutil_av_rescale+set} = x \) -a \( x$static_avutil = xyes \) \)` ) ; then
+ 	# build embedded ffmpeg
+ 	echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && \
+ 	( cd ./ffmpeg/ && \
+-	./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscale --disable-ffserver --disable-ffplay && \
++	./configure --cc=${CC} --enable-gpl ${ac_my_ffmpeg_cfg_lib_switch} --enable-pthreads --enable-swscale --disable-ffserver --disable-ffplay --disable-demuxer=v4l2 --disable-mmx && \
+ 	ln -s libavcodec/avcodec.h ./ && \
+ 	ln -s libavcodec/dsputil.h ./ && \
+ 	ln -s libavformat/avformat.h ./ && \
diff --git a/x11/xvidcap/patches/patch-src_capture.c b/x11/xvidcap/patches/patch-src_capture.c
new file mode 100644
index 00000000000..35f90916c5c
--- /dev/null
+++ b/x11/xvidcap/patches/patch-src_capture.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_capture.c,v 1.1 2020/04/23 14:31:12 nia Exp $
+
+Fix build without SHMAT.
+
+--- src/capture.c.orig	2008-05-25 22:01:53.000000000 +0000
++++ src/capture.c
+@@ -647,6 +647,7 @@ XGetZPixmapToXImage (Display * dpy, Draw
+                         image->width, image->height);
+ }
+ 
++#ifdef HAVE_SHMAT
+ /**
+  * \brief reads data from the Xserver to a chunk of memory on the client.
+  *      This version uses shared memory access to X11.
+@@ -706,6 +707,7 @@ XGetZPixmapSHM (Display * dpy, Drawable 
+     return (True);
+ #undef DEBUGFUNCTION
+ }
++#endif
+ 
+ /**
+  * \brief copies a small image into another larger image
+@@ -1653,13 +1655,17 @@ commonCapture (enum captureFunctions cap
+                 XDestroyImage (image);
+                 image = NULL;
+             }
++#ifdef HAVE_SHMAT
+             if (capfunc == SHM)
+                 XShmDetach (app->dpy, &shminfo);
++#endif
+ 
+ #ifdef USE_XDAMAGE
+             if (app->flags & FLG_USE_XDAMAGE) {
++#ifdef HAVE_SHMAT
+                 if (capfunc == SHM)
+                     XShmDetach (app->dpy, &dmg_shminfo);
++#endif
+                 if (dmg_image)
+                     XDestroyImage (dmg_image);
+             }
diff --git a/x11/xvidcap/patches/patch-src_xtomng.c b/x11/xvidcap/patches/patch-src_xtomng.c
deleted file mode 100644
index a64ad86f76c..00000000000
--- a/x11/xvidcap/patches/patch-src_xtomng.c
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-src_xtomng.c,v 1.1 2011/04/05 11:24:16 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/xtomng.c.orig	2004-02-14 10:55:36.000000000 +0000
-+++ src/xtomng.c
-@@ -110,19 +110,18 @@ XImageToMNGC (FILE *fp, XImage *image, J
- 			png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
- 			return;
- 		}
--		if (setjmp (png_ptr->jmpbuf)) {
-+		if (setjmp (png_jmpbuf(png_ptr))) {
- 			png_destroy_write_struct (&png_ptr, &info_ptr);
- 			(*job->close) (fp);
- 			exit(99);
- 		}
- 
--		info_ptr->width = image->width;
--		info_ptr->height= image->height;
--		info_ptr->bit_depth = 8;
--		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--		if (image->bits_per_pixel != 24) {
--			info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
--		}
-+		png_set_IHDR(png_ptr, info_ptr, image->width,
-+			     image->height, 8, image->bits_per_pixel
-+			     != 24 ? PNG_COLOR_TYPE_RGB |
-+			     PNG_COLOR_MASK_COLOR : PNG_COLOR_TYPE_RGB,
-+			     PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+			     PNG_FILTER_TYPE_BASE);
- 		mng_write_sig (png_ptr);
- 		mng_write_MHDR (png_ptr, image->width, image->height, 1000 /* msec */);
- 		mng_write_nEED (png_ptr, "draft 41");
-@@ -354,19 +353,17 @@ XImageToMNG8 (FILE *fp, XImage *image, J
- 			png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
- 			return;
- 		}
--		if (setjmp (png_ptr->jmpbuf)) {
-+		if (setjmp (png_jmpbuf(png_ptr))) {
- 			png_destroy_write_struct (&png_ptr, &info_ptr);
- 			(*job->close)(fp);
- 			exit (99);
- 		}
--		info_ptr->width = image->width;
--		info_ptr->height= image->height;
--		info_ptr->bit_depth = 8;
--		if (job->win_attr.visual->class == StaticGray) {
--			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
--		} else {
--			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
--		}
-+		png_set_IHDR(png_ptr, info_ptr, image->width,
-+			     image->height, 8, job->win_attr.visual->class
-+			     == StaticGray ? PNG_COLOR_TYPE_GRAY
-+			     : PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
-+			     PNG_COMPRESSION_TYPE_BASE,
-+			     PNG_FILTER_TYPE_BASE);
- 		mng_write_sig (png_ptr),
- 		mng_write_MHDR (png_ptr, image->width, image->height, 1000 /* msec */);
- 		mng_write_nEED (png_ptr, "draft 41");
diff --git a/x11/xvidcap/patches/patch-src_xtopng.c b/x11/xvidcap/patches/patch-src_xtopng.c
deleted file mode 100644
index 8d88093bb0b..00000000000
--- a/x11/xvidcap/patches/patch-src_xtopng.c
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-src_xtopng.c,v 1.1 2011/04/05 11:24:16 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/xtopng.c.orig	2004-02-14 10:55:36.000000000 +0000
-+++ src/xtopng.c
-@@ -110,7 +110,7 @@ XImageToPNGC (FILE *fp, XImage *image, J
- 		png_destroy_write_struct (&png_ptr, (png_infopp)NULL);
- 		return;
- 	}
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(png_ptr))) {
- 		png_destroy_write_struct (&png_ptr, &info_ptr);
- 		(*job->close) (fp);
- 		return;
-@@ -119,13 +119,14 @@ XImageToPNGC (FILE *fp, XImage *image, J
- 	png_init_io (png_ptr, fp);
- 	png_set_compression_level (png_ptr, job->compress);
- 
--	info_ptr->width = image->width;
--	info_ptr->height= image->height;
--	info_ptr->bit_depth = 8;
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+	png_set_IHDR(png_ptr, info_ptr, image->width,
-+		     image->height, 8, ((image->bits_per_pixel ==
-+		     24) || (image->bits_per_pixel == 8)) ?
-+		     PNG_COLOR_TYPE_RGB | PNG_COLOR_MASK_COLOR :
-+		     PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-+		     PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 	if ((image->bits_per_pixel == 16) ||
- 		(image->bits_per_pixel == 8)) {
--		info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
- 		/* may be we need this? seems to be so
- 		 */
- 		png_set_sBIT (png_ptr, info_ptr, &sig_bit);
-@@ -254,7 +255,7 @@ XImageToPNG8 (FILE *fp, XImage *image, J
- 		png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
- 		return;
- 	}
--	if (setjmp (png_ptr->jmpbuf)) {
-+	if (setjmp (png_jmpbuf(png_ptr))) {
- 		png_destroy_write_struct (&png_ptr, &info_ptr);
- 		(*job->close) (fp);
- 		return;
-@@ -263,13 +264,12 @@ XImageToPNG8 (FILE *fp, XImage *image, J
- 	png_init_io (png_ptr, fp);
- 	png_set_compression_level (png_ptr, job->compress);
- 
--	info_ptr->width = image->width;
--	info_ptr->height= image->height;
--	info_ptr->bit_depth = 8;
--	if (job->win_attr.visual->class == StaticGray) {
--		info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
--	} else {
--		info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_set_IHDR(png_ptr, info_ptr, image->width,
-+		     image->height, 8, job->win_attr.visual->class
-+		     == StaticGray ? PNG_COLOR_TYPE_GRAY :
-+		     PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
-+		     PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-+	if (job->win_attr.visual->class != StaticGray) {
- 		png_set_PLTE (png_ptr, info_ptr, job->color_table, job->ncolors);
- 	}
-