Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv4956 Modified Files: Makefile configure Log Message: -vo gif - by Joey Parrish <joey@yunamusic.com> Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- Makefile 5 May 2002 21:07:10 -0000 1.185 +++ Makefile 12 May 2002 01:07:24 -0000 1.186 @@ -45,7 +45,7 @@ A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = -Llibmpcodecs -lmpcodecs -Lmp3lib -lMP3 -Lliba52 -la52 -Llibmpeg2 -lmpeg2 $(AV_LIB) $(FAME_LIB) -COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(NEW_INPUT_LIB) $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB) $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) -lm +COMMON_LIBS = $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(NEW_INPUT_LIB) $(LIB_LOADER) $(A_LIBS) $(CSS_LIB) $(ARCH_LIB) -Lpostproc -lpostproc $(DECORE_LIB) -Llinux -losdep $(TERMCAP_LIB) $(STREAMING_LIB) $(Z_LIB) $(GTK_LIBS) $(PNG_LIB) $(JPEG_LIB) $(GIF_LIB) -lm ifeq ($(VIDIX),yes) MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix endif Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.464 retrieving revision 1.465 diff -u -r1.464 -r1.465 --- configure 10 May 2002 01:50:17 -0000 1.464 +++ configure 12 May 2002 01:07:24 -0000 1.465 @@ -125,6 +125,7 @@ --enable-gui enable GUI [disable] --enable-png enable png support [autodetect] --enable-jpeg enable jpeg support [autodetect] + --enable-gif enable gif89a support [autodetect] --disable-tv disable TV Interface (tv/dvb grabbers) [enable] --disable-tv-v4l disable Video 4 Linux TV Interface support [autodetect] --disable-win32 disable Win32 DLL support [autodetect] @@ -768,6 +769,7 @@ _nas=auto _png=auto _jpg=auto +_gif=auto _gl=auto _ggi=auto _aa=auto @@ -859,6 +861,8 @@ --disable-png) _png=no ;; --enable-jpeg) _jpg=yes ;; --disable-jpeg) _jpg=no ;; + --enable-gif) _gif=yes ;; + --disable-gif) _gif=no ;; --enable-gl) _gl=yes ;; --disable-gl) _gl=no ;; --enable-ggi) _ggi=yes ;; @@ -2320,6 +2324,40 @@ _mkf_jpg="no" fi +echocheck "GIF89a support" +if test "$_gif" = auto ; then + _gif=no +cat > $TMPC << EOF +#include <gif_lib.h> +int main(void) { + return 0; +} +EOF + if cc_check -lungif ; then + if "$TMPO" >> "$TMPLOG" ; then + _gif=yes + _ld_gif="-lungif" + fi + elif cc_check -lgif ; then + if "$TMPO" >> "$TMPLOG" ; then + _gif=yes + _ld_gif="-lgif" + fi + fi +fi +echores "$_gif" + +if test "$_gif" = yes ; then + _def_gif='#define HAVE_GIF 1' + _vosrc="$_vosrc vo_gif89a.c" + _vomodules="gif89a $_vomodules" + _mkf_gif="yes" +else + _def_gif='#undef HAVE_GIF' + _novomodules="gif89a $_novomodules" + _mkf_gif="no" +fi + if test "$_vesa" != no ; then echocheck "VESA support" @@ -3618,6 +3656,7 @@ PNG = $_mkf_png JPEG = $_mkf_jpg +GIF = $_mkf_gif EXTRA_LIB = $_ld_extra Z_LIB = $_ld_static $_ld_zlib @@ -3635,6 +3674,7 @@ DVB_INC = $_inc_dvb PNG_LIB = $_ld_png JPEG_LIB = $_ld_jpg +GIF_LIB = $_ld_gif SDL_LIB = $_ld_sdl SVGA_LIB = $_ld_svga AA_LIB = $_ld_aa @@ -3969,6 +4009,9 @@ /* enable JPEG support */ $_def_jpg + +/* enable GIF support */ +$_def_gif /* libmad support */ $_def_mad