[MPlayer-dev-eng] [PATCH] require static libswscale for mga

[Reinhard Tartler]

On Thu, Jun 10, 2010 at 16:00:17 (CEST), Diego Biurrun wrote:

> On Thu, Jun 03, 2010 at 08:18:24PM +0200, Reinhard Tartler wrote:
>> 
>
>> Since I don't expect anyone to actually fix the mgadrivers to actually
>> avoid swscale internals and stick to the public API,
>
> Why not?  Attila?
>
>> I'm aware that this patch moves the mga check fairly to the
>> bottom. However, I think this clarifies the issue a bit in case this
>> check engages:
>
> Move the check first before doing the other changes.  Do it right away.

done

>
>> --- configure	(revision 31303)
>> +++ configure	(working copy)
>> @@ -7431,6 +7403,46 @@
>>    && def_libswscale_so='#define CONFIG_LIBSWSCALE_SO 1'
>>  echores "$_libswscale"
>>  
>> +echocheck "/dev/mga_vid"
>> +if test "$_mga" = auto ; then
>> +  _mga=no
>> +  test -c /dev/mga_vid && _mga=yes
>> +fi
>> +if test "$_mga" = yes ; then
>> +  if test "$_libswscale_a" = no ; then
>> +    _mga=no
>> +    echores "mga requires libswscale.a"
>> +  else
>> +    def_mga='#define CONFIG_MGA 1'
>> +    vomodules="mga $vomodules"
>> +    echores "$_mga"
>> +  fi
>> +else
>> +  def_mga='#undef CONFIG_MGA'
>> +  novomodules="mga $novomodules"
>> +  echores "$_mga"
>> +fi
>
> mga will not end up in novomodules if static libswscale is not available.

damn, missed that. This should actually work:

Index: configure
===================================================================
--- configure	(revision 31366)
+++ configure	(working copy)
@@ -7435,28 +7435,38 @@
   _mga=no
   test -c /dev/mga_vid && _mga=yes
 fi
-if test "$_mga" = yes ; then
+if test "$_mga" = yes && test "$_libswscale_a" = yes ; then
   def_mga='#define CONFIG_MGA 1'
   vomodules="mga $vomodules"
 else
   def_mga='#undef CONFIG_MGA'
   novomodules="mga $novomodules"
 fi
-echores "$_mga"
+if test "$_mga" = yes && test "$_libswscale_a" = no ; then
+  _mga=no
+  echores "no, mga requires libswscale.a"
+else
+  echores "$_mga"
+fi
 
 echocheck "xmga"
 if test "$_xmga" = auto ; then
   _xmga=no
   test "$_x11" = yes && test "$_mga" = yes && _xmga=yes
 fi
-if test "$_xmga" = yes ; then
+if test "$_xmga" = yes && test "$_libswscale_a" = yes ; then
   def_xmga='#define CONFIG_XMGA 1'
   vomodules="xmga $vomodules"
 else
   def_xmga='#undef CONFIG_XMGA'
   novomodules="xmga $novomodules"
 fi
-echores "$_xmga"
+if test "$_xmga" = yes && test "$_libswscale_a" = yes ; then
+  _xmga=no
+  echores "no, xmga requires libswscale.a"
+else
+  echores "$_xmga"
+fi
 
 echocheck "libopencore_amr narrowband"
 if test "$_libopencore_amrnb" = auto ; then



,----[test]
| Checking for RTMPDump Streaming Media library ... yes 
| Checking for FFmpeg libavutil ... yes 
| Checking for FFmpeg libavcodec ... yes (libavcodec.so is discouraged over static libavcodec)
| Checking for FFmpeg libavformat ... yes 
| Checking for FFmpeg libpostproc ... yes (using libpostproc.so, but static libpostproc is recommended)
| Checking for FFmpeg libswscale ... yes (using libswscale.so, but static libswscale is recommended)
| Checking for /dev/mga_vid ... no, mga requires libswscale.a 
| Checking for xmga ... no 
`----


-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4