3 files changed, 22 insertions, 17 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 10db19d3e5e6..79833c17e0a3 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	avidemux2
-PORTVERSION=	2.0.42
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		http://download.berlios.de/avidemux/
@@ -20,6 +19,7 @@ PATCH_DEPENDS=	${ACLOCAL}:${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 		mad.2:${PORTSDIR}/audio/libmad \
 		xml2.5:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libjs.so:${PORTSDIR}/lang/spidermonkey
 
 USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15
 USE_REINPLACE=	yes
@@ -32,12 +32,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		PTHREAD_LIBS=${PTHREAD_LIBS} \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
-CONFIGURE_ARGS=	--disable-warnings
+CONFIGURE_ARGS=	--disable-warnings \
+		--with-jsapi-include=${LOCALBASE}/include
 USE_GMAKE=	yes
 OPTIONS=	OPTIMIZED_CFLAGS "build with -O3 for lavcodec" off \
 		FAAC "FAAC (mpeg4/aac encoder)" off \
 		FAAD "FAAD (mpeg4/aac decoder)" off \
-		MPEGENC "MPEG/MJPEG video" off \
+		X264 "H.264 encoding" off \
 		A52 "A52 audio" off \
 		XVID "Xvid video" off \
 		SDL "SDL audio/video framework" off
@@ -48,6 +49,10 @@ OPTIONS=	OPTIMIZED_CFLAGS "build with -O3 for lavcodec" off \
 #WITH_SDL=	yes
 #.endif
 
+.if exists(${LOCALBASE}/lib/libx264.so)
+WITH_X264=	yes
+.endif
+
 .if exists(${LOCALBASE}/lib/libfaac.so)
 WITH_FAAC=	yes
 .endif
@@ -56,10 +61,6 @@ WITH_FAAC=	yes
 WITH_FAAD=	yes
 .endif
 
-.if exists(${LOCALBASE}/bin/mpeg2enc)
-WITH_MPEGENC=	yes
-.endif
-
 .if exists(${LOCALBASE}/lib/liba52.so.0)
 WITH_A52=	yes
 .endif
@@ -68,10 +69,6 @@ WITH_A52=	yes
 WITH_XVID=	yes
 .endif
 
-.if defined(WITH_MPEGENC)
-RUN_DEPENDS+=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
-.endif
-
 .if defined(WITH_XVID)
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--with-xvid-as-decoder
@@ -93,6 +90,10 @@ LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
 LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
 .endif
 
+.if defined(WITH_X264)
+LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
+.endif
+
 .if ${OSVERSION} < 500000
 BROKEN=		"does not compile"
 .endif
diff --git a/multimedia/avidemux2/distinfo b/multimedia/avidemux2/distinfo
index 5a616141281e..e0c4118721b1 100644
--- a/multimedia/avidemux2/distinfo
+++ b/multimedia/avidemux2/distinfo
@@ -1,2 +1,3 @@
-MD5 (avidemux-2.0.42.tar.gz) = d30f1bb981767bca793d78067bcfe084
-SIZE (avidemux-2.0.42.tar.gz) = 3817449
+MD5 (avidemux-2.1.0.tar.gz) = 524ce4f1f2b3683ab4f9ac25bf0d3ca4
+SHA256 (avidemux-2.1.0.tar.gz) = c3fa7b17dbbb16384fa49bf1027e91a6ad58288635221acad8670953e6e56a2e
+SIZE (avidemux-2.1.0.tar.gz) = 4074953
diff --git a/multimedia/avidemux2/pkg-descr b/multimedia/avidemux2/pkg-descr
index aa6b25269bfa..557c0b2f51b7 100644
--- a/multimedia/avidemux2/pkg-descr
+++ b/multimedia/avidemux2/pkg-descr
@@ -1,6 +1,9 @@
-An simple video editor that is built around Xvid and ffmpeg.  Contains
-various filters for deinterlacing, cropping, resizing, etc.  Allows for
-cutting without re-encoding.  Has the ability to re-encode and re-sample.
+A video editor that allows editing of AVI, OGM, and MPEG videos.  The MPEG
+support provides the ability to convert to DVD compliat PS streams.  It
+contains various filters for deinterlacing, cropping, resizing, etc.  Allows
+for cutting without re-encoding.  Has the ability to re-encode and re-sample.
+Utilizes ECMAScript (aka. Javascript) to provide batch scripting and
+processing support.
 
 WWW: http://fixounet.free.fr/avidemux/