[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1-8-g9f26bb4

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4a27ff0affa71f8fe72b3be76039e39c6700a0e6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 16 21:26:41 2009 +0200

    enable fontconfig by default

diff --git a/debian/patches/24_enable_fontconfig_by_default.diff b/debian/patches/24_enable_fontconfig_by_default.diff
new file mode 100644
index 0000000..79c280d
--- /dev/null
+++ b/debian/patches/24_enable_fontconfig_by_default.diff
@@ -0,0 +1,30 @@
+Enable fontconfig support by default.
+
+taken from upstream:
+
+------------------------------------------------------------------------
+r29370 | siretart | 2009-06-17 11:16:19 +0200 (Mi, 17. Jun 2009) | 8 lines
+
+Enable fontconfig support by default. This change takes only in effect,
+if fontconfig support is actually compiled in. If freetype is not
+enabled, this patch should have no effect as well.
+
+The visible result of this patch is to avoid the warning about a missing
+~/.mplayer/subfont.ttf when starting mplayer (or gmplayer) without
+parameters, like done from the .desktop file.
+
+------------------------------------------------------------------------
+
+Index: libvo/font_load_ft.c
+===================================================================
+--- libvo/font_load_ft.c	(Revision 29369)
++++ libvo/font_load_ft.c	(Revision 29370)
+@@ -71,7 +71,7 @@
+ int force_load_font;
+ 
+ int using_freetype = 0;
+-int font_fontconfig = 0;
++int font_fontconfig = 1;
+ 
+ //// constants
+ static unsigned int const colors = 256;
diff --git a/debian/patches/series b/debian/patches/series
index df8c2a1..e482463 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 11configure-mktemp.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
+24_enable_fontconfig_by_default.diff
 30_add_gmplayer_man_rules.diff

-- 
mplayer packaging