Attachment #108999 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




   AC_SUBST(CCAS)
   AC_SUBST(CCASFLAGS)


dnl ____________TWOLAME____________
   TWOLAME_LIBS=`$PKG_CONFIG twolame --libs`
   TWOLAME_CFLAGS=`$PKG_CONFIG twolame --cflags`
   TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion`

 if test "x$TWOLAME_VERSION" = "x" ; then
  echo "************ Cannot identify TWOLAME version ***************"
  AC_MSG_ERROR([*** pkg-config installed incorrectly or twolame absent ! ***])
 fi
 VEROK=`echo "$TWOLAME_VERSION" | perl -ne '@a=split(/\./,$_);
                 if( $a[[0]] > 0 ) {
                    print "OK"
                }
                else {
                    if( $a[[1]] >= 3 and $a[[2]] >= 6 ) {
                       print "OK"
                    }
                    else {
                       print "FAILED"
                    }
                }'`
 if test "x$VEROK" != "xOK" ; then
  AC_MSG_ERROR([*** need twolame v0.3.6 or greater ! ***])
 fi

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


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

AC_CONFIG_FILES([ avidemux/ADM_xvidratectl/Makefile ])
AC_CONFIG_FILES([ avidemux/libMpeg2Dec/Makefile ])
AC_CONFIG_FILES([ avidemux/libass/Makefile ])
AC_CONFIG_FILES([ avidemux/libtoolame/Makefile ])
AC_CONFIG_FILES([ avidemux/mpeg2enc/Makefile ])
AC_CONFIG_FILES([ avidemux/mpeg2enc/altivec/Makefile ])
AC_CONFIG_FILES([ avidemux/oplug_avi/Makefile ])

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




	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

./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 \

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) $(TWOLAME_LIBS) 

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

Return to bug 158340

Lines 165-170 Link Here

(-)avidemux_2.3.0-orig/configure.in (-1 / +32 lines)
165	AC_SUBST(CCAS)	165	AC_SUBST(CCAS)
166	AC_SUBST(CCASFLAGS)	166	AC_SUBST(CCASFLAGS)
167		167
		168
		169	dnl ____________TWOLAME____________
		170	TWOLAME_LIBS=`$PKG_CONFIG twolame --libs`
		171	TWOLAME_CFLAGS=`$PKG_CONFIG twolame --cflags`
		172	TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion`
		173
		174	if test "x$TWOLAME_VERSION" = "x" ; then
		175	echo "********** Cannot identify TWOLAME version *************"
		176	AC_MSG_ERROR([* pkg-config installed incorrectly or twolame absent ! *])
		177	fi
		178	VEROK=`echo "$TWOLAME_VERSION" \| perl -ne '@a=split(/\./,$_);
		179	if( $a[[0]] > 0 ) {
		180	print "OK"
		181	}
		182	else {
		183	if( $a[[1]] >= 3 and $a[[2]] >= 6 ) {
		184	print "OK"
		185	}
		186	else {
		187	print "FAILED"
		188	}
		189	}'`
		190	if test "x$VEROK" != "xOK" ; then
		191	AC_MSG_ERROR([* need twolame v0.3.6 or greater ! *])
		192	fi
		193
		194	AC_SUBST(TWOLAME_CFLAGS)
		195	AC_SUBST(TWOLAME_LIBS)
		196	AC_SUBST(TWOLAME_VERSION)
		197
		198
168	dnl ______________________	199	dnl ______________________
169	dnl AC_DEFINE(USE_DIV5,0,[Divx 5])	200	dnl AC_DEFINE(USE_DIV5,0,[Divx 5])
170	dnl AC_DEFINE(USE_AC3,0,[A52dec])	201	dnl AC_DEFINE(USE_AC3,0,[A52dec])
Lines 1378-1384 Link Here
1378	AC_CONFIG_FILES([ avidemux/ADM_xvidratectl/Makefile ])	1409	AC_CONFIG_FILES([ avidemux/ADM_xvidratectl/Makefile ])
1379	AC_CONFIG_FILES([ avidemux/libMpeg2Dec/Makefile ])	1410	AC_CONFIG_FILES([ avidemux/libMpeg2Dec/Makefile ])
1380	AC_CONFIG_FILES([ avidemux/libass/Makefile ])	1411	AC_CONFIG_FILES([ avidemux/libass/Makefile ])
1381	AC_CONFIG_FILES([ avidemux/libtoolame/Makefile ])
1382	AC_CONFIG_FILES([ avidemux/mpeg2enc/Makefile ])	1412	AC_CONFIG_FILES([ avidemux/mpeg2enc/Makefile ])
1383	AC_CONFIG_FILES([ avidemux/mpeg2enc/altivec/Makefile ])	1413	AC_CONFIG_FILES([ avidemux/mpeg2enc/altivec/Makefile ])
1384	AC_CONFIG_FILES([ avidemux/oplug_avi/Makefile ])	1414	AC_CONFIG_FILES([ avidemux/oplug_avi/Makefile ])
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 version : $TWOLAME_VERSION"
1395	echo " Divx5.0.5 ? : $have_divx"	1426	echo " Divx5.0.5 ? : $have_divx"
1396	echo " * DISABLED *"	1427	echo " * DISABLED *"
1397	echo " Xvid 0.9 Codec : $have_xx_xvid"	1428	echo " Xvid 0.9 Codec : $have_xx_xvid"

Lines 17-23 Link Here

(-)avidemux_2.3.0-orig/avidemux/Makefile.am (-4 / +4 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
Lines 63-69 Link Here
63	./ADM_video/libADM_video.a ./ADM_encoder/libADM_encoder.a \	63	./ADM_video/libADM_video.a ./ADM_encoder/libADM_encoder.a \
64	./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a \	64	./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a \
65	./ADM_audiofilter/libADM_audiofilter.a \	65	./ADM_audiofilter/libADM_audiofilter.a \
66	./libtoolame/liblibtoolame.a \
67	./ADM_gui2/libADM_gui2.a \	66	./ADM_gui2/libADM_gui2.a \
68	./ADM_libswscale/libswscale.a \	67	./ADM_libswscale/libswscale.a \
69	./mpeg2enc/libmpeg2enc.a \	68	./mpeg2enc/libmpeg2enc.a \
Lines 97-107 Link Here
97	INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \	96	INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \
98	$(SMONKEY_CFLAGS) \	97	$(SMONKEY_CFLAGS) \
99	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \	98	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \
100	-IADM_lavutil	99	-IADM_lavutil \
		100	$(TWOLAME_CFLAGS)
101		101
102	# the library search path.	102	# the library search path.
103	avidemux2_LDFLAGS = $(all_libraries) $(SDL_LIBS) $(GTK_LIBS) \	103	avidemux2_LDFLAGS = $(all_libraries) $(SDL_LIBS) $(GTK_LIBS) \
104	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)	104	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS) $(TWOLAME_LIBS)
105		105
106	noinst_HEADERS = ADM_pp.h admmangle.h	106	noinst_HEADERS = ADM_pp.h admmangle.h
107	AM_CFLAGS = -g	107	AM_CFLAGS = -g