[Mplayer-cvslog] CVS: main Makefile,1.263,1.264 configure,1.701,1.702

[Arpi of Ize]

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

Modified Files:
	Makefile configure 
Log Message:
Theora demuxer/codec support, patch by David Kuehling <dvdkhlng at gmx.de>


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- Makefile	30 Apr 2003 11:39:10 -0000	1.263
+++ Makefile	11 May 2003 18:29:04 -0000	1.264
@@ -35,7 +35,7 @@
 
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) 
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
-CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB)
+CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) 
 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(FRIBIDI_INC) # -Wall

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -r1.701 -r1.702
--- configure	3 May 2003 14:54:08 -0000	1.701
+++ configure	11 May 2003 18:29:04 -0000	1.702
@@ -189,6 +189,7 @@
   --enable-libfame       enable libfame realtime encoder [autodetect]
   --enable-vorbis        build with OggVorbis support [autodetect]
   --enable-tremor        build with integer-only OggVorbis support [disabled]
+  --enable-theora        build with OggTheora support [autodetect]
   --enable-matroska      build with Matroska support [autodetect]
   --enable-faad          build with FAAD2 (MP4/AAC) support [autodetect]
   --disable-libdv        disable libdv 0.9.5 en/decoding support [autodetect]
@@ -1026,6 +1027,7 @@
 _liblzo=auto
 _mad=auto
 _vorbis=auto
+_theora=auto
 _matroska=auto
 _tremor=no
 _faad=auto
@@ -1180,6 +1182,8 @@
   --disable-vorbis)	_vorbis=no	;;
   --enable-tremor)	_tremor=yes	;;
   --disable-tremor)	_tremor=no	;;
+  --enable-theora)	_theora=yes	;;
+  --disable-theora)	_theora=no	;;
   --enable-matroska)    _matroska=yes   ;;
   --disable-matroska)   _matroska=no    ;;
   --enable-faad)	_faad=yes	;;
@@ -4028,6 +4032,25 @@
 fi
 echores "$_vorbis"
 
+echocheck "OggTheora support"
+if test "$_theora" = auto ; then
+  _theora=no
+  cat > $TMPC << EOF
+#include <theora/theora.h>
+int main(void) { theora_version_number (); return 0; }
+EOF
+  cc_check -ltheora -logg -lm && _theora=yes
+fi
+if test "$_theora" = yes ; then
+  _def_theora='#define HAVE_OGGTHEORA 1'
+  _codecmodules="libtheora $_codecmodules"
+  _ld_theora="-ltheora"
+else
+  _def_theora='#undef HAVE_OGGTHEORA'
+  _nocodecmodules="libtheora $_nocodecmodules"
+fi
+echores "$_theora"
+
 
 echocheck "Matroska support"
 if test "$_matroska" != no ; then
@@ -5272,6 +5295,7 @@
 LIBLZO_LIB= $_ld_liblzo
 MAD_LIB = $_ld_mad
 VORBIS_LIB = $_ld_vorbis $_ld_libdv
+THEORA_LIB = $_ld_theora
 FAAD_LIB = $_ld_faad
 SMBSUPPORT_LIB = $_ld_smb
 XMMS_PLUGINS = $_xmms
@@ -5686,6 +5710,9 @@
 
 /* enable Tremor as vorbis decoder */
 $_def_tremor
+
+/* enable OggTheora support */
+$_def_theora
 
 /* enable Matroska support */
 $_def_matroska