Attachment #95196 for bug #133539

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

Lines 1-3 Link Here

(-)multimedia/avidemux2/distinfo (-3 / +3 lines)
1	MD5 (avidemux_2.4.2.tar.gz) = 6c86fcfa491491b83e1291112fe3a3be	1	MD5 (avidemux_2.4.4.tar.gz) = 503dfd25842ef81be7c769811e7bc54e
2	SHA256 (avidemux_2.4.2.tar.gz) = 747dfb2efc9c1b3d4e60a6f426e5c22476ec7b141a8091cc0f1c5a75b451cfe4	2	SHA256 (avidemux_2.4.4.tar.gz) = 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956
3	SIZE (avidemux_2.4.2.tar.gz) = 6683907	3	SIZE (avidemux_2.4.4.tar.gz) = 6894690




#

PORTNAME=	avidemux2
PORTVERSION=	2.4.4
PORTREVISION=	3
CATEGORIES=	multimedia
MASTER_SITES=	${MASTER_SITE_BERLIOS} \
		${MASTER_SITE_SOURCEFORGE}

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

LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
		mad.2:${PORTSDIR}/audio/libmad \
		a52.0:${PORTSDIR}/audio/liba52 \
		png.5:${PORTSDIR}/graphics/png \
		execinfo.1:${PORTSDIR}/devel/libexecinfo

CONFLICTS=	avidemux2-2.[0-35-9].*
# Necessary for CMake to find libs

.if defined(WITHOUT_JACK)
CMAKE_ARGS+=	-DNO_Jack=1
.else
LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
.endif

.if defined(WITHOUT_PULSE)
CMAKE_ARGS+=	-DNO_PULSE_SIMPLE=1
.else
LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
.endif

.if defined(WITHOUT_FREETYPE)
CMAKE_ARGS+=	-DNO_FREETYPE=1
.else
LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
.endif

.if defined(WITHOUT_FONTCONFIG)
CMAKE_ARGS+=	-DNO_FontConfig=1
.else
LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
.endif

.if defined(WITHOUT_SAMPLERATE)
CMAKE_ARGS+=	-DNO_libsamplerate=1
.else
LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
.endif

.if defined(WITHOUT_XVIDEO)
CMAKE_ARGS+=	-DNO_XV=1
.else
LIB_DEPENDS+=	Xv.1:${PORTSDIR}/x11/libXv
.endif

.if defined(WITHOUT_FAAC)
CMAKE_ARGS+=	-DNO_FAAC=1
.else
LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
.endif

.if defined(WITHOUT_FAAD)
CMAKE_ARGS+=	-DNO_FAAD=1 -DNO_NeAAC=1
.else
LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
.endif

.if defined(WITHOUT_X264)
CMAKE_ARGS+=	-DNO_x264=1
.else
LIB_DEPENDS+=	x264.65:${PORTSDIR}/multimedia/x264
.endif

.if defined(WITHOUT_XVID)
CMAKE_ARGS+=	-DNO_Xvid=1
.else
LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
.endif

.if defined(WITHOUT_SDL)

.if defined(WITHOUT_VORBIS)
CMAKE_ARGS+=	-DNO_Vorbis=1
.else
LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
.endif

.if defined(WITHOUT_DCA)
CMAKE_ARGS+=	-DNO_libdca=1
.else
LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
.endif

.if defined(WITHOUT_AMRNB)
CMAKE_ARGS+=	-DNO_AMRNB=1
.else
LIB_DEPENDS+=	amrnb.3:${PORTSDIR}/audio/libamrnb
.endif

.if defined(WITHOUT_NLS)




--- ConfigureChecks.cmake.orig	2009-02-06 20:07:37.000000000 +0100
+++ ConfigureChecks.cmake	2009-04-09 15:16:26.000000000 +0200
@@ -223,6 +223,43 @@
 ENDIF (NO_NLS)
 
 ########################################

+########################################
 # Locale
 ########################################
 IF (NOT ADM_LOCALE) 
@@ -367,7 +404,9 @@
 # JACK
 ########################################
 IF (NOT ADM_OS_WINDOWS)

 ENDIF (NOT ADM_OS_WINDOWS)
 
 ########################################
@@ -480,7 +519,11 @@
 IF (USE_LATE_BINDING)
 	CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)
 ELSE (USE_LATE_BINDING)
-	ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A)
+       IF (ADM_BSD_FAMILY)
+               ADM_CHECK_HL(libdca dts.h dts dca_init USE_LIBDCA_A)
+       ELSE (ADM_BSD_FAMILY)
+               ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A)
+       ENDIF (ADM_BSD_FAMILY)
         if(NOT USE_LIBDCA_A)
                 MESSAGE(STATUS "Trying libdca instead of libdts")
 	        ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA_B)
@@ -505,7 +548,8 @@
 IF (ADM_OS_WINDOWS)
 	SET(CMAKE_REQUIRED_LIBRARIES "-lm -lpthreadGC2")
 ELSE (ADM_OS_WINDOWS)

Lines 1-10 Link Here

(-)multimedia/avidemux2/files/patch-avidemux__ADM_encoder__adm_encx264.cpp (-10 lines)
1	--- ./avidemux/ADM_encoder/adm_encx264.cpp.orig 2008-06-30 20:30:09.000000000 +0200
2	+++ ./avidemux/ADM_encoder/adm_encx264.cpp 2008-07-10 17:27:51.000000000 +0200
3	@@ -271,6 +271,7 @@
4	{
5	uint32_t bitrate;
6
7	+ _delayed = 0;
8	ADM_assert (_state == enc_Pass1);
9	printf ("\n[x264] Starting pass 2 (%d x %d)\n", _w, _h);
10

Lines 1-6 Link Here

(-)multimedia/avidemux2/files/patch-avidemux__ADM_userInterfaces__ADM_QT4__ui_support.cpp (-5 / +5 lines)
1	--- ./avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.orig 2008-03-28 20:02:18.000000000 +0100	1	--- avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.orig 2008-09-24 03:09:49.000000000 +0200
2	+++ ./avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2008-07-10 17:16:26.000000000 +0200	2	+++ avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-04-09 15:32:35.000000000 +0200
3	@@ -38,10 +38,8 @@	3	@@ -60,10 +60,8 @@
4	{	4	{
5	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());	5	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
6		6
Lines 10-15 Link Here
10	- loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());	10	- loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());
11	+ loadTranslation(&qtTranslator, "%%DATADIR%%/qt_" + QLocale::system().name());	11	+ loadTranslation(&qtTranslator, "%%DATADIR%%/qt_" + QLocale::system().name());
12	+ loadTranslation(&avidemuxTranslator, "%%DATADIR%%/avidemux_" + QLocale::system().name());	12	+ loadTranslation(&avidemuxTranslator, "%%DATADIR%%/avidemux_" + QLocale::system().name());
		13	translatorLoaded = true;
13		14
14	printf("[Locale] Test: &Edit -> %s\n\n", HIDE_STRING_FROM_QT("MainWindow", "&Edit").toUtf8().data());	15	// Re-translate existing map (to take care of global strings already allocated)
15	}

Return to bug 133539

Lines 6-13 Link Here

(-)multimedia/avidemux2/Makefile (-20 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= avidemux2	8	PORTNAME= avidemux2
9	PORTVERSION= 2.4.2	9	PORTVERSION= 2.4.4
10	PORTREVISION= 3
11	CATEGORIES= multimedia	10	CATEGORIES= multimedia
12	MASTER_SITES= ${MASTER_SITE_BERLIOS} \	11	MASTER_SITES= ${MASTER_SITE_BERLIOS} \
13	${MASTER_SITE_SOURCEFORGE}	12	${MASTER_SITE_SOURCEFORGE}
Lines 17-27 Link Here
17	MAINTAINER= amistry@am-productions.biz	16	MAINTAINER= amistry@am-productions.biz
18	COMMENT= Simple GUI based video editor	17	COMMENT= Simple GUI based video editor
19		18
20	LIB_DEPENDS= mp3lame:${PORTSDIR}/audio/lame \	19	LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
21	mad:${PORTSDIR}/audio/libmad \	20	mad.2:${PORTSDIR}/audio/libmad \
22	a52:${PORTSDIR}/audio/liba52 \	21	a52.0:${PORTSDIR}/audio/liba52 \
23	png:${PORTSDIR}/graphics/png \	22	png.5:${PORTSDIR}/graphics/png \
24	execinfo:${PORTSDIR}/devel/libexecinfo	23	execinfo.1:${PORTSDIR}/devel/libexecinfo
25		24
26	CONFLICTS= avidemux2-2.[0-35-9].*	25	CONFLICTS= avidemux2-2.[0-35-9].*
27	# Necessary for CMake to find libs	26	# Necessary for CMake to find libs
Lines 108-168 Link Here
108	.if defined(WITHOUT_JACK)	107	.if defined(WITHOUT_JACK)
109	CMAKE_ARGS+= -DNO_Jack=1	108	CMAKE_ARGS+= -DNO_Jack=1
110	.else	109	.else
111	LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack	110	LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
112	.endif	111	.endif
113		112
114	.if defined(WITHOUT_PULSE)	113	.if defined(WITHOUT_PULSE)
115	CMAKE_ARGS+= -DNO_PULSE_SIMPLE=1	114	CMAKE_ARGS+= -DNO_PULSE_SIMPLE=1
116	.else	115	.else
117	LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio	116	LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
118	.endif	117	.endif
119		118
120	.if defined(WITHOUT_FREETYPE)	119	.if defined(WITHOUT_FREETYPE)
121	CMAKE_ARGS+= -DNO_FREETYPE=1	120	CMAKE_ARGS+= -DNO_FREETYPE=1
122	.else	121	.else
123	LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2	122	LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
124	.endif	123	.endif
125		124
126	.if defined(WITHOUT_FONTCONFIG)	125	.if defined(WITHOUT_FONTCONFIG)
127	CMAKE_ARGS+= -DNO_FontConfig=1	126	CMAKE_ARGS+= -DNO_FontConfig=1
128	.else	127	.else
129	LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig	128	LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
130	.endif	129	.endif
131		130
132	.if defined(WITHOUT_SAMPLERATE)	131	.if defined(WITHOUT_SAMPLERATE)
133	CMAKE_ARGS+= -DNO_libsamplerate=1	132	CMAKE_ARGS+= -DNO_libsamplerate=1
134	.else	133	.else
135	LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate	134	LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate
136	.endif	135	.endif
137		136
138	.if defined(WITHOUT_XVIDEO)	137	.if defined(WITHOUT_XVIDEO)
139	CMAKE_ARGS+= -DNO_XV=1	138	CMAKE_ARGS+= -DNO_XV=1
140	.else	139	.else
141	LIB_DEPENDS+= Xv:${PORTSDIR}/x11/libXv	140	LIB_DEPENDS+= Xv.1:${PORTSDIR}/x11/libXv
142	.endif	141	.endif
143		142
144	.if defined(WITHOUT_FAAC)	143	.if defined(WITHOUT_FAAC)
145	CMAKE_ARGS+= -DNO_FAAC=1	144	CMAKE_ARGS+= -DNO_FAAC=1
146	.else	145	.else
147	LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac	146	LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
148	.endif	147	.endif
149		148
150	.if defined(WITHOUT_FAAD)	149	.if defined(WITHOUT_FAAD)
151	CMAKE_ARGS+= -DNO_FAAD=1 -DNO_NeAAC=1	150	CMAKE_ARGS+= -DNO_FAAD=1 -DNO_NeAAC=1
152	.else	151	.else
153	LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad	152	LIB_DEPENDS+= faad.2:${PORTSDIR}/audio/faad
154	.endif	153	.endif
155		154
156	.if defined(WITHOUT_X264)	155	.if defined(WITHOUT_X264)
157	CMAKE_ARGS+= -DNO_x264=1	156	CMAKE_ARGS+= -DNO_x264=1
158	.else	157	.else
159	LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264	158	LIB_DEPENDS+= x264.65:${PORTSDIR}/multimedia/x264
160	.endif	159	.endif
161		160
162	.if defined(WITHOUT_XVID)	161	.if defined(WITHOUT_XVID)
163	CMAKE_ARGS+= -DNO_Xvid=1	162	CMAKE_ARGS+= -DNO_Xvid=1
164	.else	163	.else
165	LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid	164	LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
166	.endif	165	.endif
167		166
168	.if defined(WITHOUT_SDL)	167	.if defined(WITHOUT_SDL)
Lines 174-192 Link Here
174	.if defined(WITHOUT_VORBIS)	173	.if defined(WITHOUT_VORBIS)
175	CMAKE_ARGS+= -DNO_Vorbis=1	174	CMAKE_ARGS+= -DNO_Vorbis=1
176	.else	175	.else
177	LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis	176	LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
178	.endif	177	.endif
179		178
180	.if defined(WITHOUT_DCA)	179	.if defined(WITHOUT_DCA)
181	CMAKE_ARGS+= -DNO_libdca=1	180	CMAKE_ARGS+= -DNO_libdca=1
182	.else	181	.else
183	LIB_DEPENDS+= dca:${PORTSDIR}/multimedia/libdca	182	LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca
184	.endif	183	.endif
185		184
186	.if defined(WITHOUT_AMRNB)	185	.if defined(WITHOUT_AMRNB)
187	CMAKE_ARGS+= -DNO_AMRNB=1	186	CMAKE_ARGS+= -DNO_AMRNB=1
188	.else	187	.else
189	LIB_DEPENDS+= amrnb:${PORTSDIR}/audio/libamrnb	188	LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb
190	.endif	189	.endif
191		190
192	.if defined(WITHOUT_NLS)	191	.if defined(WITHOUT_NLS)

Lines 1-6 Link Here

(-)multimedia/avidemux2/files/patch-ConfigureChecks.cmake (-13 / +13 lines)
1	--- ./ConfigureChecks.cmake.orig 2008-07-05 20:24:01.000000000 +0200	1	--- ConfigureChecks.cmake.orig 2009-02-06 20:07:37.000000000 +0100
2	+++ ./ConfigureChecks.cmake 2008-07-10 17:16:26.000000000 +0200	2	+++ ConfigureChecks.cmake 2009-04-09 15:16:26.000000000 +0200
3	@@ -220,6 +220,43 @@	3	@@ -223,6 +223,43 @@
4	ENDIF (NO_NLS)	4	ENDIF (NO_NLS)
5		5
6	########################################	6	########################################
Lines 43-50 Link Here
43	+########################################	43	+########################################
44	# Locale	44	# Locale
45	########################################	45	########################################
46	SET(ADM_LOCALE "${CMAKE_INSTALL_PREFIX}/share/locale")	46	IF (NOT ADM_LOCALE)
47	@@ -362,7 +399,9 @@	47	@@ -367,7 +404,9 @@
48	# JACK	48	# JACK
49	########################################	49	########################################
50	IF (NOT ADM_OS_WINDOWS)	50	IF (NOT ADM_OS_WINDOWS)
Lines 54-73 Link Here
54	ENDIF (NOT ADM_OS_WINDOWS)	54	ENDIF (NOT ADM_OS_WINDOWS)
55		55
56	########################################	56	########################################
57	@@ -475,7 +514,11 @@	57	@@ -480,7 +519,11 @@
58	IF (USE_LATE_BINDING)	58	IF (USE_LATE_BINDING)
59	CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)	59	CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)
60	ELSE (USE_LATE_BINDING)	60	ELSE (USE_LATE_BINDING)
61	- ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA)	61	- ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A)
62	+ IF (ADM_BSD_FAMILY)	62	+ IF (ADM_BSD_FAMILY)
63	+ ADM_CHECK_HL(libdca dts.h dts dca_init USE_LIBDCA)	63	+ ADM_CHECK_HL(libdca dts.h dts dca_init USE_LIBDCA_A)
64	+ ELSE (ADM_BSD_FAMILY)	64	+ ELSE (ADM_BSD_FAMILY)
65	+ ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA)	65	+ ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A)
66	+ ENDIF (ADM_BSD_FAMILY)	66	+ ENDIF (ADM_BSD_FAMILY)
67	ENDIF (USE_LATE_BINDING)	67	if(NOT USE_LIBDCA_A)
68		68	MESSAGE(STATUS "Trying libdca instead of libdts")
69	SET(CMAKE_REQUIRED_LIBRARIES)	69	ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA_B)
70	@@ -489,7 +532,8 @@	70	@@ -505,7 +548,8 @@
71	IF (ADM_OS_WINDOWS)	71	IF (ADM_OS_WINDOWS)
72	SET(CMAKE_REQUIRED_LIBRARIES "-lm -lpthreadGC2")	72	SET(CMAKE_REQUIRED_LIBRARIES "-lm -lpthreadGC2")
73	ELSE (ADM_OS_WINDOWS)	73	ELSE (ADM_OS_WINDOWS)