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 310_all_mmx_pic.patch 320_all_cachegen.patch series
Date: Wed, 24 Feb 2010 12:23:27
Message-Id: E1NkGGx-0004Eg-1C@stork.gentoo.org
1 aballier 10/02/24 12:23:23
2
3 Modified: 010_all_freetype-font.patch 310_all_mmx_pic.patch
4 series
5 Added: 320_all_cachegen.patch
6 Log:
7 disable cache generation at buildtime for us
8
9 Revision Changes Path
10 1.3 src/patchsets/vlc/master/010_all_freetype-font.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?r1=1.2&r2=1.3
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.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- 010_all_freetype-font.patch 1 Sep 2009 08:36:30 -0000 1.2
23 +++ 010_all_freetype-font.patch 24 Feb 2010 12:23:21 -0000 1.3
24 @@ -6,9 +6,9 @@
25 ===================================================================
26 --- vlc-clean.orig/modules/misc/freetype.c
27 +++ vlc-clean/modules/misc/freetype.c
28 -@@ -63,8 +63,8 @@
29 - #define DEFAULT_FONT "" /* Default font found at run-time */
30 - #define FC_DEFAULT_FONT "Arial"
31 +@@ -67,8 +67,8 @@
32 + #define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
33 + #define FC_DEFAULT_FONT "Nokia Sans Bold"
34 #else
35 -#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
36 -#define FC_DEFAULT_FONT "Serif Bold"
37
38
39
40 1.4 src/patchsets/vlc/master/310_all_mmx_pic.patch
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch?rev=1.4&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch?rev=1.4&content-type=text/plain
44 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch?r1=1.3&r2=1.4
45
46 Index: 310_all_mmx_pic.patch
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch,v
49 retrieving revision 1.3
50 retrieving revision 1.4
51 diff -u -r1.3 -r1.4
52 --- 310_all_mmx_pic.patch 10 Jan 2010 16:54:06 -0000 1.3
53 +++ 310_all_mmx_pic.patch 24 Feb 2010 12:23:21 -0000 1.4
54 @@ -61,7 +61,7 @@
55 #define MMX_INIT_16 " \n\
56 movd (%1), %%mm0 # Load 4 Cb 00 00 00 00 u3 u2 u1 u0 \n\
57 movd (%2), %%mm1 # Load 4 Cr 00 00 00 00 v3 v2 v1 v0 \n\
58 -@@ -103,27 +101,27 @@ movq (%0), %%mm6 # Load 8 Y
59 +@@ -103,27 +101,27 @@ movq (%0), %%mm6 # Load 8 Y
60 # convert the chroma part \n\
61 punpcklbw %%mm4, %%mm0 # scatter 4 Cb 00 u3 00 u2 00 u1 00 u0 \n\
62 punpcklbw %%mm4, %%mm1 # scatter 4 Cr 00 v3 00 v2 00 v1 00 v0 \n\
63 @@ -99,7 +99,7 @@
64 "
65
66 /*
67 -@@ -168,14 +166,14 @@ punpcklbw %%mm5, %%mm2 #
68 +@@ -168,14 +166,14 @@ punpcklbw %%mm5, %%mm2 #
69
70 #define MMX_YUV_GRAY " \n\
71 # convert the luma part \n\
72 @@ -118,7 +118,7 @@
73 packuswb %%mm6, %%mm6 \n\
74 packuswb %%mm7, %%mm7 \n\
75 punpcklbw %%mm7, %%mm6 \n\
76 -@@ -183,8 +181,8 @@ punpcklbw %%mm7, %%mm6
77 +@@ -183,8 +181,8 @@ punpcklbw %%mm7, %%mm6
78
79 #define MMX_UNPACK_16_GRAY " \n\
80 movq %%mm6, %%mm5 \n\
81 @@ -129,7 +129,7 @@
82 movq %%mm6, %%mm7 \n\
83 psrlw $3, %%mm7 \n\
84 pxor %%mm3, %%mm3 \n\
85 -@@ -213,10 +211,10 @@ movq %%mm2, 8(%3)
86 +@@ -213,10 +211,10 @@ movq %%mm2, 8(%3)
87
88 #define MMX_UNPACK_15 " \n\
89 # mask unneeded bits off \n\
90 @@ -143,7 +143,7 @@
91 psrlw $1,%%mm1 # __r7r6r5 r4r3____ __r7r6r5 r4r3____ \n\
92 pxor %%mm4, %%mm4 # zero mm4 \n\
93 movq %%mm0, %%mm5 # Copy B7-B0 \n\
94 -@@ -249,9 +247,9 @@ movq %%mm5, 8(%3) # store
95 +@@ -249,9 +247,9 @@ movq %%mm5, 8(%3) # store
96
97 #define MMX_UNPACK_16 " \n\
98 # mask unneeded bits off \n\
99
100
101
102 1.2 src/patchsets/vlc/master/series
103
104 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/series?rev=1.2&view=markup
105 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/series?rev=1.2&content-type=text/plain
106 diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/series?r1=1.1&r2=1.2
107
108 Index: series
109 ===================================================================
110 RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/series,v
111 retrieving revision 1.1
112 retrieving revision 1.2
113 diff -u -r1.1 -r1.2
114 --- series 23 Jul 2009 18:31:23 -0000 1.1
115 +++ series 24 Feb 2010 12:23:21 -0000 1.2
116 @@ -2,3 +2,4 @@
117 020_all_check_headers_regexps.patch
118 300_all_pic.patch
119 310_all_mmx_pic.patch
120 +320_all_cachegen.patch
121
122
123
124 1.1 src/patchsets/vlc/master/320_all_cachegen.patch
125
126 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.1&view=markup
127 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.1&content-type=text/plain
128
129 Index: 320_all_cachegen.patch
130 ===================================================================
131 Index: vlc-clean/modules/Makefile.am
132 ===================================================================
133 --- vlc-clean.orig/modules/Makefile.am
134 +++ vlc-clean/modules/Makefile.am
135 @@ -62,16 +62,4 @@ MOSTLYCLEANFILES = stamp-cache plugins-*
136 .PHONY: stamp-cache
137
138 stamp-cache:
139 - $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
140 - ../bin/vlc-cache-gen$(EXEEXT) . ; \
141 - else \
142 - echo "Cross-compilation: cache generation skipped!" ; \
143 - fi
144 $(AM_V_at)touch stamp-cache
145 -
146 -install-exec-hook:
147 - if test -z "$(DESTDIR)"; then \
148 - ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/modules" ; \
149 - else \
150 - echo "Staged installation: cache generation skipped!" ; \
151 - fi