[SCM] mplayer packaging branch, karmic, updated. debian/1.0.rc3+svn20090426-1ubuntu3-3-g583b2bf

[siretart at users.alioth.debian.org]

The following commit has been merged in the karmic branch:
commit 863b2f0bf51979725105f926c1aabcf4fe149fba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 18 16:09:10 2009 +0200

    enable fontconfig by default
    
    patch already committed upstream. This way the .desktop file does not
    need to use the -fontconfig paramter manually.

diff --git a/debian/patches/40_improve_desktop_file.patch b/debian/patches/40_improve_desktop_file.patch
index 46ce296..bf29dfc 100644
--- a/debian/patches/40_improve_desktop_file.patch
+++ b/debian/patches/40_improve_desktop_file.patch
@@ -26,7 +26,7 @@ index 0ef3ce7..9f092c3 100644
  Icon=mplayer
  TryExec=gmplayer
 -Exec=gmplayer %F
-+Exec=gmplayer -fontconfig %F
++Exec=gmplayer %F
  Terminal=false
  Categories=GTK;AudioVideo;Audio;Video;Player;TV;
  MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;
diff --git a/debian/patches/41_use_fontconfig_by_default.patch b/debian/patches/41_use_fontconfig_by_default.patch
new file mode 100644
index 0000000..fd88619
--- /dev/null
+++ b/debian/patches/41_use_fontconfig_by_default.patch
@@ -0,0 +1,28 @@
+Author: Reinhard Tartler <siretart at tauware.de>
+Subject: load_fontconfig by default
+Status: Patch taken from upstream.
+
+diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
+index 20d673a..1cb00b1 100644
+--- a/libvo/font_load_ft.c
++++ b/libvo/font_load_ft.c
+@@ -66,17 +66,17 @@ float subtitle_font_thickness = 2.0;
+ // 3 = diagonal
+ int subtitle_autoscale = 3;
+ 
+ int vo_image_width = 0;
+ int vo_image_height = 0;
+ int force_load_font;
+ 
+ int using_freetype = 0;
+-int font_fontconfig = 0;
++int font_fontconfig = 1;
+ 
+ //// constants
+ static unsigned int const colors = 256;
+ static unsigned int const maxcolor = 255;
+ static unsigned const	base = 256;
+ static unsigned const first_char = 33;
+ #define MAX_CHARSET_SIZE 60000
+ 
+
diff --git a/debian/patches/series b/debian/patches/series
index 563f299..78cc204 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 23mplayer-debug-printf.patch
 30_add_gmplayer_man_rules.diff
 40_improve_desktop_file.patch
+41_use_fontconfig_by_default.patch

-- 
mplayer packaging