6 files changed, 8 insertions, 146 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index d798c36c845f..28915c0009fd 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	2.0.38
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		http://download.berlios.de/avidemux/
-DISTNAME=	avidemux-${PORTVERSION}rc1
+DISTNAME=	avidemux-${PORTVERSION}
 
 MAINTAINER=	amistry@am-productions.biz
 COMMENT=	Simple GUI based video editor
@@ -31,7 +31,6 @@ USE_LIBTOOL_VER=15
 USE_GNOME=	gnomeprefix gnomehack gtk20
 WANT_SDL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-		-I${LOCALBASE}/include/ffmpeg \
 		-I${LOCALBASE}/include/a52dec" \
 		LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -82,12 +81,6 @@ LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--with-xvid-as-decoder
 .endif
 
-.if ${ARCH} != "i386"
-CONFIGURE_ARGS+=	--disable-mmx
-.else
-BUILD_DEPENDS+=		nasm:${PORTSDIR}/devel/nasm
-.endif
-
 .if defined(WITH_A52)
 LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
 .endif
@@ -104,6 +97,10 @@ LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
 LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
 .endif
 
+.if ${OSVERSION} < 500000
+BROKEN=		"does not compile"
+.endif
+
 post-extract:
 	@${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \
 		${WRKSRC}/avidemux/ADM_mplex/ADM_mplexout.cpp
diff --git a/multimedia/avidemux2/distinfo b/multimedia/avidemux2/distinfo
index c780332da8fc..b832524bee48 100644
--- a/multimedia/avidemux2/distinfo
+++ b/multimedia/avidemux2/distinfo
@@ -1,2 +1,2 @@
-MD5 (avidemux-2.0.38rc1.tar.gz) = 59f0cfff83a7a04bfadaf51fe35fd225
-SIZE (avidemux-2.0.38rc1.tar.gz) = 3177994
+MD5 (avidemux-2.0.38.tar.gz) = 23a34f138518ae646d4173e0a32e48ac
+SIZE (avidemux-2.0.38.tar.gz) = 3503709
diff --git a/multimedia/avidemux2/files/patch-aa b/multimedia/avidemux2/files/patch-aa
deleted file mode 100644
index de0ac9db873e..000000000000
--- a/multimedia/avidemux2/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: avidemux/ADM_audio/audio_mpegidentify.cpp
-===================================================================
-RCS file: /cvsroot/avidemux/avidemux/avidemux/ADM_audio/audio_mpegidentify.cpp,v
-retrieving revision 1.4
-diff -u -r1.4 audio_mpegidentify.cpp
---- avidemux/ADM_audio/audio_mpegidentify.cpp	19 Feb 2005 16:07:20 -0000	1.4
-+++ avidemux/ADM_audio/audio_mpegidentify.cpp	20 Feb 2005 15:35:11 -0000
-@@ -33,7 +33,7 @@
- #include "fourcc.h"
- #include "aviaudio.hxx"
- 
--#include "ADM_audio/ADM_mp3info.h"
-+#include "ADM_audio/ADM_mp3info.h" 
- 
-    
- uint8_t mpegAudioIdentify(uint8_t *ptr, uint32_t maxLookUp, WAVHeader *header, uint8_t *tokens)
-@@ -58,9 +58,12 @@
-         if(info.layer==3) header->encoding=WAV_MP3;
-                 else header->encoding=WAV_MP2;
- 
-+        if(tokens)
-+        {
-                 tokens[0]=ptr[offset+1];
-                 tokens[1]=ptr[offset+2]&0xfd;
-                 tokens[2]=ptr[offset+3];
-+        }
- #define DUMPX(x) printf(#x": %d\n",info.x);
-                 DUMPX( level);                    
-                 DUMPX( layer);
diff --git a/multimedia/avidemux2/files/patch-ab b/multimedia/avidemux2/files/patch-ab
deleted file mode 100644
index b843f144dc2d..000000000000
--- a/multimedia/avidemux2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- adm_lavcodec/common.h.orig       Tue Mar  8 23:22:48 2005
-+++ adm_lavcodec/common.h    Tue Mar  8 23:21:07 2005
-@@ -249,7 +249,7 @@
- #        ifdef DEBUG
- #            define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, ##args)
- #        else
--#            define dprintf(fmt,...)
-+#            define dprintf(fmt,a...)
- #        endif
- 
- #    endif /* !CONFIG_WIN32 */
diff --git a/multimedia/avidemux2/files/patch-ac b/multimedia/avidemux2/files/patch-ac
deleted file mode 100644
index 42f67dd2dbec..000000000000
--- a/multimedia/avidemux2/files/patch-ac
+++ /dev/null
@@ -1,62 +0,0 @@
---- avidemux/ADM_mplex/ADM_mplexin.cpp.jsc      Thu Mar 10 21:12:52 2005
-+++ avidemux/ADM_mplex/ADM_mplexin.cpp  Thu Mar 10 21:13:19 2005
-@@ -17,6 +17,7 @@
- #include <string.h>
- #include <sys/stat.h>
-
-+#include "interact.hpp"
-
- #undef malloc
- #undef realloc
-@@ -36,7 +37,6 @@
- #include "mjpeg_logging.h"
- #include "mpegconsts.h"
-
--#include "interact.hpp"
- #include "bits.hpp"
- #include "outputstrm.hpp"
- #include "multiplexor.hpp"
---- avidemux/ADM_mplex/ADM_mplexmuxer.cpp.jsc   Thu Mar 10 07:59:46 2005
-+++ avidemux/ADM_mplex/ADM_mplexmuxer.cpp       Thu Mar 10 08:00:08 2005
-@@ -37,6 +37,8 @@
- #include <sys/stat.h>
- #include <pthread.h>
-
-+#include "interact.hpp"
-+
- #undef malloc
- #undef realloc
- #undef free
-@@ -65,7 +67,6 @@
- #include "mjpeg_logging.h"
- #include "mpegconsts.h"
-
--#include "interact.hpp"
- #include "bits.hpp"
- #include "outputstrm.hpp"
- #include "multiplexor.hpp"
---- avidemux/ADM_mplex/ADM_mplexout.cpp.orig	Tue Jan 25 14:26:47 2005
-+++ avidemux/ADM_mplex/ADM_mplexout.cpp	Fri Mar 11 19:32:32 2005
-@@ -6,6 +6,7 @@
- #include <string.h>
- #include <sys/stat.h>
- 
-+#include "interact.hpp"
- 
- #undef malloc
- #undef realloc
-@@ -26,7 +27,6 @@
- #include "mjpeg_logging.h"
- #include "mpegconsts.h"
- 
--#include "interact.hpp"
- #include "bits.hpp"
- #include "outputstrm.hpp"
- #include "multiplexor.hpp"
-@@ -94,4 +94,4 @@
-         return _transfert->read(buf,number);
-  }
-  //EOF
-- 
-\ No newline at end of file
-+ 
diff --git a/multimedia/avidemux2/files/patch-ad b/multimedia/avidemux2/files/patch-ad
deleted file mode 100644
index 51377e5f7649..000000000000
--- a/multimedia/avidemux2/files/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.orig	Fri Mar 11 20:10:04 2005
-+++ configure	Fri Mar 11 20:10:21 2005
-@@ -21779,7 +21779,7 @@
- 		else
- 		touch adm_lavcodec/config.cpu
- 		fi;;
--	x86_64)
-+	x86_64|amd64)
- 		have_little_endian=yes;
- 		echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu
- 
---- configure.in.orig	Fri Mar 11 20:09:53 2005
-+++ configure.in	Fri Mar 11 20:10:38 2005
-@@ -717,7 +717,7 @@
- 		else
- 		touch adm_lavcodec/config.cpu
- 		fi;;
--	x86_64)
-+	x86_64|amd64)
- 		have_little_endian=yes;
- 		echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu
- 		AC_DEFINE(HAVE_X86_64,1,"X86_64 amd64 assembly")
---- configure.in.in.orig	Fri Mar 11 20:09:59 2005
-+++ configure.in.in	Fri Mar 11 20:10:54 2005
-@@ -717,7 +717,7 @@
- 		else
- 		touch adm_lavcodec/config.cpu
- 		fi;;
--	x86_64)
-+	x86_64|amd64)
- 		have_little_endian=yes;
- 		echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu
- 		AC_DEFINE(HAVE_X86_64,1,"X86_64 amd64 assembly")