6 files changed, 37 insertions, 43 deletions

diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 7a495490c647..71ebb2e90639 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -6,24 +6,24 @@
 #
 
 PORTNAME=		xvidcap
-PORTVERSION=		1.1.3
-PORTREVISION=		2
+PORTVERSION=		1.1.3.7
 CATEGORIES=		sysutils multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=		${PORTNAME}-${PORTVERSION:C/.7/-p7/}
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Capture your X display to individual frames or MPEG video
 
-LIB_DEPENDS=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+#LIB_DEPENDS=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg	# To be reactivated after 1.1.4
+#LIB_DEPENDS=		mp3lame.0:${PORTSDIR}/audio/lame
 RUN_DEPENDS=		animate:${PORTSDIR}/graphics/ImageMagick
 
-BROKEN=			"Does not compile with ffmpeg-0.4.9.p1"
-
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+#CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
+#			LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=		--with-forced-embedded-ffmpeg	# To be removed after 1.1.4pre2?
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=		yes
 
diff --git a/sysutils/xvidcap/distinfo b/sysutils/xvidcap/distinfo
index fcae67c5859d..3cdd3f7f199e 100644
--- a/sysutils/xvidcap/distinfo
+++ b/sysutils/xvidcap/distinfo
@@ -1,2 +1,2 @@
-MD5 (xvidcap-1.1.3.tar.gz) = ea896ffd35d6fe6d2abf51b38605f5fd
-SIZE (xvidcap-1.1.3.tar.gz) = 1627036
+MD5 (xvidcap-1.1.3-p7.tar.gz) = c00c77db0d13f02f336548470e899e04
+SIZE (xvidcap-1.1.3-p7.tar.gz) = 1659543
diff --git a/sysutils/xvidcap/files/patch-configure b/sysutils/xvidcap/files/patch-configure
index 9a026af196d8..4885a826f91c 100644
--- a/sysutils/xvidcap/files/patch-configure
+++ b/sysutils/xvidcap/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	Sat Feb 14 21:06:12 2004
-+++ configure	Sun May  2 19:45:20 2004
-@@ -5250,9 +5250,6 @@
+--- configure.orig	Sat Jan  1 23:53:48 2005
++++ configure	Sun Jan  2 22:05:19 2005
+@@ -5297,7 +5297,7 @@
+ # if cache empty (not tested or failed) and want static avcodec (then it failed) ...
+ if ( `test \( \( x${ac_cv_lib_avcodec_img_convert+set} = x \) -a \( x$static_avcodec = xyes \) \)` ) ; then
+ 	# build embedded ffmpeg
+-	echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && ( cd ./ffmpeg/ && ./configure --disable-ffserver --disable-ffplay && ln -s libavcodec/avcodec.h && ln -s libavformat/avformat.h && ln -s libavformat/avio.h && ln -s libavformat/rt*.h ./ && ${MAKE-make} )
++	echo "${MAKE-make}-ing prerequisite ffmpeg libraries" && ( cd ./ffmpeg/ && ./configure --cc=$CC --extra-libs=-lm --disable-opts --disable-ffserver --disable-ffplay && ln -s libavcodec/avcodec.h && ln -s libavformat/avformat.h && ln -s libavformat/avio.h && ln -s libavformat/rt*.h ./ && ${MAKE-gmake} )
+ 	# try to link it statically, or reset cache, set static_avcodec=no
+ 	top_srcdir=`pwd`
+ 	ac_my_ldflags_save=${LDFLAGS} ; LDFLAGS="${LDFLAGS} -L$top_srcdir/ffmpeg/libavcodec -L$top_srcdir/ffmpeg/libavformat"
+@@ -5658,9 +5658,6 @@
  
  echo "$as_me:$LINENO: checking for audio_init in -lavformat" >&5
  echo $ECHO_N "checking for audio_init in -lavformat... $ECHO_C" >&6
@@ -10,7 +19,7 @@
  
  echo -n "(static?) ... "
  ac_check_lib_save_LIBS=$LIBS
-@@ -5305,11 +5302,8 @@
+@@ -5722,11 +5719,8 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_audio_init" >&5
  echo "${ECHO_T}$ac_cv_lib_avformat_audio_init" >&6
@@ -22,4 +31,4 @@
 +if test x$ac_cv_lib_avformat_audio_init = xyes; then
    ac_my_have_ffmpeg_audio="1"
  else
-   unset ac_cv_lib_avformat_audio_open ; echo "$as_me:$LINENO: checking for audio_init in -lavformat" >&5
+   unset ac_cv_lib_avformat_audio_init ; echo "$as_me:$LINENO: checking for audio_init in -lavformat" >&5
diff --git a/sysutils/xvidcap/files/patch-src::Makefile.in b/sysutils/xvidcap/files/patch-src::Makefile.in
index 7578c31c58bc..e80ac02d8efb 100644
--- a/sysutils/xvidcap/files/patch-src::Makefile.in
+++ b/sysutils/xvidcap/files/patch-src::Makefile.in
@@ -1,18 +1,18 @@
---- src/Makefile.in.orig	Sat Feb 14 21:06:20 2004
-+++ src/Makefile.in	Sun Apr 25 10:12:19 2004
-@@ -175,9 +175,9 @@
+--- src/Makefile.in.orig	Sat Jan  1 23:53:52 2005
++++ src/Makefile.in	Sun Jan  2 16:46:20 2005
+@@ -180,9 +180,9 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
 -AM_CFLAGS = @X_CFLAGS@ -DVERSION=\"@PACKAGE_VERSION@\"  $(am__append_1)
 +AM_CFLAGS = @X_CFLAGS@ -DVERSION=\"@PACKAGE_VERSION@\" @PTHREAD_CFLAGS@ $(am__append_1)
  
--AM_LDFLAGS = @X_LIBS@ -lpthread $(am__append_2) $(am__append_3)
-+AM_LDFLAGS = @X_LIBS@ @PTHREAD_LIBS@ $(am__append_2) $(am__append_3)
+-AM_LDFLAGS = @X_LIBS@  $(am__append_2) $(am__append_3)
++AM_LDFLAGS = @X_LIBS@ @PTHREAD_LIBS@ $(am__append_2) $(am__append_3) -lm
  
  
  # specific xvidcap / gvidcap
-@@ -1801,9 +1801,9 @@
+@@ -1805,9 +1805,9 @@
  
  
  install-data-hook:
diff --git a/sysutils/xvidcap/files/patch-src::capture.c b/sysutils/xvidcap/files/patch-src::capture.c
index 736a2d8b4765..8d5db526a5ff 100644
--- a/sysutils/xvidcap/files/patch-src::capture.c
+++ b/sysutils/xvidcap/files/patch-src::capture.c
@@ -1,14 +1,11 @@
---- src/capture.c.orig	Sat Feb 14 21:14:20 2004
-+++ src/capture.c	Sat May 15 23:01:57 2004
-@@ -643,7 +643,11 @@
-             (*job->close) (fp);
-         else if (job->flags & FLG_SYNC) {
-             if (job->open == (void *(*)(char *, char*))fopen)
-+#ifdef HAVE_FDATASYNC
+--- src/capture.c.orig	Mon Mar 15 18:34:42 2004
++++ src/capture.c	Sun Jan  2 18:00:09 2005
+@@ -662,7 +662,7 @@
+ #ifdef HAVE_FDATASYNC
                  fdatasync(fileno(fp));
-+#else
+ #else
+-                fsync(fileno(fp));
 +                fsync(fileno((FILE *) fp));
-+#endif
-         }
+ #endif // HAVE_FDATASYNC
+         } 
          
-         /* substract the time we needed for creating and saving
diff --git a/sysutils/xvidcap/files/patch-src::xt_control.c b/sysutils/xvidcap/files/patch-src::xt_control.c
deleted file mode 100644
index e5dbbbf2cc3b..000000000000
--- a/sysutils/xvidcap/files/patch-src::xt_control.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/xt_control.c.orig	Sat Feb 14 21:48:14 2004
-+++ src/xt_control.c	Sun Apr 25 10:56:23 2004
-@@ -29,6 +29,9 @@
- #include <stdlib.h>
- #include <limits.h>		/* PATH_MAX */
- #include <ctype.h>		/* isdigit() */
-+#ifdef HAVE_SYS_TIME_H
-+# include <sys/time.h>
-+#endif
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>