Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/vlc/master: 010_all_freetype-font.patch 015_all_projectm-font.patch series
Date: Sat, 02 Jun 2012 15:34:52
Message-Id: 20120602153442.77B762004B@flycatcher.gentoo.org
1 aballier 12/06/02 15:34:42
2
3 Modified: 010_all_freetype-font.patch series
4 Added: 015_all_projectm-font.patch
5 Log:
6 Fix default projectm font path
7
8 Revision Changes Path
9 1.10 src/patchsets/vlc/master/010_all_freetype-font.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.10&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.10&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?r1=1.9&r2=1.10
14
15 Index: 010_all_freetype-font.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch,v
18 retrieving revision 1.9
19 retrieving revision 1.10
20 diff -u -r1.9 -r1.10
21 --- 010_all_freetype-font.patch 8 Sep 2011 04:50:10 -0000 1.9
22 +++ 010_all_freetype-font.patch 2 Jun 2012 15:34:42 -0000 1.10
23 @@ -2,13 +2,13 @@
24 we use DejaVU, and add it to the dependencies, as anyway many people have that
25 font installed.
26
27 -Index: vlc/modules/text_renderer/freetype.c
28 +Index: vlc-master/modules/text_renderer/freetype.c
29 ===================================================================
30 ---- vlc.orig/modules/text_renderer/freetype.c
31 -+++ vlc/modules/text_renderer/freetype.c
32 -@@ -55,8 +55,8 @@
33 - # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
34 - # define DEFAULT_FAMILY "Nokia Sans Bold"
35 +--- vlc-master.orig/modules/text_renderer/freetype.c
36 ++++ vlc-master/modules/text_renderer/freetype.c
37 +@@ -62,8 +62,8 @@
38 + # define DEFAULT_FONT_FILE "/system/fonts/DroidSans-Bold.ttf"
39 + # define DEFAULT_FAMILY "Droid Sans Bold"
40 #else
41 -# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
42 -# define DEFAULT_FAMILY "Serif Bold"
43
44
45
46 1.5 src/patchsets/vlc/master/series
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/series?rev=1.5&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/series?rev=1.5&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/series?r1=1.4&r2=1.5
51
52 Index: series
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/series,v
55 retrieving revision 1.4
56 retrieving revision 1.5
57 diff -u -r1.4 -r1.5
58 --- series 8 Sep 2011 04:50:10 -0000 1.4
59 +++ series 2 Jun 2012 15:34:42 -0000 1.5
60 @@ -1,3 +1,4 @@
61 010_all_freetype-font.patch
62 +015_all_projectm-font.patch
63 020_all_check_headers_regexps.patch
64 300_all_pic.patch
65
66
67
68 1.1 src/patchsets/vlc/master/015_all_projectm-font.patch
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/015_all_projectm-font.patch?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/015_all_projectm-font.patch?rev=1.1&content-type=text/plain
72
73 Index: 015_all_projectm-font.patch
74 ===================================================================
75 The path for the default font used by VLC is debian specific it seems.
76 Fix the path and add DejaVU to the dependencies.
77
78 Index: vlc-master/modules/visualization/projectm.cpp
79 ===================================================================
80 --- vlc-master.orig/modules/visualization/projectm.cpp
81 +++ vlc-master/modules/visualization/projectm.cpp
82 @@ -78,8 +78,8 @@ static void Close ( vlc_object_t
83 # define FONT_PATH "C:\\WINDOWS\\Fonts\\arial.ttf"
84 # define FONT_PATH_MENU "C:\\WINDOWS\\Fonts\\arial.ttf"
85 #else
86 -# define FONT_PATH "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
87 -# define FONT_PATH_MENU "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf"
88 +# define FONT_PATH "/usr/share/fonts/dejavu/DejaVuSans.ttf"
89 +# define FONT_PATH_MENU "/usr/share/fonts/dejavu/DejaVuSansMono.ttf"
90 #endif
91
92 vlc_module_begin ()