[pkgsrc/trunk]: pkgsrc/x11 xvidcap: Update to 1.1.7

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/94adfa25ad2b
branches:  trunk
changeset: 427991:94adfa25ad2b
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Apr 23 14:31:11 2020 +0000

description:
xvidcap: Update to 1.1.7

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

diffstat:

 x11/Makefile                            |    3 +-
 x11/xvidcap-gtk2/DESCR                  |    5 -
 x11/xvidcap-gtk2/Makefile               |   18 ---
 x11/xvidcap-gtk2/PLIST                  |    9 -
 x11/xvidcap/Makefile                    |   59 ++++++++++-
 x11/xvidcap/Makefile.common             |   25 ----
 x11/xvidcap/PLIST                       |  161 ++++++++++++++++++++++++++++++-
 x11/xvidcap/distinfo                    |   21 +--
 x11/xvidcap/patches/patch-aa            |   12 --
 x11/xvidcap/patches/patch-ab            |   68 -------------
 x11/xvidcap/patches/patch-ac            |   18 ---
 x11/xvidcap/patches/patch-ad            |   13 --
 x11/xvidcap/patches/patch-ae            |   47 ---------
 x11/xvidcap/patches/patch-af            |   35 ------
 x11/xvidcap/patches/patch-ag            |   37 -------
 x11/xvidcap/patches/patch-configure     |   23 ++++
 x11/xvidcap/patches/patch-src_capture.c |   40 +++++++
 x11/xvidcap/patches/patch-src_xtomng.c  |   60 -----------
 x11/xvidcap/patches/patch-src_xtopng.c  |   64 ------------
 19 files changed, 276 insertions(+), 442 deletions(-)

diffs (truncated from 813 to 300 lines):

diff -r 34c9e728cfa0 -r 94adfa25ad2b x11/Makefile
--- a/x11/Makefile      Thu Apr 23 14:15:30 2020 +0000
+++ b/x11/Makefile      Thu Apr 23 14:31:11 2020 +0000
@@ -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+=       xtruss
 SUBDIR+=       xvattr
 SUBDIR+=       xvidcap
-SUBDIR+=       xvidcap-gtk2
 SUBDIR+=       xvidtune
 SUBDIR+=       xview
 SUBDIR+=       xview-clients
diff -r 34c9e728cfa0 -r 94adfa25ad2b x11/xvidcap-gtk2/DESCR
--- a/x11/xvidcap-gtk2/DESCR    Thu Apr 23 14:15:30 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 34c9e728cfa0 -r 94adfa25ad2b x11/xvidcap-gtk2/Makefile
--- a/x11/xvidcap-gtk2/Makefile Thu Apr 23 14:15:30 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 34c9e728cfa0 -r 94adfa25ad2b x11/xvidcap-gtk2/PLIST
--- a/x11/xvidcap-gtk2/PLIST    Thu Apr 23 14:15:30 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 34c9e728cfa0 -r 94adfa25ad2b x11/xvidcap/Makefile
--- a/x11/xvidcap/Makefile      Thu Apr 23 14:15:30 2020 +0000
+++ b/x11/xvidcap/Makefile      Thu Apr 23 14:31:11 2020 +0000
@@ -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 $
+
+DISTNAME=      xvidcap-1.1.7
+CATEGORIES=    x11
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xvidcap/}
+
+MAINTAINER=    reed%reedmedia.net@localhost
+HOMEPAGE=      http://xvidcap.sourceforge.net/
+COMMENT=       Capture X display to individual frames or MPEG video
+LICENSE=       gnu-gpl-v3
+
+GNU_CONFIGURE= yes
 
-.include "Makefile.common"
+USE_TOOLS+=    gmake perl pkg-config
+USE_TOOLS+=    intltool msgfmt msgmerge xgettext
+
+REPLACE_SH+=   ppm2mpeg.sh
 
-PKGREVISION=           22
-COMMENT=               Capture X display to individual frames or MPEG video
+# 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
 
-CONFIGURE_ARGS+=       --without-gtk2
-LDFLAGS.DragonFly=     -lXt -lX11
+.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
 
-.include "../../x11/libXext/buildlink3.mk"
+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 -r 34c9e728cfa0 -r 94adfa25ad2b x11/xvidcap/Makefile.common
--- a/x11/xvidcap/Makefile.common       Thu Apr 23 14:15:30 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r 34c9e728cfa0 -r 94adfa25ad2b x11/xvidcap/PLIST
--- a/x11/xvidcap/PLIST Thu Apr 23 14:15:30 2020 +0000
+++ b/x11/xvidcap/PLIST Thu Apr 23 14:31:11 2020 +0000
@@ -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