[MPlayer-dev-eng] [PATCH] update .desktop file

[Reinhard Tartler]

Diego Biurrun <diego at biurrun.de> writes:

> On Mon, Jun 15, 2009 at 11:13:38PM +0200, Reinhard Tartler wrote:
>> 
>> While working on the mplayer package on ubuntu, a fellow ubuntu
>> developer (Siegfried Gevatter <rainct at ubuntu.com>) provided an updated
>> version of the .desktop file.
>> 
>> Changes in detail:
>> 
>>  - Remove Encoding field (is obsolete now)
>>  - Long name for "Name" field
>>  - Improved comment
>>  - updated (some) translations
>>  - pass parameter -fontconfig for fontconfig detection
>
> What happens if fontconfig support is not available?

mplayer fails, which is not a problem for the distropackage, since I
make sure that fontconfig is always used. This is of course unacceptable
for mplayer upstream. Therefore I've decided to turn on fontconfig
support automatically (only takes effect if fontconfig support is
actually compiled in). The user can still disable fontconfig support
with the option -nofontconfig.

I believe that the global variable font_fontconfig is only necessary
when fontconfig support is actually available. But I'm not sure if the
following patch is okay:

Index: libvo/font_load_ft.c
===================================================================
--- libvo/font_load_ft.c	(Revision 29370)
+++ libvo/font_load_ft.c	(Arbeitskopie)
@@ -71,7 +71,9 @@
 int force_load_font;
 
 int using_freetype = 0;
+#ifdef CONFIG_FONTCONFIG
 int font_fontconfig = 1;
+#endif
 
 //// constants
 static unsigned int const colors = 256;


Probably it doesn't matter and the patch just adds noise to the file, so
comments welcome here.

>> I am aware that there is a patch pending around that removes gmplayer
>> completely form the source. AFAIUI, that patch has not reached consesus
>> yet, and in case that patch gets rejected, this .desktop file seems much
>> improved to the current case.
>> 
>> what do you think?
>
> Feel free to commit any GUI-related patches if you are confident they
> work and you tested them.

they work for me, so I've committed them. Are you okay to commit that to
the 1.0rc3 branch as well? The debian/ubuntu packages track that branch
at the moment; I can avoid a quilt patch with that.

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