ports/90215: Update Avidemux to 2.1.0

[Anish Mistry]

>Number:         90215
>Category:       ports
>Synopsis:       Update Avidemux to 2.1.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 10 21:40:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Anish Mistry
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
AM Productions 
>Environment:


System: FreeBSD 6.0-RELEASE #0: Wed Nov  9 19:55:29 EST 2005
    amistry at bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY



>Description:


Update Avidemux to 2.1.0.  Now it depends on spidermonkey for scripting and project support.


>How-To-Repeat:





>Fix:


--- avidemux-2.1.0.patch begins here ---
diff -ruN avidemux2.orig/Makefile avidemux2/Makefile
--- avidemux2.orig/Makefile	Tue Nov 15 01:50:11 2005
+++ avidemux2/Makefile	Sat Dec 10 16:19:07 2005
@@ -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 @@
 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 @@
 		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 @@
 #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_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_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
@@ -91,6 +88,10 @@
 
 .if defined(WITH_FAAD)
 LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+.endif
+
+.if defined(WITH_X264)
+LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
 .endif
 
 .if ${OSVERSION} < 500000
diff -ruN avidemux2.orig/distinfo avidemux2/distinfo
--- avidemux2.orig/distinfo	Thu Jun 23 20:15:01 2005
+++ avidemux2/distinfo	Sat Dec 10 16:19:07 2005
@@ -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 -ruN avidemux2.orig/pkg-descr avidemux2/pkg-descr
--- avidemux2.orig/pkg-descr	Thu Dec  4 01:46:36 2003
+++ avidemux2/pkg-descr	Sat Dec 10 16:19:07 2005
@@ -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/
 
--- avidemux-2.1.0.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: