Attachment #109030 for bug #158340

Lines 30-36 Link Here

(-)avidemux_2.3.0-orig/avidemux/ADM_audiofilter/audioencoder_twolame.cpp (-1 / +1 lines)
30		30
31	extern "C"	31	extern "C"
32	{	32	{
33	#include "libtoolame/twolame.h"	33	#include <twolame.h>
34	}	34	}
35	#include "ADM_toolkit/ADM_debugID.h"	35	#include "ADM_toolkit/ADM_debugID.h"
36	#define MODULE_NAME MODULE_AUDIO_FILTER	36	#define MODULE_NAME MODULE_AUDIO_FILTER




	ADM_colorspace ADM_editor ADM_encoder ADM_filter  ADM_inpics ADM_nuv \
	ADM_toolkit oplug_mpeg xpm ADM_video oplug_avi ADM_audiodevice ADM_vp32 \
	libMpeg2Dec oplug_mpegFF ADM_h263 ADM_gui2 ADM_dialog \
	ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux ADM_requant \
	ADM_script oplug_ogm ADM_xvidratectl ADM_mplex ADM_ocr ADM_libswscale \
	ADM_mpegdemuxer ADM_tray ADM_lavutil ADM_lavformat ADM_lavcodec oplug_mp4 \
	ADM_avsproxy  ADM_liba52 ADM_libMad ADM_matroska ADM_asf \
	$(TWOLAME_DIR)

if HAVE_FREETYPE
SUBDIRS += libass

./ADM_video/libADM_video.a   ./ADM_encoder/libADM_encoder.a  \
./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a  \
./ADM_audiofilter/libADM_audiofilter.a \
./libtoolame/liblibtoolame.a \
./ADM_gui2/libADM_gui2.a  \
./ADM_libswscale/libswscale.a \
./mpeg2enc/libmpeg2enc.a \

./ADM_library/libADM_library.a \
./ADM_toolkit/libADM_toolkit.a  \
./libass/libass.a \
$(libmpeg2enc_Altivec) \
$(TWOLAME_LIBS)


INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \
	$(SMONKEY_CFLAGS) \
	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \
	-IADM_lavutil \
	$(TWOLAME_CFLAGS)

# the library search path.
avidemux2_LDFLAGS = $(all_libraries)  $(SDL_LIBS) $(GTK_LIBS) \
	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)

noinst_HEADERS = ADM_pp.h admmangle.h
AM_CFLAGS = -g




   AC_SUBST(CCAS)
   AC_SUBST(CCASFLAGS)


dnl ______________________
dnl AC_DEFINE(USE_DIV5,0,[Divx 5])
dnl AC_DEFINE(USE_AC3,0,[A52dec])

AC_DEFINE(USE_LIBXML2,1,[LibXML2 is available])
fi

dnl ____________TWOLAME____________
AC_ARG_WITH([extern-twolame],
	AC_HELP_STRING([--without-extern-twolame], [Use builtin TwoLAME library (default: test)]),
	[with_extern_twolame=${withval}], [with_extern_twolame=test])

have_twolame=builtin
TWOLAME_VERSION=0.3.6
TWOLAME_LIBS=./libtoolame/liblibtoolame.a
TWOLAME_CFLAGS=
TWOLAME_DIR=libtoolame

if test "x$with_extern_twolame" != "xno"; then
		PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.6, have_twolame=external, 
			AC_MSG_ERROR([*** need twolame v0.3.6 or greater ! ***]))
		
		TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion`
		TWOLAME_CFLAGS=`$PKG_CONFIG twolame --cflags`
		TWOLAME_LIBS=`$PKG_CONFIG twolame --libs`
		TWOLAME_DIR=
fi

AC_MSG_CHECKING([which twolame support])
AC_MSG_RESULT($have_twolame)

AC_SUBST(TWOLAME_CFLAGS)
AC_SUBST(TWOLAME_LIBS)
AC_SUBST(TWOLAME_VERSION)
AC_SUBST(TWOLAME_DIR)


dnl __________________divx______________
dnl __________________x264 ______________

AC_OUTPUT
dnl **   mean   ***
echo " GTK+ version        : $GTK_VERSION"
echo " TwoLAME support     : $have_twolame"
echo " TwoLAME version     : $TWOLAME_VERSION"
echo " Divx5.0.5 ?         : $have_divx"
echo " *** DISABLED ***"
echo " Xvid 0.9 Codec      : $have_xx_xvid"

Return to bug 158340

Lines 17-26 Link Here

(-)avidemux_2.3.0-orig/avidemux/Makefile.am (-6 / +8 lines)
17	ADM_colorspace ADM_editor ADM_encoder ADM_filter ADM_inpics ADM_nuv \	17	ADM_colorspace ADM_editor ADM_encoder ADM_filter ADM_inpics ADM_nuv \
18	ADM_toolkit oplug_mpeg xpm ADM_video oplug_avi ADM_audiodevice ADM_vp32 \	18	ADM_toolkit oplug_mpeg xpm ADM_video oplug_avi ADM_audiodevice ADM_vp32 \
19	libMpeg2Dec oplug_mpegFF ADM_h263 ADM_gui2 ADM_dialog \	19	libMpeg2Dec oplug_mpegFF ADM_h263 ADM_gui2 ADM_dialog \
20	ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux libtoolame ADM_requant \	20	ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux ADM_requant \
21	ADM_script oplug_ogm ADM_xvidratectl ADM_mplex ADM_ocr ADM_libswscale \	21	ADM_script oplug_ogm ADM_xvidratectl ADM_mplex ADM_ocr ADM_libswscale \
22	ADM_mpegdemuxer ADM_tray ADM_lavutil ADM_lavformat ADM_lavcodec oplug_mp4 \	22	ADM_mpegdemuxer ADM_tray ADM_lavutil ADM_lavformat ADM_lavcodec oplug_mp4 \
23	ADM_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf	23	ADM_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf \
		24	$(TWOLAME_DIR)
24		25
25	if HAVE_FREETYPE	26	if HAVE_FREETYPE
26	SUBDIRS += libass	27	SUBDIRS += libass
Lines 63-69 Link Here
63	./ADM_video/libADM_video.a ./ADM_encoder/libADM_encoder.a \	64	./ADM_video/libADM_video.a ./ADM_encoder/libADM_encoder.a \
64	./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a \	65	./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a \
65	./ADM_audiofilter/libADM_audiofilter.a \	66	./ADM_audiofilter/libADM_audiofilter.a \
66	./libtoolame/liblibtoolame.a \
67	./ADM_gui2/libADM_gui2.a \	67	./ADM_gui2/libADM_gui2.a \
68	./ADM_libswscale/libswscale.a \	68	./ADM_libswscale/libswscale.a \
69	./mpeg2enc/libmpeg2enc.a \	69	./mpeg2enc/libmpeg2enc.a \
Lines 91-107 Link Here
91	./ADM_library/libADM_library.a \	91	./ADM_library/libADM_library.a \
92	./ADM_toolkit/libADM_toolkit.a \	92	./ADM_toolkit/libADM_toolkit.a \
93	./libass/libass.a \	93	./libass/libass.a \
94	$(libmpeg2enc_Altivec)	94	$(libmpeg2enc_Altivec) \
		95	$(TWOLAME_LIBS)
95		96
96		97
97	INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \	98	INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \
98	$(SMONKEY_CFLAGS) \	99	$(SMONKEY_CFLAGS) \
99	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \	100	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \
100	-IADM_lavutil	101	-IADM_lavutil \
		102	$(TWOLAME_CFLAGS)
101		103
102	# the library search path.	104	# the library search path.
103	avidemux2_LDFLAGS = $(all_libraries) $(SDL_LIBS) $(GTK_LIBS) \	105	avidemux2_LDFLAGS = $(all_libraries) $(SDL_LIBS) $(GTK_LIBS) \
104	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)	106	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)
105		107
106	noinst_HEADERS = ADM_pp.h admmangle.h	108	noinst_HEADERS = ADM_pp.h admmangle.h
107	AM_CFLAGS = -g	109	AM_CFLAGS = -g

Lines 165-170 Link Here

(-)avidemux_2.3.0-orig/configure.in (+32 lines)
165	AC_SUBST(CCAS)	165	AC_SUBST(CCAS)
166	AC_SUBST(CCASFLAGS)	166	AC_SUBST(CCASFLAGS)
167		167
		168
168	dnl ______________________	169	dnl ______________________
169	dnl AC_DEFINE(USE_DIV5,0,[Divx 5])	170	dnl AC_DEFINE(USE_DIV5,0,[Divx 5])
170	dnl AC_DEFINE(USE_AC3,0,[A52dec])	171	dnl AC_DEFINE(USE_AC3,0,[A52dec])
Lines 268-273 Link Here
268	AC_DEFINE(USE_LIBXML2,1,[LibXML2 is available])	269	AC_DEFINE(USE_LIBXML2,1,[LibXML2 is available])
269	fi	270	fi
270		271
		272	dnl ____________TWOLAME____________
		273	AC_ARG_WITH([extern-twolame],
		274	AC_HELP_STRING([--without-extern-twolame], [Use builtin TwoLAME library (default: test)]),
		275	[with_extern_twolame=${withval}], [with_extern_twolame=test])
		276
		277	have_twolame=builtin
		278	TWOLAME_VERSION=0.3.6
		279	TWOLAME_LIBS=./libtoolame/liblibtoolame.a
		280	TWOLAME_CFLAGS=
		281	TWOLAME_DIR=libtoolame
		282
		283	if test "x$with_extern_twolame" != "xno"; then
		284	PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.6, have_twolame=external,
		285	AC_MSG_ERROR([* need twolame v0.3.6 or greater ! *]))
		286
		287	TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion`
		288	TWOLAME_CFLAGS=`$PKG_CONFIG twolame --cflags`
		289	TWOLAME_LIBS=`$PKG_CONFIG twolame --libs`
		290	TWOLAME_DIR=
		291	fi
		292
		293	AC_MSG_CHECKING([which twolame support])
		294	AC_MSG_RESULT($have_twolame)
		295
		296	AC_SUBST(TWOLAME_CFLAGS)
		297	AC_SUBST(TWOLAME_LIBS)
		298	AC_SUBST(TWOLAME_VERSION)
		299	AC_SUBST(TWOLAME_DIR)
		300
271		301
272	dnl __________________divx______________	302	dnl __________________divx______________
273	dnl __________________x264 ______________	303	dnl __________________x264 ______________
Lines 1392-1397 Link Here
1392	AC_OUTPUT	1422	AC_OUTPUT
1393	dnl mean *	1423	dnl mean *
1394	echo " GTK+ version : $GTK_VERSION"	1424	echo " GTK+ version : $GTK_VERSION"
		1425	echo " TwoLAME support : $have_twolame"
		1426	echo " TwoLAME version : $TWOLAME_VERSION"
1395	echo " Divx5.0.5 ? : $have_divx"	1427	echo " Divx5.0.5 ? : $have_divx"
1396	echo " * DISABLED *"	1428	echo " * DISABLED *"
1397	echo " Xvid 0.9 Codec : $have_xx_xvid"	1429	echo " Xvid 0.9 Codec : $have_xx_xvid"