[MPlayer-dev-eng] [PATCH] support for libXvMCW wrapper library

[Dominik 'Rathann' Mierzejewski]

On Monday, 16 January 2006 at 09:22, Ivan Kalvachev wrote:
> Read again my previous mail.
> XvMCNVidia is never installed if there is no nvidia hardware. Same
> applies to few others drivers. Only i810/5 comes with X. It is safe to
> assume that user have installed them because he have the hardware.
> 
> Anyway, I agree that XvMCW is safer default, but what I have in mind
> is something like:
> -_xvmclib="XvMCNVIDIA"
> @
> +for _temp in $_xvmclib XvMCNVIDIA XvMCW ; do
> @
> +done

OK, how about this one? Tested, detects I810XvMC by default and XvMCW
if I specify it via --with-xvmclib=XvMCW.

R.

-- 
MPlayer RPMs maintainer: http://rpm.greysector.net/mplayer/
"I am Grey. I stand between the candle and the star. We are Grey.
 We stand between the darkness ... and the light."
        -- Delenn in Grey Council in Babylon 5:"Babylon Squared"
-------------- next part --------------
--- MPlayer-20060117/configure.xvmc	2006-01-18 00:30:01.000000000 +0100
+++ MPlayer-20060117/configure	2006-01-18 22:31:50.000000000 +0100
@@ -291,7 +291,7 @@
   --enable-xmga          build with mga_vid X Window support
                          (check for X & /dev/mga_vid) [autodetect]
   --enable-xv            build with Xv render support for X 4.x [autodetect]
-  --enable-xvmc          build with XvMC acceleration for X 4.x [disable]
+  --enable-xvmc          build with XvMC acceleration for X 4.x [autodetect]
   --enable-vm            build with XF86VidMode support for X11 [autodetect]
   --enable-xinerama      build with Xinerama support for X11 [autodetect]
   --enable-x11           build with X11 render support [autodetect]
@@ -1450,7 +1450,6 @@
 cc_check -pipe && _pipe="-pipe" && echores "yes" || echores "no"
 
 _prefix="/usr/local"
-_xvmclib="XvMCNVIDIA"
 
 # GOTCHA: the variables below defines the default behavior for autodetection
 # and have - unless stated otherwise - at least 2 states : yes no
@@ -1469,7 +1468,7 @@
 _x11=auto
 _dga=auto	# 1 2 no auto
 _xv=auto
-_xvmc=no  #auto when complete
+_xvmc=auto
 _sdl=auto
 _directx=auto
 _win32waveout=auto
@@ -3738,7 +3737,9 @@
   (void) XvMCCreateContext(0,0,0,0,0,0,0);
   return 0; }
 EOF
-  cc_check $_inc_x11 -lXvMC -l$_xvmclib $_ld_xv $_ld_x11 && _xvmc=yes
+  for _ld_tmp in $_xvmclib XvMCNVIDIA viaXvMC I810XvMC XvMCW ; do
+    cc_check $_inc_x11 -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclib="$_ld_tmp" && break
+  done
 fi
 if test "$_xvmc" = yes ; then
   _def_xvmc='#define HAVE_XVMC 1'
@@ -3749,7 +3750,7 @@
   _def_xvmc='#undef HAVE_XVMC'
   _novomodules="xvmc $_novomodules"
 fi
-echores "$_xvmc"
+echores "$_xvmc (using $_xvmclib)"
 
 
 echocheck "Xinerama"