- Fix build on amd64 and 4.x.

PR:		ports/78717
Submitted by:	Anish Mistry <amistry@am-productions.biz> (maintainer)

4 files changed, 107 insertions, 1 deletions

diff --git a/multimedia/avidemux2/Makefile b/multimedia/avidemux2/Makefile
index 408158631e2b..212dc2ece488 100644
--- a/multimedia/avidemux2/Makefile
+++ b/multimedia/avidemux2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	avidemux2
 PORTVERSION=	2.0.38
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
 		http://download.berlios.de/avidemux/
diff --git a/multimedia/avidemux2/files/patch-ab b/multimedia/avidemux2/files/patch-ab
new file mode 100644
index 000000000000..b843f144dc2d
--- /dev/null
+++ b/multimedia/avidemux2/files/patch-ab
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..42f67dd2dbec
--- /dev/null
+++ b/multimedia/avidemux2/files/patch-ac
@@ -0,0 +1,62 @@
+--- 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
new file mode 100644
index 000000000000..51377e5f7649
--- /dev/null
+++ b/multimedia/avidemux2/files/patch-ad
@@ -0,0 +1,33 @@
+--- 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")