[patch] avidemux-2.3.0-twolame.patch (new)

avidemux-2.3.0-twolame_2.patch (text/plain), 4.03 KB, created by Fab on 2007-02-03 18:44:11 UTC

diff -Nru avidemux_2.3.0-orig/avidemux/ADM_audiofilter/audioencoder_twolame.cpp avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp
--- avidemux_2.3.0-orig/avidemux/ADM_audiofilter/audioencoder_twolame.cpp	2007-02-03 18:52:15.000000000 +0100
+++ avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp	2007-02-03 18:52:29.000000000 +0100
@@ -30,7 +30,7 @@
 
 extern "C"
 {
-#include "libtoolame/twolame.h"
+#include <twolame.h>
 }
 #include "ADM_toolkit/ADM_debugID.h"
 #define MODULE_NAME MODULE_AUDIO_FILTER
diff -Nru avidemux_2.3.0-orig/avidemux/Makefile.am avidemux_2.3.0/avidemux/Makefile.am
--- avidemux_2.3.0-orig/avidemux/Makefile.am	2007-02-03 18:52:15.000000000 +0100
+++ avidemux_2.3.0/avidemux/Makefile.am	2007-02-03 18:52:29.000000000 +0100
@@ -17,10 +17,11 @@
 	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 libtoolame ADM_requant \
+	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_avsproxy  ADM_liba52 ADM_libMad ADM_matroska ADM_asf \
+	$(TWOLAME_DIR)
 
 if HAVE_FREETYPE
 SUBDIRS += libass
@@ -63,7 +64,6 @@
 ./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 \
@@ -91,17 +91,19 @@
 ./ADM_library/libADM_library.a \
 ./ADM_toolkit/libADM_toolkit.a  \
 ./libass/libass.a \
-$(libmpeg2enc_Altivec) 
+$(libmpeg2enc_Altivec) \
+$(TWOLAME_LIBS)
 
 
 INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \
 	$(SMONKEY_CFLAGS) \
 	-DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \
-	-IADM_lavutil
+	-IADM_lavutil \
+	$(TWOLAME_CFLAGS)
 
 # the library search path.
 avidemux2_LDFLAGS = $(all_libraries)  $(SDL_LIBS) $(GTK_LIBS) \
-	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS) 
+	$(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS)
 
 noinst_HEADERS = ADM_pp.h admmangle.h
 AM_CFLAGS = -g
diff -Nru avidemux_2.3.0-orig/configure.in avidemux_2.3.0/configure.in
--- avidemux_2.3.0-orig/configure.in	2007-02-03 18:52:15.000000000 +0100
+++ avidemux_2.3.0/configure.in	2007-02-03 18:54:03.000000000 +0100
@@ -165,6 +165,7 @@
    AC_SUBST(CCAS)
    AC_SUBST(CCASFLAGS)
 
+
 dnl ______________________
 dnl AC_DEFINE(USE_DIV5,0,[Divx 5])
 dnl AC_DEFINE(USE_AC3,0,[A52dec])
@@ -268,6 +269,35 @@
 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 ______________
@@ -1392,6 +1422,8 @@
 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"