Mercurial > mplayer.hg
changeset 13744:d66e3d5865b8
Add --enable and --disable options for vo_pnm and vo_md5sum to configure.
It's now possible to compile libvo without pnm and/or md5sum support.
Default is enable.
| author | ivo |
|---|---|
| date | Sat, 23 Oct 2004 22:43:19 +0000 |
| parents | 5a999bdc0534 |
| children | 3db10035d297 |
| files | configure libvo/Makefile libvo/video_out.c |
| diffstat | 3 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Oct 23 18:57:06 2004 +0000 +++ b/configure Sat Oct 23 22:43:19 2004 +0000 @@ -253,6 +253,8 @@ --enable-bl build with Blinkenlights support [disable] --enable-tdfxvid build with tdfx_vid support [disable] --disable-tga disable targa output support [enable] + --disable-pnm disable pnm output support [enable] + --disable-md5sum disable md5sum output support [enable] Audio output: --disable-alsa disable ALSA sound support [autodetect] @@ -1264,6 +1266,8 @@ _nas=auto _png=auto _jpg=auto +_pnm=yes +_md5sum=yes _gif=auto _gl=auto _ggi=auto @@ -1414,6 +1418,10 @@ --disable-png) _png=no ;; --enable-jpeg) _jpg=yes ;; --disable-jpeg) _jpg=no ;; + --enable-pnm) _pnm=yes ;; + --disable-pnm) _pnm=no ;; + --enable-md5sum) _md5sum=yes ;; + --disable-md5sum) _md5sum=no ;; --enable-gif) _gif=yes ;; --disable-gif) _gif=no ;; --enable-gl) _gl=yes ;; @@ -3879,6 +3887,33 @@ fi + +echocheck "PNM support" +if test "$_pnm" = yes; then + _def_pnm="#define HAVE_PNM" + _vosrc="$_vosrc vo_pnm.c" + _vomodules="pnm $_vomodules" +else + _def_pnm="#undef HAVE_PNM" + _novomodules="pnm $_novomodules" +fi +echores "$_pnm" + + + +echocheck "md5sum support" +if test "$_md5sum" = yes; then + _def_md5sum="#define HAVE_MD5SUM" + _vosrc="$_vosrc vo_md5sum.c md5sum.c" + _vomodules="md5sum $_vomodules" +else + _def_md5sum="#undef HAVE_MD5SUM" + _novomodules="md5sum $_novomodules" +fi +echores "$_md5sum" + + + echocheck "GIF support" # This is to appease people who want to force gif support. # If it is forced to yes, then we still do checks to determine @@ -6959,6 +6994,12 @@ /* enable JPEG support */ $_def_jpg +/* enable PNM support */ +$_def_pnm + +/* enable md5sum support */ +$_def_md5sum + /* enable GIF support */ $_def_gif $_def_gif_4
--- a/libvo/Makefile Sat Oct 23 18:57:06 2004 +0000 +++ b/libvo/Makefile Sat Oct 23 22:43:19 2004 +0000 @@ -3,7 +3,7 @@ LIBNAME = libvo.a -SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c vo_pnm.c vo_md5sum.c md5sum.c +SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c OBJS=$(SRCS:.c=.o) ifeq ($(VIDIX),yes)
--- a/libvo/video_out.c Sat Oct 23 18:57:06 2004 +0000 +++ b/libvo/video_out.c Sat Oct 23 22:43:19 2004 +0000 @@ -122,8 +122,12 @@ #ifdef MACOSX extern vo_functions_t video_out_quartz; #endif +#ifdef HAVE_PNM extern vo_functions_t video_out_pnm; +#endif +#ifdef HAVE_MD5SUM extern vo_functions_t video_out_md5sum; +#endif vo_functions_t* video_out_drivers[] = { @@ -237,8 +241,12 @@ #ifdef HAVE_TGA &video_out_tga, #endif +#ifdef HAVE_PNM &video_out_pnm, +#endif +#ifdef HAVE_MD5SUM &video_out_md5sum, +#endif NULL };