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

[Reinhard Tartler]

On Fri, Jun 11, 2010 at 13:10:31 (CEST), Diego Biurrun wrote:

> On Fri, Jun 11, 2010 at 12:44:07PM +0200, Reinhard Tartler wrote:
>> 
>> --- 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"
>
> Use "res_comment" instead.

Oh, indeed.

>>  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
>
> None of this should be necessary since xmga depends on mga.

even more simplified patch here:

Index: configure
===================================================================
--- configure	(revision 31366)
+++ configure	(working copy)
@@ -7435,12 +7435,16 @@
   _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"
+  if test "$_mga" = yes ; then
+     _mga=no
+     res_comment="mga requires libswscale.a"
+  fi
 fi
 echores "$_mga"
 


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