Initial import of avidemux, version 2.0.10:

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. 

Note that this package does not support DivX.

12 files changed, 263 insertions, 0 deletions

diff --git a/graphics/avidemux/DESCR b/graphics/avidemux/DESCR
new file mode 100644
index 00000000000..40b12bc3acb
--- /dev/null
+++ b/graphics/avidemux/DESCR
@@ -0,0 +1,6 @@
+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. 
+
+Note that this package does not support DivX.
diff --git a/graphics/avidemux/Makefile b/graphics/avidemux/Makefile
new file mode 100644
index 00000000000..ec2561228dd
--- /dev/null
+++ b/graphics/avidemux/Makefile
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+#
+
+DISTNAME=	avidemux-2.0.10
+CATEGORIES=	graphics
+MASTER_SITES=	http://fixounet.free.fr/avidemux/
+
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	http://fixounet.free.fr/avidemux/
+COMMENT=	Graphical video editing program
+
+BUILD_USES_MSGFMT=	YES
+
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+CFLAGS+=		-DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
+LDFLAGS+=		${LIBOSSAUDIO}
+
+CONFIGURE_ARGS+=	--disable-warnings
+
+.include "../../mk/bsd.prefs.mk"
+
+.if empty(USE_MMX:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--disable-mmx
+
+post-configure:
+	${MV} ${WRKSRC}/adm_lavcodec/config.mak \
+		${WRKSRC}/adm_lavcodec/config.mak.in
+	${SED} -e 's/TARGET_MMX=yes/TARGET_MMX=no/g' \
+		< ${WRKSRC}/adm_lavcodec/config.mak.in \
+		> ${WRKSRC}/adm_lavcodec/config.mak
+.endif
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/avidemux/avidemux2 ${PREFIX}/bin/avidemux
+
+.include "../../audio/lame/buildlink2.mk"
+.include "../../audio/liba52/buildlink2.mk"
+.include "../../audio/libmad/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/mjpegtools/buildlink2.mk"
+.include "../../graphics/xvidcore/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
+
+CFLAGS+=	-O2	# -O3 won't work properly (according to authors)
diff --git a/graphics/avidemux/PLIST b/graphics/avidemux/PLIST
new file mode 100644
index 00000000000..5f25c97f342
--- /dev/null
+++ b/graphics/avidemux/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+bin/avidemux
diff --git a/graphics/avidemux/distinfo b/graphics/avidemux/distinfo
new file mode 100644
index 00000000000..a3d2d173436
--- /dev/null
+++ b/graphics/avidemux/distinfo
@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+SHA1 (avidemux-2.0.10.tar.gz) = 3adcba00ba9893b9e54fa9da2567810b32013467
+Size (avidemux-2.0.10.tar.gz) = 2014961 bytes
+SHA1 (patch-aa) = 3040be8c6de81c33364a7e5d9c2b8927a271c2b8
+SHA1 (patch-ab) = 366c2e16d14330a7f07afe1681180163e3e8c0a4
+SHA1 (patch-ac) = ae737b39e7976d5f2f66452c6b11d439ad3ea0cf
+SHA1 (patch-ad) = 10a0dfec88c9710cd1e315097c4186d7cc4e9f22
+SHA1 (patch-ae) = 82c5098778474772a3c463294ac74b65bf65d854
+SHA1 (patch-af) = e1b54073ea2e05afceeccdb3e2963b850734a155
+SHA1 (patch-ag) = db6bfd5afd6de6e7290c42431a91b9cdfd965b32
+SHA1 (patch-ah) = 94c28c72afd64f8a909a5826e37bdd49167f70c2
diff --git a/graphics/avidemux/patches/patch-aa b/graphics/avidemux/patches/patch-aa
new file mode 100644
index 00000000000..5b9300fea71
--- /dev/null
+++ b/graphics/avidemux/patches/patch-aa
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- configure.orig	2003-07-14 13:07:07.000000000 +0200
++++ configure
+@@ -18732,6 +18732,7 @@ echo "$as_me: error: *** no pthread foun
+    { (exit 1); exit 1; }; }
+ fi
+ 
++if false; then
+ 
+ echo "$as_me:$LINENO: checking for Divx encode" >&5
+ echo $ECHO_N "checking for Divx encode... $ECHO_C" >&6
+@@ -18927,6 +18928,8 @@ if test "x$have_divx" = "xyes"; then
+ echo "$as_me: WARNING: DIVX support removed until it works on p4" >&2;}
+ fi
+ 
++fi
++have_divx="no"
+ 
+ 
+ echo "$as_me:$LINENO: checking for xvid codec" >&5
+@@ -19457,6 +19460,7 @@ _ACEOF
+ fi
+ 
+ 
++if false; then
+ 
+ echo "$as_me:$LINENO: checking for Arts audio support" >&5
+ echo $ECHO_N "checking for Arts audio support... $ECHO_C" >&6
+@@ -19669,6 +19673,8 @@ _ACEOF
+ 	  fi
+ 	  CPPFLAGS=$old_flags
+  fi
++fi
++have_arts="no"
+ if test "x$have_arts" = "xno"; then
+ 	   	ARTS_LIBS=""
+     	ARTS_CFLAGS=""
+@@ -21357,8 +21364,10 @@ echo $ECHO_N "checking cpu type ... $ECH
+ echo $host_cpu
+ echo "Machine vendor : $host_vendor"
+ use_mmx=1
++_saved_hv="$host_vendor"
++if [ -z "$host_vendor" ]; then host_vendor="$host_cpu"; fi
+ case $host_vendor in
+-	pc)
++	pc|i386)
+ 		have_little_endian=yes;
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -21415,6 +21424,7 @@ _ACEOF
+ ;;
+ esac
+ echo "cpu done"
++host_vendor="$_saved_hv"
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
diff --git a/graphics/avidemux/patches/patch-ab b/graphics/avidemux/patches/patch-ab
new file mode 100644
index 00000000000..fbe0952e9c1
--- /dev/null
+++ b/graphics/avidemux/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- avidemux/ADM_video/ADM_vidFont.cpp.orig	2003-07-09 18:29:23.000000000 +0200
++++ avidemux/ADM_video/ADM_vidFont.cpp
+@@ -127,7 +127,7 @@ int ADMfont::fontSetCharSet (char *chars
+ 
+ 	sin=1;
+ 	sout=4;
+-#if defined( __FreeBSD__) || defined(ADM_BIG_ENDIAN)
++#if defined( __FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(ADM_BIG_ENDIAN)
+  	sz=iconv(_conv,(const char **)&in,&sin,&out,&sout);
+  #else
+  	sz=iconv(_conv,&in,&sin,&out,&sout);
+@@ -184,7 +184,7 @@ size_t sz;
+ 
+ 	sin=1;
+ 	sout=4;
+-#if defined (__FreeBSD__) || defined(ADM_BIG_ENDIAN)
++#if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(ADM_BIG_ENDIAN)
+        sz=iconv(_conv,(const char **)&in,&sin,&out,&sout);
+ #else
+ 	sz=iconv(_conv, &in,&sin,&out,&sout);
diff --git a/graphics/avidemux/patches/patch-ac b/graphics/avidemux/patches/patch-ac
new file mode 100644
index 00000000000..038dd8be87a
--- /dev/null
+++ b/graphics/avidemux/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig	2003-05-12 13:10:29.000000000 +0200
++++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp
+@@ -29,10 +29,14 @@
+ #ifdef OSS_SUPPORT
+ #include "ADM_library/default.h"
+ #include "audio_out.h"
++#if defined(__NetBSD__) || defined(__OpenBSD__)
++#include <soundcard.h>
++#else
+ #include <sys/soundcard.h>
++#endif
+ #include  "ADM_audiodevice/ADM_deviceoss.h"
+ 
+-const char *dsp = "/dev/dsp";
++const char *dsp = DEVOSSAUDIO;
+ 
+ //_______________________________________________
+ //
diff --git a/graphics/avidemux/patches/patch-ad b/graphics/avidemux/patches/patch-ad
new file mode 100644
index 00000000000..bbb072bfe89
--- /dev/null
+++ b/graphics/avidemux/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- adm_lavcodec/mem.c.orig	2003-05-29 00:40:42.000000000 +0200
++++ adm_lavcodec/mem.c
+@@ -37,7 +37,7 @@
+  	#endif
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ 	#define memalign(A,B)  malloc(B)
+ #endif
+ 
diff --git a/graphics/avidemux/patches/patch-ae b/graphics/avidemux/patches/patch-ae
new file mode 100644
index 00000000000..88a52e9e9f3
--- /dev/null
+++ b/graphics/avidemux/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- avidemux/ADM_video/swscale.h.orig	2003-04-21 01:29:40.000000000 +0200
++++ avidemux/ADM_video/swscale.h
+@@ -15,7 +15,7 @@
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+        #define memalign(align,size) malloc (size)
+ #endif
+ 
diff --git a/graphics/avidemux/patches/patch-af b/graphics/avidemux/patches/patch-af
new file mode 100644
index 00000000000..3eb9ace8c9c
--- /dev/null
+++ b/graphics/avidemux/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- adm_lavcodec/dsputil.h.orig	2003-05-29 00:39:00.000000000 +0200
++++ adm_lavcodec/dsputil.h
+@@ -30,7 +30,7 @@
+ #include "common.h"
+ #include "avcodec.h"
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define lrintf rintf
+ #endif
+ 
+@@ -476,6 +476,7 @@ static int name16(void /*MpegEncContext*
+           +name8(s, dst+8+8*stride, src+8+8*stride, stride);\
+ }
+ 
++#if 0
+ #ifndef HAVE_LRINTF
+ /* XXX: add ISOC specific test to avoid specific BSD testing. */
+ /* better than nothing implementation. */
+@@ -490,5 +491,6 @@ static inline long int lrintf(float x)
+ #endif
+ }
+ #endif
++#endif
+ 
+ #endif
diff --git a/graphics/avidemux/patches/patch-ag b/graphics/avidemux/patches/patch-ag
new file mode 100644
index 00000000000..993ef63d132
--- /dev/null
+++ b/graphics/avidemux/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- avidemux/ADM_mpPostProc/postprocess.c.orig	2003-07-08 08:25:40.000000000 +0200
++++ avidemux/ADM_mpPostProc/postprocess.c
+@@ -99,7 +99,7 @@ try to unroll inner for(x=0 ... loop to 
+ #define TEMP_STRIDE 8
+ /*#define NUM_BLOCKS_AT_ONCE 16 //not used yet */
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ 	#define memalign(align,size) malloc (size)
+ #endif
+ 
diff --git a/graphics/avidemux/patches/patch-ah b/graphics/avidemux/patches/patch-ah
new file mode 100644
index 00000000000..71e6a3f6d10
--- /dev/null
+++ b/graphics/avidemux/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+
+--- adm_lavcodec/Makefile.orig	2003-08-02 17:13:10.000000000 +0200
++++ adm_lavcodec/Makefile
+@@ -22,12 +22,12 @@ ASM_OBJS=
+ 
+ 	
+ # i386 mmx specific stuff
+-#ifeq ($(TARGET_MMX),yes)
++ifeq ($(TARGET_MMX),yes)
+ OBJS += i386/fdct_mmx.o i386/cputest.o \
+ 	i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
+ 	i386/idct_mmx.o i386/motion_est_mmx.o \
+ 	i386/simple_idct_mmx.o
+-#endif
++endif
+ 
+ 
+ SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)