I first updated avidemux last June but never commit any updates.

So now I updated it again. And tested the build and install on Linux
and NetBSD 1.6_STABLE and tested basic usage on NetBSD. This is great
software!

I have a few comments and questions.

Below is also some patches for pkgsrc. Please test and let me know.

Remove your patches/patch-* files. They are not needed.

Index: multimedia/avidemux/DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/avidemux/DESCR,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 DESCR
--- multimedia/avidemux/DESCR	26 Jan 2004 12:59:01 -0000	1.1.1.1
+++ multimedia/avidemux/DESCR	3 Feb 2005 22:41:40 -0000
@@ -1,6 +1,7 @@
-Avidemux is a graphical tool to edit video.  It can open AVI, MPEG, Nuppelvideo
-and BMPs.  Most common codecs are supported (M-JPEG, MPEG, DivX, Xvid, huffyuv,
-WMA, etc.) thanks to libavcodec.  Video can be edited, cut, appended, filtered
-(resize/crop/denoise), and re-encoded to either AVI (DivX/Xvid) or MPEG 1/2.
+Avidemux is a graphical tool to edit video.  It can open several file
+formats, and various audio and video codecs.  Video can be edited,
+cut, appended, filtered (resize/crop/denoise), and re-encoded. Output
+file formats include Avi, MPEG1/2, MPEG2PS, OGM, and raw stripped audio
+or video.

 Note that this package does not support DivX.


I was working on DESCRiption. But that is not important now. I was going
to list the different codecs, but now think that maybe these should be
pkgsrc build options.


Index: multimedia/avidemux/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/avidemux/Makefile,v
retrieving revision 1.8
diff -b -u -r1.8 Makefile
--- multimedia/avidemux/Makefile	3 Oct 2004 00:13:01 -0000	1.8
+++ multimedia/avidemux/Makefile	3 Feb 2005 22:41:40 -0000
@@ -1,28 +1,34 @@
 # $NetBSD: Makefile,v 1.8 2004/10/03 00:13:01 tv Exp $
 #

-DISTNAME=	avidemux-2.0.18
-PKGREVISION=	4
+DISTNAME=	avidemux-2.0.36
 CATEGORIES=	multimedia
-MASTER_SITES=	http://fixounet.free.fr/avidemux/
+MASTER_SITES=	http://download.berlios.de/avidemux/

 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://fixounet.free.fr/avidemux/
 COMMENT=	Graphical video editing program

-BUILD_USES_MSGFMT=	YES
+# locale support removed in this release
+# will be readded later according to author
+#BUILD_USES_MSGFMT=	YES
+#USE_PKGLOCALEDIR=	YES
+
+GCC_REQD=		3.0
+#USE_LANGUAGES=		c c++

 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES

-CFLAGS+=		-DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
+#CFLAGS+=		-DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
+CPPFLAGS+=		-DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
 LDFLAGS+=		${LIBOSSAUDIO}

-CONFIGURE_ARGS+=	--disable-warnings
+#CONFIGURE_ARGS+=	--disable-warnings

-BUILDLINK_TRANSFORM+=   rm:-O3
+#BUILDLINK_TRANSFORM+=   rm:-O3

 .include "../../mk/bsd.prefs.mk"

@@ -41,9 +47,12 @@
 .  endif
 .endif

-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/avidemux/avidemux2 ${PREFIX}/bin/avidemux
+#do-install:
+#	${INSTALL_PROGRAM} ${WRKSRC}/avidemux/avidemux2 ${PREFIX}/bin/avidemux

+#.include "../../audio/arts/buildlink3.mk"
+.include "../../audio/faac/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"

Index: multimedia/avidemux/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/avidemux/PLIST,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 PLIST
--- multimedia/avidemux/PLIST	26 Jan 2004 12:59:01 -0000	1.1.1.1
+++ multimedia/avidemux/PLIST	3 Feb 2005 22:41:40 -0000
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 12:59:01 jmmv Exp $
-bin/avidemux
+@comment $NetBSD$
+bin/avidemux2
Index: multimedia/avidemux/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/avidemux/distinfo,v
retrieving revision 1.2
diff -b -u -r1.2 distinfo
--- multimedia/avidemux/distinfo	11 Mar 2004 10:53:05 -0000	1.2
+++ multimedia/avidemux/distinfo	3 Feb 2005 22:41:40 -0000
@@ -1,6 +1,4 @@
 $NetBSD: distinfo,v 1.2 2004/03/11 10:53:05 jmmv Exp $

-SHA1 (avidemux-2.0.18.tar.gz) = ce3b6de5bdcade98ea564ec496de4eb370cd5740
-Size (avidemux-2.0.18.tar.gz) = 2518712 bytes
-SHA1 (patch-aa) = 441462c537aa8a2205b6c1d9ab160afc34b5c967
-SHA1 (patch-ab) = cb3aa64dfe3d48bca554e5f8bd857152cdfd309c
+SHA1 (avidemux-2.0.36.tar.gz) = ebbfab759599ad76a72bb66abb3d697857cff9d2
+Size (avidemux-2.0.36.tar.gz) = 3272742 bytes


The author says name is avidemux2. Suggests installing it as avidemux2.

My last update has a few locales message files (including klingon) but
this is temporarily disabled by author.

Maybe options could be used for the different codec supports?

This would not build for me with old gcc.

 Jeremy C. Reed

 	  	 	 technical support & remote administration
	  	 	 http://www.pugetsoundtechnology.com/