[Mplayer-cvslog] CVS: main configure, 1.889, 1.890 Makefile, 1.295, 1.296

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv11179

Modified Files:
	configure Makefile 
Log Message:
Removed the old Matroska demuxer.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -r1.889 -r1.890
--- configure	2 Aug 2004 04:24:36 -0000	1.889
+++ configure	4 Aug 2004 18:37:51 -0000	1.890
@@ -206,7 +206,6 @@
   --enable-vorbis        build with OggVorbis support [autodetect]
   --enable-tremor        build with integer-only OggVorbis support [disabled]
   --enable-theora        build with OggTheora support [autodetect]
-  --enable-external-matroska  build with external Matroska support [autodetect]
   --disable-internal-matroska disable internal Matroska support [enabled]
   --enable-external-faad build with external FAAD2 (AAC) support [autodetect]
   --disable-internal-faad disable internal FAAD2 (AAC) support [autodetect]
@@ -1220,7 +1219,6 @@
 _liba52=yes
 _libmpeg2=yes
 _matroska_internal=yes
-_matroska_external=auto
 _tremor=no
 _faad_internal=auto
 _faad_external=auto
@@ -1400,8 +1398,6 @@
   --disable-libmpeg2)	_libmpeg2=no	;;
   --enable-internal-matroska)  _matroska_internal=yes _matroska_external=no ;;
   --disable-internal-matroska) _matroska_internal=no ;;
-  --enable-external-matroska)  _matroska_internal=no  _matroska_external=yes ;;
-  --disable-external-matroska) _matroska_external=no ;;
   --enable-internal-faad)	_faad_internal=yes	_faad_external=no	;;
   --disable-internal-faad)	_faad_internal=no	;;
   --enable-external-faad)	_faad_external=yes	_faad_internal=no	;;
@@ -4867,54 +4863,13 @@
   _nocodecmodules="libmpeg2 $_nocodecmodules"
 fi
 echores "$_libmpeg2"
-echocheck "Matroska support (external 0.6.0 or later OR internal)"
-_matroska_result="no"
+echocheck "Matroska support"
 if test "$_matroska_internal" = yes ; then
-  _matroska_external=no
-  _inputmodules="matroska(internal) $_inputmodules"
-  _matroska_result="yes, internal"
-fi
-if test "$_matroska_external" != no ; then
-  _matroska_external=no
-  _TMPC=$TMPC
-  TMPC=${TMPC}pp
-  cat > $TMPC << EOF
-#include <ebml/EbmlVersion.h>
-#include <matroska/KaxVersion.h>
-
-#if LIBEBML_VERSION < 000600
-#error libebml is too old
-#endif
-
-#if LIBMATROSKA_VERSION < 000600
-#error libmatroska is too old
-#endif
-
-int main(void) { return 0; }
-EOF
-  cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes
-  if test "$_matroska_external" = no ; then
-    _saved_inc_extra=$_inc_extra
-    _inc_extra="$_inc_extra -I/usr/local/include"
-    cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes
-    if test "$_matroska_external" = no ; then
-      _inc_extra=$_saved_inc_extra
-    fi
-  fi
-  rm ${TMPC} > /dev/null 2> /dev/null
-  TMPC=$_TMPC
-  if test "$_matroska_external" = yes ; then
-    _ld_matroska="-lmatroska -lebml -lstdc++"
-    _inputmodules="matroska(external) $_inputmodules"
-    _matroska_result="yes, external"
-  fi
-fi
-echores "$_matroska_result"
-if test "$_matroska_internal" != no -o "$_matroska_external" != no ; then
+  _inputmodules="matroska $_inputmodules"
   _def_matroska='#define HAVE_MATROSKA 1'
 else
-  _def_matroska='#undef HAVE_MATROSKA'
   _noinputmodules="matroska $_noinputmodules"
+  _def_matroska='#undef HAVE_MATROSKA'
 fi
 
 
@@ -6147,9 +6102,7 @@
 CONFIG_MP3LAME = $_mp3lame
 LIBMENU = $_menu
 I18NLIBS = $_i18n_libs
-MATROSKA_INTERNAL = $_matroska_internal
-MATROSKA_EXTERNAL = $_matroska_external
-MATROSKA_LIB = $_ld_matroska
+MATROSKA = $_matroska_internal
 
 OPENDIVX = $_opendivx
 

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- Makefile	9 Jul 2004 17:32:17 -0000	1.295
+++ Makefile	4 Aug 2004 18:37:51 -0000	1.296
@@ -32,7 +32,7 @@
 
 VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB)
 AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_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) 
+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)
 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 $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall