[Mplayer-cvslog] CVS: main configure,1.502,1.503

Atmosfear atmos4 at mplayerhq.hu
Thu Jun 13 02:14:30 CEST 2002


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

Modified Files:
	configure 
Log Message:
Implement Nilmoni's and Bernd Ernesti's patches for:
Better real codec dir detection and NetBSD real support.
Fix Nilmonis code, so it's working like expected.
Move a debug printf to mp_msg and some fixes in demux_real.c.
Some cosmetics :) -> RealPlayer 8 to RealPlayer, as RealOne (aka RealPlayer 9 works, too)


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- configure	12 Jun 2002 23:01:23 -0000	1.502
+++ configure	13 Jun 2002 00:14:27 -0000	1.503
@@ -140,7 +140,7 @@
   --disable-win32        disable Win32 DLL support [autodetect]
   --disable-dshow        disable DirectShow support [autodetect]
   --disable-xanim        disable XAnim DLL support [autodetect]
-  --disable-real         disable RealPlayer8 DLL support [autodetect]
+  --disable-real         disable RealPlayer DLL support [autodetect]
   --disable-xvid         disable XviD codec [autodetect]
   --disable-divx4linux   disable DivX4linux codec [autodetect]
   --enable-opendivx      enable _old_ OpenDivx codec [disable]
@@ -235,6 +235,7 @@
   --with-libdvdnav=DIR     libdvdnav in DIR
   --with-win32libdir=DIR   W*ndows DLL files in DIR
   --with-xanimlibdir=DIR   XAnim DLL files in DIR
+  --with-reallibdir=DIR    RealPlayer DLL files in DIR
   --with-xvidcore=PATH     path to XviD libcore.a (e.g: /opt/lib/libcore.a)
   --with-sdl-config=PATH   path to sdl*-config (e.g.: /opt/bin/sdl-config)
   --with-gtk-config=PATH   path to gtk*-config (e.g.: /opt/bin/gtk-config)
@@ -1084,6 +1085,10 @@
     _xanimlibdir=`echo $ac_option | cut -d '=' -f 2`
     _xanim=yes
     ;;
+  --with-reallibdir=*)
+    _reallibdir=`echo $ac_option | cut -d '=' -f 2`
+    _real=yes
+    ;;
   --with-csslibdir=*)
     _csslibdir=`echo $ac_option | cut -d '=' -f 2`
     _css=yes
@@ -3252,18 +3257,34 @@
   _nocodecmodules="xanim $_nocodecmodules"
 fi
 
-echocheck "RealPlayer8 DLL"
+echocheck "RealPlayer DLL"
 if test "$_real" = auto ; then
   _real=no
   if test "$_dl" = yes ; then
     if linux ; then
       _real=yes
-      echores "yes"
     elif freebsd ; then
       _real=yes
-      echores "yes"
+    elif netbsd ; then
+      _real=yes
+    else
+      echores "no (tested only on Linux/FreeBSD/NetBSD)"
+    fi
+    if test "$_real" = yes ; then
+      if test -z "$_reallibdir" ; then
+	for I in /usr/lib/real /usr/lib/RealPlayer*/Codecs ; do
+          if test -d "$I" ; then
+            _reallibdir="$I"
+            break;
+          fi;
+        done
+      fi
+    fi
+    test "$_reallibdir" || _real=no
+    if test "$_real" = yes ; then
+      echores "yes (using $_reallibdir)"
     else
-      echores "no (tested only on Linux and FreeBSD arch)"
+      echores "no (no suitable directory found - see DOCS/codecs.html)"
     fi
   else
     echores "no (dynamic loader support needed)"
@@ -3273,9 +3294,11 @@
 fi
 if test "$_real" = yes ; then
   _def_real='#define USE_REALCODECS 1'
+  _def_real_path="#define REALCODEC_PATH \"$_reallibdir\""
   _codecmodules="real $_codecmodules"
 else
   _def_real='#undef USE_REALCODECS'
+  _def_real_path="#undef REALCODEC_PATH"
   _nocodecmodules="real $_nocodecmodules"
 fi
 
@@ -4218,6 +4241,8 @@
 
 /* RealPlayer DLL support */
 $_def_real
+/* Default search path */
+$_def_real_path
 
 /* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/
 $_def_fastmemcpy




More information about the MPlayer-cvslog mailing list