[Mplayer-cvslog] CVS: main Makefile,1.221,1.222 configure,1.578,1.579

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv13559

Modified Files:
	Makefile configure 
Log Message:
liblzo realtime video codec support (decoding only)
patch by Tilmann Bitterberg <transcode at tibit.org>


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- Makefile	6 Oct 2002 18:27:02 -0000	1.221
+++ Makefile	13 Oct 2002 21:40:06 -0000	1.222
@@ -45,7 +45,7 @@
 A_LIBS = $(ALSA_LIB) $(ARTS_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
 
 CODEC_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(AV_LIB) $(FAME_LIB)
-COMMON_LIBS = $(CODEC_LIBS) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libpostproc.a linux/libosdep.a $(LIB_LOADER) $(FREETYPE_LIB) $(A_LIBS) $(CSS_LIB) $(XVID_LIB) $(DECORE_LIB) $(TERMCAP_LIB)  $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(GIF_LIB) $(CDPARANOIA_LIB) $(ARCH_LIB) -lm 
+COMMON_LIBS = $(CODEC_LIBS) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libpostproc.a linux/libosdep.a $(LIB_LOADER) $(FREETYPE_LIB) $(A_LIBS) $(CSS_LIB) $(XVID_LIB) $(DECORE_LIB) $(TERMCAP_LIB)  $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(LZO_LIB) $(GIF_LIB) $(CDPARANOIA_LIB) $(ARCH_LIB) -lm 
 ifeq ($(VIDIX),yes)
 MISC_LIBS += -Llibdha -ldha vidix/libvidix.a
 endif

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- configure	6 Oct 2002 17:50:37 -0000	1.578
+++ configure	13 Oct 2002 21:40:06 -0000	1.579
@@ -155,6 +155,7 @@
   --enable-gif		 enable gif89a output support [autodetect]
   --enable-png		 enable png input/output support [autodetect]
   --enable-jpeg		 enable jpeg input/output support [autodetect]
+  --enable-lzo		 enable lzo input support [autodetect]
   --disable-win32        disable Win32 DLL support [autodetect]
   --disable-dshow        disable Win32/DirectShow support [autodetect]
   --disable-xanim        disable XAnim DLL support [autodetect]
@@ -949,6 +950,7 @@
 _rtc=auto
 _ossaudio=auto
 _arts=auto
+_lzo=auto
 _mad=auto
 _vorbis=auto
 _faad=auto
@@ -1073,6 +1075,8 @@
   --disable-arts)	_arts=no	;;
   --enable-mad)		_mad=yes	;;
   --disable-mad)	_mad=no		;;
+  --enable-lzo)		_lzo=yes	;;
+  --disable-lzo)	_lzo=no		;;
   --enable-vorbis)	_vorbis=yes	;;
   --disable-vorbis)	_vorbis=no	;;
   --enable-faad)	_faad=yes	;;
@@ -3395,6 +3399,28 @@
 fi
 
 
+echocheck "lzo support"
+if test "$_lzo" = auto ; then
+  _lzo=no
+  cat > $TMPC << EOF
+#include <lzo1x.h>
+int main(void) { lzo_init();return 0; }
+EOF
+  cc_check -llzo && _lzo=yes
+fi
+if test "$_lzo" = yes ; then
+  _def_lzo='#define USE_LZO 1'
+  _ld_lzo='-llzo'
+  _codecmodules="lzo $_codecmodules"
+  _mkf_lzo="yes"
+else
+  _def_lzo='#undef USE_LZO'
+  _nocodecmodules="lzo $_nocodecmodules"
+  _mkf_lzo="no"
+fi
+echores "$_lzo"
+
+
 echocheck "mad support"
 if test "$_mad" = auto ; then
   _mad=no
@@ -4455,6 +4481,8 @@
 CDPARANOIA_LIB = $_ld_cdparanoia
 FREETYPE_INC = $_inc_freetype
 FREETYPE_LIB = $_ld_freetype
+LZO= $_mkf_lzo
+LZO_LIB= $_ld_lzo
 
 # --- Some stuff for autoconfigure ----
 $_target_arch
@@ -4796,6 +4824,9 @@
 
 /* enable FreeType support */
 $_def_freetype
+
+/* liblzo support */
+$_def_lzo
 
 /* libmad support */
 $_def_mad