| 1 |
aballier 11/03/30 12:57:14 |
| 2 |
|
| 3 |
Modified: 010_all_freetype-font.patch |
| 4 |
020_all_check_headers_regexps.patch |
| 5 |
320_all_cachegen.patch |
| 6 |
Log: |
| 7 |
refresh the patchset and fix the freetype default font patch, by Artem Karimov, bug #360841 |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 src/patchsets/vlc/master/010_all_freetype-font.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: 010_all_freetype-font.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- 010_all_freetype-font.patch 15 Oct 2010 19:19:59 -0000 1.5 |
| 23 |
+++ 010_all_freetype-font.patch 30 Mar 2011 12:57:14 -0000 1.6 |
| 24 |
@@ -2,18 +2,18 @@ |
| 25 |
we use DejaVU, and add it to the dependencies, as anyway many people have that |
| 26 |
font installed. |
| 27 |
|
| 28 |
-Index: vlc-master/modules/misc/freetype.c |
| 29 |
+Index: vlc-master/modules/misc/text_renderer/freetype.c |
| 30 |
=================================================================== |
| 31 |
---- vlc-master.orig/modules/misc/freetype.c |
| 32 |
-+++ vlc-master/modules/misc/freetype.c |
| 33 |
-@@ -66,8 +66,8 @@ |
| 34 |
- #define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf" |
| 35 |
- #define FC_DEFAULT_FONT "Nokia Sans Bold" |
| 36 |
+--- vlc-master.orig/modules/misc/text_renderer/freetype.c |
| 37 |
++++ vlc-master/modules/misc/text_renderer/freetype.c |
| 38 |
+@@ -51,8 +51,8 @@ |
| 39 |
+ # define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf" |
| 40 |
+ # define FC_DEFAULT_FONT "Nokia Sans Bold" |
| 41 |
#else |
| 42 |
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" |
| 43 |
--#define FC_DEFAULT_FONT "Serif Bold" |
| 44 |
-+#define DEFAULT_FONT "/usr/share/fonts/dejavu/DejaVuSans.ttf" |
| 45 |
-+#define FC_DEFAULT_FONT "Sans" |
| 46 |
+-# define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" |
| 47 |
+-# define FC_DEFAULT_FONT "Serif Bold" |
| 48 |
++# define DEFAULT_FONT "/usr/share/fonts/dejavu/DejaVuSans.ttf" |
| 49 |
++# define FC_DEFAULT_FONT "Sans" |
| 50 |
#endif |
| 51 |
|
| 52 |
- #if defined(HAVE_FRIBIDI) |
| 53 |
+ /* Freetype */ |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.5 src/patchsets/vlc/master/020_all_check_headers_regexps.patch |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.5&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.5&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?r1=1.4&r2=1.5 |
| 62 |
|
| 63 |
Index: 020_all_check_headers_regexps.patch |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch,v |
| 66 |
retrieving revision 1.4 |
| 67 |
retrieving revision 1.5 |
| 68 |
diff -u -r1.4 -r1.5 |
| 69 |
--- 020_all_check_headers_regexps.patch 15 Oct 2010 19:19:59 -0000 1.4 |
| 70 |
+++ 020_all_check_headers_regexps.patch 30 Mar 2011 12:57:14 -0000 1.5 |
| 71 |
@@ -15,4 +15,4 @@ |
| 72 |
+ sed -n -e 's/^#undef \([[:upper:][:digit:]_]*\)$/\1/p' | \ |
| 73 |
grep -v 'WORDS_BIGENDIAN' | \ |
| 74 |
xargs | \ |
| 75 |
- sed -e 's/ /\\\|/g')" |
| 76 |
+ sed -e 's/ /\\\(\\s\\\|$\\\)\\\| /g')" |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.5 src/patchsets/vlc/master/320_all_cachegen.patch |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.5&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.5&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?r1=1.4&r2=1.5 |
| 85 |
|
| 86 |
Index: 320_all_cachegen.patch |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch,v |
| 89 |
retrieving revision 1.4 |
| 90 |
retrieving revision 1.5 |
| 91 |
diff -u -r1.4 -r1.5 |
| 92 |
--- 320_all_cachegen.patch 15 Oct 2010 19:19:59 -0000 1.4 |
| 93 |
+++ 320_all_cachegen.patch 30 Mar 2011 12:57:14 -0000 1.5 |
| 94 |
@@ -4,7 +4,7 @@ |
| 95 |
=================================================================== |
| 96 |
--- vlc-master.orig/modules/Makefile.am |
| 97 |
+++ vlc-master/modules/Makefile.am |
| 98 |
-@@ -61,15 +61,7 @@ MOSTLYCLEANFILES = plugins-*-*.dat |
| 99 |
+@@ -66,15 +66,7 @@ MOSTLYCLEANFILES = plugins-*-*.dat |
| 100 |
.PHONY: stamp-cache |
| 101 |
|
| 102 |
stamp-cache: |
Archives