Get rid of xvidcap-gtk2 patches and distinfo.

Used shared info from x11/xvidcap instead.
(For the gtk2 version only patch addition is include of sys/time/.h)
patch-ae adjusted to work with both packages.

10 files changed, 37 insertions, 181 deletions

diff --git a/x11/xvidcap-gtk2/distinfo b/x11/xvidcap-gtk2/distinfo
deleted file mode 100644
index 94c49154bcc..00000000000
--- a/x11/xvidcap-gtk2/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.5 2006/05/17 01:53:18 reed Exp $
-
-SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
-RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
-Size (xvidcap-1.1.3.tar.gz) = 1627036 bytes
-SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd
-SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
-SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = d2b5bf7f73a9e0c3e322911ba2296bbe47e2728f
-SHA1 (patch-af) = 7e5533775b68a2c2ade195660b859530e6422da4
-SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7
diff --git a/x11/xvidcap-gtk2/patches/patch-ab b/x11/xvidcap-gtk2/patches/patch-ab
deleted file mode 100644
index 842aeefd976..00000000000
--- a/x11/xvidcap-gtk2/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/12/28 16:52:25 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 };
-@@ -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
diff --git a/x11/xvidcap-gtk2/patches/patch-ac b/x11/xvidcap-gtk2/patches/patch-ac
deleted file mode 100644
index 0ae1842a53f..00000000000
--- a/x11/xvidcap-gtk2/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/01/12 19:52:38 reed 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-gtk2/patches/patch-ad b/x11/xvidcap-gtk2/patches/patch-ad
deleted file mode 100644
index c9586457bda..00000000000
--- a/x11/xvidcap-gtk2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/01/12 19:52:38 reed 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-gtk2/patches/patch-ae b/x11/xvidcap-gtk2/patches/patch-ae
deleted file mode 100644
index 26bc2834f7a..00000000000
--- a/x11/xvidcap-gtk2/patches/patch-ae
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/12/28 16:52:25 joerg Exp $
-
---- src/Makefile.in.orig	2004-02-14 20:06:20.000000000 +0000
-+++ src/Makefile.in
-@@ -177,7 +177,7 @@ target_alias = @target_alias@
- 
- 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,14 @@ xvidcap_LDADD = ../Xw/libXw.a  $(am__app
- @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
-+man1_MANS = ../man/gvidcap.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)
- 
-@@ -1801,9 +1801,8 @@ uninstall-man: uninstall-man1
- 
- 
- 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 ${datadir}/doc/${PACKAGE_TARNAME}-gtk2-${PACKAGE_VERSION}
-+	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${datadir}/doc/${PACKAGE_TARNAME}-gtk2-${PACKAGE_VERSION}
- 
- uninstall-hook:
- 	rm -rf ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
diff --git a/x11/xvidcap-gtk2/patches/patch-af b/x11/xvidcap-gtk2/patches/patch-af
deleted file mode 100644
index dc808e0b19d..00000000000
--- a/x11/xvidcap-gtk2/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/05/17 01:53:17 reed Exp $
-
---- src/mngutil.c.orig	2004-02-14 11:55:36.000000000 +0100
-+++ 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};
- 
- /*
-@@ -46,7 +39,7 @@ 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_write_chunk_data (png_ptr, &mng_sig[png_ptr->sig_bytes],
- 		(png_size_t)8 - png_ptr->sig_bytes);
- }
- 
diff --git a/x11/xvidcap-gtk2/patches/patch-ag b/x11/xvidcap-gtk2/patches/patch-ag
deleted file mode 100644
index 3f27eafb5f9..00000000000
--- a/x11/xvidcap-gtk2/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/Makefile.common b/x11/xvidcap/Makefile.common
index 223fd6840e1..2f9414e9a88 100644
--- a/x11/xvidcap/Makefile.common
+++ b/x11/xvidcap/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.4 2006/05/17 01:53:18 reed Exp $
+# $NetBSD: Makefile.common,v 1.5 2006/05/17 05:06:28 reed Exp $
 #
 
-# Note: when upgrading version, be sure to update distinfo in xvidcap-gtk2 also
 DISTNAME=		xvidcap-1.1.3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xvidcap/}
@@ -9,6 +8,9 @@ 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
 
diff --git a/x11/xvidcap/distinfo b/x11/xvidcap/distinfo
index a026e48947b..6dd6877446c 100644
--- a/x11/xvidcap/distinfo
+++ b/x11/xvidcap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/05/17 01:53:18 reed Exp $
+$NetBSD: distinfo,v 1.7 2006/05/17 05:06:28 reed Exp $
 
 SHA1 (xvidcap-1.1.3.tar.gz) = e6d86a4184c8cc3e74738fb6e20d49c0d1640025
 RMD160 (xvidcap-1.1.3.tar.gz) = cc7be360153f192b502ffedc6548cce163a9154c
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = 9196f59ec849a361821fd5cae800ec6aef2a1dfc
 SHA1 (patch-ab) = cea05b76ffb2919e1fd4dcb5f489f641ca8e36bd
 SHA1 (patch-ac) = 0de9d748e3808a210ec68d140eb1dfd5e18d9e4f
 SHA1 (patch-ad) = ac40095849f721cfd8aa1e0143dff3ac9b705be7
-SHA1 (patch-ae) = 73358643d97b9b8771f7a26189a386c32007ec70
+SHA1 (patch-ae) = fd0a2640446f6e5ee2f1ca4d883e5d6878e69f1e
 SHA1 (patch-af) = 7e5533775b68a2c2ade195660b859530e6422da4
 SHA1 (patch-ag) = 44cb7ad63e477f21b013a43d06ce81fddb235ef7
diff --git a/x11/xvidcap/patches/patch-ae b/x11/xvidcap/patches/patch-ae
index 5b159440bc4..431809ea9cb 100644
--- a/x11/xvidcap/patches/patch-ae
+++ b/x11/xvidcap/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2005/12/28 16:37:04 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2006/05/17 05:06:28 reed Exp $
 
---- src/Makefile.in.orig	2004-02-14 20:06:20.000000000 +0000
-+++ src/Makefile.in
-@@ -177,7 +177,7 @@ target_alias = @target_alias@
+--- 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)
  
@@ -11,12 +11,37 @@ $NetBSD: patch-ae,v 1.2 2005/12/28 16:37:04 joerg Exp $
  
  
  # specific xvidcap / gvidcap
-@@ -195,7 +195,7 @@ xvidcap_LDADD = ../Xw/libXw.a  $(am__app
+@@ -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
-+man1_MANS = ../man/xvidcap.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 ${docdir}
++	cp ../README ../NEWS ../TODO ../INSTALL ../AUTHORS ../ChangeLog ${docdir}
++@WITHGTK2_FALSE@	./mkresfile.sh > XVidcap.ad && cp XVidcap.ad ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}
+ 
+ uninstall-hook:
+ 	rm -rf ${datadir}/doc/${PACKAGE_TARNAME}_${PACKAGE_VERSION}