[Mplayer-cvslog] CVS: main Makefile,1.144,1.145 configure,1.378,1.379

[Arpi of Ize]

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

Modified Files:
	Makefile configure 
Log Message:
vo_zr no more depends on libjpeg - it requires libavcodec now. patch by Rik Snel <rsnel at cube.dyndns.org>

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- Makefile	22 Jan 2002 05:39:26 -0000	1.144
+++ Makefile	26 Jan 2002 00:47:25 -0000	1.145
@@ -41,7 +41,7 @@
 VO_LIBS = -Llibvo -lvo
 VO_INC = -Ilibvo
 endif
-V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(JPEG_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
+V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(PNG_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
 
 AO_LIBS = -Llibao2 -lao2
 A_LIBS = $(ALSA_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(SGIAUDIO_LIB)

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- configure	25 Jan 2002 13:14:40 -0000	1.378
+++ configure	26 Jan 2002 00:47:26 -0000	1.379
@@ -708,7 +708,6 @@
 _xv=auto
 _sdl=auto
 _nas=auto
-_jpeg=auto
 _png=auto
 _gl=auto
 _ggi=auto
@@ -781,8 +780,6 @@
   --disable-sdl)	_sdl=no		;;
   --enable-nas)		_nas=yes	;;
   --disable-nas)	_nas=no		;;
-  --enable-jpeg)	_jpeg=yes	;;
-  --disable-jpeg)	_jpeg=no	;;
   --enable-png)		_png=yes	;;
   --disable-png)	_png=no		;;
   --enable-gl)		_gl=yes		;;
@@ -1866,35 +1863,6 @@
 fi
 echores "$_dvb"
 
-echocheck "JPEG support"
-if test "$_jpeg" = auto; then
-  _jpeg=no
-cat > $TMPC << EOF
-#include <stdio.h>
-#include <jpeglib.h>
-int main(void) { return 0; }
-EOF
-  cc_check -ljpeg  && _jpeg=yes
-fi
-echores "$_jpeg"
-
-echocheck "zr"
-if test "$_zr" = yes ; then
-  if test "$_jpeg" = yes ; then
-    _ld_jpeg='-ljpeg'
-    _def_zr='#define HAVE_ZR 1'
-    _vosrc="$_vosrc vo_zr.c"
-    _vomodules="zr $_vomodules"
-    echores "$_zr"
-  else
-    echores "jpeglib is required by zr, sorry"
-    _def_zr='#undef HAVE_ZR'
-  fi
-else
-  _def_zr='#undef HAVE_ZR'
-  echores "$_zr"
-fi
-
 echocheck "PNG support"
 if test "$_png" = auto ; then
   _png=no
@@ -2533,6 +2501,21 @@
   _codecmodules="libavcodec.so $_codecmodules"
 fi
 
+echocheck "zr"
+if test "$_zr" = yes ; then
+  if test "$_libavcodec" = yes ; then
+    _def_zr='#define HAVE_ZR 1'
+    _vosrc="$_vosrc vo_zr.c jpeg_enc.c"
+    _vomodules="zr $_vomodules"
+    echores "$_zr"
+  else
+    echores "libavcodec (static) is required by zr, sorry"
+    _def_zr='#undef HAVE_ZR'
+  fi
+else
+  _def_zr='#undef HAVE_ZR'
+  echores "$_zr"
+fi
 
 # FIXME : variables don't have a "standard" name so check this one day
 if test "$_divx4linux" = auto ; then
@@ -2869,7 +2852,7 @@
 CC = $_cc
 AWK = $_awk
 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
-OPTFLAGS = -Djpeg_fdct_ifast=jpeg_fdct_ifast2 $CFLAGS
+OPTFLAGS = $CFLAGS
 EXTRA_INC = $_inc_extra $_inc_gtk
 WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\"
 
@@ -2892,7 +2875,6 @@
 GGI_LIB = $_ld_ggi
 MLIB_LIB =  $_ld_mlib
 MLIB_INC = $_inc_mlib
-JPEG_LIB = $_ld_jpeg
 PNG_LIB = $_ld_png
 SDL_LIB = $_ld_sdl
 SVGA_LIB = $_ld_svga