Attachment #53633 for bug #81131

View | Details | Raw Unified | Return to bug 81131
Collapse All | Expand All





PORTNAME=	avidemux2
PORTVERSION=	2.0.38
PORTREVISION=	3
CATEGORIES=	multimedia
MASTER_SITES=	http://fixounet.free.fr/avidemux/ \
		http://download.berlios.de/avidemux/
DISTNAME=	avidemux-${PORTVERSION}

MAINTAINER=	amistry@am-productions.biz
COMMENT=	Simple GUI based video editor

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" \

.if defined(WITH_XVID)
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)

Lines 1-2 Link Here

(-)avidemux2/distinfo (-2 / +2 lines)
1	MD5 (avidemux-2.0.38rc1.tar.gz) = 59f0cfff83a7a04bfadaf51fe35fd225	1	MD5 (avidemux-2.0.38.tar.gz) = 23a34f138518ae646d4173e0a32e48ac
2	SIZE (avidemux-2.0.38rc1.tar.gz) = 3177994	2	SIZE (avidemux-2.0.38.tar.gz) = 3503709




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);

Lines 1-11 Link Here

(-)avidemux2/files/patch-ab (-11 lines)
1	--- adm_lavcodec/common.h.orig Tue Mar 8 23:22:48 2005
2	+++ adm_lavcodec/common.h Tue Mar 8 23:21:07 2005
3	@@ -249,7 +249,7 @@
4	# ifdef DEBUG
5	# define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, ##args)
6	# else
7	-# define dprintf(fmt,...)
8	+# define dprintf(fmt,a...)
9	# endif
10
11	# endif /* !CONFIG_WIN32 */




--- 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
+ 




--- 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")

Return to bug 81131

Lines 7-17 Link Here

(-)avidemux2/Makefile (-9 / +2 lines)
7		7
8	PORTNAME= avidemux2	8	PORTNAME= avidemux2
9	PORTVERSION= 2.0.38	9	PORTVERSION= 2.0.38
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= multimedia	11	CATEGORIES= multimedia
12	MASTER_SITES= http://fixounet.free.fr/avidemux/ \	12	MASTER_SITES= http://fixounet.free.fr/avidemux/ \
13	http://download.berlios.de/avidemux/	13	http://download.berlios.de/avidemux/
14	DISTNAME= avidemux-${PORTVERSION}rc1	14	DISTNAME= avidemux-${PORTVERSION}
15		15
16	MAINTAINER= amistry@am-productions.biz	16	MAINTAINER= amistry@am-productions.biz
17	COMMENT= Simple GUI based video editor	17	COMMENT= Simple GUI based video editor
Lines 31-37 Link Here
31	USE_GNOME= gnomeprefix gnomehack gtk20	31	USE_GNOME= gnomeprefix gnomehack gtk20
32	WANT_SDL= yes	32	WANT_SDL= yes
33	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \	33	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
34	-I${LOCALBASE}/include/ffmpeg \
35	-I${LOCALBASE}/include/a52dec" \	34	-I${LOCALBASE}/include/a52dec" \
36	LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \	35	LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
37	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \	36	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
Lines 80-91 Link Here
80	.if defined(WITH_XVID)	79	.if defined(WITH_XVID)
81	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid	80	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
82	CONFIGURE_ARGS+= --with-xvid-as-decoder	81	CONFIGURE_ARGS+= --with-xvid-as-decoder
83	.endif
84
85	.if ${ARCH} != "i386"
86	CONFIGURE_ARGS+= --disable-mmx
87	.else
88	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
89	.endif	82	.endif
90		83
91	.if defined(WITH_A52)	84	.if defined(WITH_A52)

Lines 1-29 Link Here

(-)avidemux2/files/patch-aa (-29 lines)
1	Index: avidemux/ADM_audio/audio_mpegidentify.cpp
2	===================================================================
3	RCS file: /cvsroot/avidemux/avidemux/avidemux/ADM_audio/audio_mpegidentify.cpp,v
4	retrieving revision 1.4
5	diff -u -r1.4 audio_mpegidentify.cpp
6	--- avidemux/ADM_audio/audio_mpegidentify.cpp 19 Feb 2005 16:07:20 -0000 1.4
7	+++ avidemux/ADM_audio/audio_mpegidentify.cpp 20 Feb 2005 15:35:11 -0000
8	@@ -33,7 +33,7 @@
9	#include "fourcc.h"
10	#include "aviaudio.hxx"
11
12	-#include "ADM_audio/ADM_mp3info.h"
13	+#include "ADM_audio/ADM_mp3info.h"
14
15
16	uint8_t mpegAudioIdentify(uint8_t ptr, uint32_t maxLookUp, WAVHeader header, uint8_t *tokens)
17	@@ -58,9 +58,12 @@
18	if(info.layer==3) header->encoding=WAV_MP3;
19	else header->encoding=WAV_MP2;
20
21	+ if(tokens)
22	+ {
23	tokens[0]=ptr[offset+1];
24	tokens[1]=ptr[offset+2]&0xfd;
25	tokens[2]=ptr[offset+3];
26	+ }
27	#define DUMPX(x) printf(#x": %d\n",info.x);
28	DUMPX( level);
29	DUMPX( layer);

Lines 1-62 Link Here

(-)avidemux2/files/patch-ac (-62 lines)
1	--- avidemux/ADM_mplex/ADM_mplexin.cpp.jsc Thu Mar 10 21:12:52 2005
2	+++ avidemux/ADM_mplex/ADM_mplexin.cpp Thu Mar 10 21:13:19 2005
3	@@ -17,6 +17,7 @@
4	#include <string.h>
5	#include <sys/stat.h>
6
7	+#include "interact.hpp"
8
9	#undef malloc
10	#undef realloc
11	@@ -36,7 +37,6 @@
12	#include "mjpeg_logging.h"
13	#include "mpegconsts.h"
14
15	-#include "interact.hpp"
16	#include "bits.hpp"
17	#include "outputstrm.hpp"
18	#include "multiplexor.hpp"
19	--- avidemux/ADM_mplex/ADM_mplexmuxer.cpp.jsc Thu Mar 10 07:59:46 2005
20	+++ avidemux/ADM_mplex/ADM_mplexmuxer.cpp Thu Mar 10 08:00:08 2005
21	@@ -37,6 +37,8 @@
22	#include <sys/stat.h>
23	#include <pthread.h>
24
25	+#include "interact.hpp"
26	+
27	#undef malloc
28	#undef realloc
29	#undef free
30	@@ -65,7 +67,6 @@
31	#include "mjpeg_logging.h"
32	#include "mpegconsts.h"
33
34	-#include "interact.hpp"
35	#include "bits.hpp"
36	#include "outputstrm.hpp"
37	#include "multiplexor.hpp"
38	--- avidemux/ADM_mplex/ADM_mplexout.cpp.orig Tue Jan 25 14:26:47 2005
39	+++ avidemux/ADM_mplex/ADM_mplexout.cpp Fri Mar 11 19:32:32 2005
40	@@ -6,6 +6,7 @@
41	#include <string.h>
42	#include <sys/stat.h>
43
44	+#include "interact.hpp"
45
46	#undef malloc
47	#undef realloc
48	@@ -26,7 +27,6 @@
49	#include "mjpeg_logging.h"
50	#include "mpegconsts.h"
51
52	-#include "interact.hpp"
53	#include "bits.hpp"
54	#include "outputstrm.hpp"
55	#include "multiplexor.hpp"
56	@@ -94,4 +94,4 @@
57	return _transfert->read(buf,number);
58	}
59	//EOF
60	-
61	\ No newline at end of file
62	+

Lines 1-33 Link Here

(-)avidemux2/files/patch-ad (-33 lines)
1	--- configure.orig Fri Mar 11 20:10:04 2005
2	+++ configure Fri Mar 11 20:10:21 2005
3	@@ -21779,7 +21779,7 @@
4	else
5	touch adm_lavcodec/config.cpu
6	fi;;
7	- x86_64)
8	+ x86_64\|amd64)
9	have_little_endian=yes;
10	echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu
11
12	--- configure.in.orig Fri Mar 11 20:09:53 2005
13	+++ configure.in Fri Mar 11 20:10:38 2005
14	@@ -717,7 +717,7 @@
15	else
16	touch adm_lavcodec/config.cpu
17	fi;;
18	- x86_64)
19	+ x86_64\|amd64)
20	have_little_endian=yes;
21	echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu
22	AC_DEFINE(HAVE_X86_64,1,"X86_64 amd64 assembly")
23	--- configure.in.in.orig Fri Mar 11 20:09:59 2005
24	+++ configure.in.in Fri Mar 11 20:10:54 2005
25	@@ -717,7 +717,7 @@
26	else
27	touch adm_lavcodec/config.cpu
28	fi;;
29	- x86_64)
30	+ x86_64\|amd64)
31	have_little_endian=yes;
32	echo "TARGET_X86_64=yes" >> adm_lavcodec/config.cpu
33	AC_DEFINE(HAVE_X86_64,1,"X86_64 amd64 assembly")